diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-02 12:00:07 +0000 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-02 12:00:07 +0000 |
commit | d83bf6bd0ba8bc8b4b7d5f7c6566c150a69e8bff (patch) | |
tree | 7478a9b8534c0345f0aef7825cf09eef065757df | |
parent | 3d2669bcafeda3ac6ad82b2eee31b14c760d4b52 (diff) | |
download | ptxdist-d83bf6bd0ba8bc8b4b7d5f7c6566c150a69e8bff.tar.gz ptxdist-d83bf6bd0ba8bc8b4b7d5f7c6566c150a69e8bff.tar.xz |
* zlib: recreated packet files with ptxdist newpacket; host-zlib
prompt was removed, no reason to configure something manually
here. Merged from branches/ptxdist-trunk-mkl by rsc.
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6597 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r-- | rules/host-zlib.in | 4 | ||||
-rw-r--r-- | rules/host-zlib.make | 52 | ||||
-rw-r--r-- | rules/zlib.make | 33 |
3 files changed, 42 insertions, 47 deletions
diff --git a/rules/host-zlib.in b/rules/host-zlib.in index d3c4ea7cf..c203900bd 100644 --- a/rules/host-zlib.in +++ b/rules/host-zlib.in @@ -1,6 +1,2 @@ config HOST_ZLIB bool - depends on BROKEN - prompt "host zlib [BROKEN]" - help - FIXME: This item needs to be documented diff --git a/rules/host-zlib.make b/rules/host-zlib.make index 003a12229..dcc08d86e 100644 --- a/rules/host-zlib.make +++ b/rules/host-zlib.make @@ -1,22 +1,23 @@ # -*-makefile-*- # $Id$ # -# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany +# Copyright (C) 2006 by Pengutronix e.K., Hildesheim, Germany +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions # see the README file. # - +# +# We provide this package +# HOST_PACKAGES-$(PTXCONF_HOST_ZLIB) += host-zlib # # Paths and names # -HOST_ZLIB = $(ZLIB) -HOST_ZLIB_BUILDDIR = $(HOST_BUILDDIR)/$(HOST_ZLIB) - +HOST_ZLIB_DIR = $(HOST_BUILDDIR)/$(ZLIB) # ---------------------------------------------------------------------------- # Get @@ -34,11 +35,11 @@ $(STATEDIR)/host-zlib.get: $(STATEDIR)/zlib.get host-zlib_extract: $(STATEDIR)/host-zlib.extract -$(STATEDIR)/host-zlib.extract: $(host_zlib_extract_deps_default) +$(STATEDIR)/host-zlib.extract: $(host-zlib_extract_deps_default) @$(call targetinfo, $@) - @$(call clean, $(HOST_ZLIB_BUILDDIR)) + @$(call clean, $(HOST_ZLIB_DIR)) @$(call extract, ZLIB, $(HOST_BUILDDIR)) - @$(call patchin, ZLIB) + @$(call patchin, ZLIB, $(HOST_ZLIB_DIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -47,16 +48,19 @@ $(STATEDIR)/host-zlib.extract: $(host_zlib_extract_deps_default) host-zlib_prepare: $(STATEDIR)/host-zlib.prepare +HOST_ZLIB_PATH := PATH=$(HOST_PATH) +HOST_ZLIB_ENV := $(HOST_ENV) + # -# autoconf without automake :-( +# autoconf # +HOST_ZLIB_AUTOCONF := $(HOST_AUTOCONF) -HOST_ZLIB_AUTOCONF := --prefix=$(PTXCONF_HOST_PREFIX)/usr -HOST_ZLIB_MAKEVARS := $(HOSTCC_ENV) - -$(STATEDIR)/host-zlib.prepare: $(host_zlib_prepare_deps_default) +$(STATEDIR)/host-zlib.prepare: $(host-zlib_prepare_deps_default) @$(call targetinfo, $@) - cd $(HOST_ZLIB_BUILDDIR) && \ + @$(call clean, $(HOST_ZLIB_DIR)/config.cache) + cd $(HOST_ZLIB_DIR) && \ + $(HOST_ZLIB_PATH) $(HOST_ZLIB_ENV) \ ./configure $(HOST_ZLIB_AUTOCONF) @$(call touch, $@) @@ -66,9 +70,9 @@ $(STATEDIR)/host-zlib.prepare: $(host_zlib_prepare_deps_default) host-zlib_compile: $(STATEDIR)/host-zlib.compile -$(STATEDIR)/host-zlib.compile: $(host_zlib_compile_deps_default) +$(STATEDIR)/host-zlib.compile: $(host-zlib_compile_deps_default) @$(call targetinfo, $@) - cd $(HOST_ZLIB_BUILDDIR) && make $(HOST_ZLIB_MAKEVARS) + cd $(HOST_ZLIB_DIR) && $(HOST_ZLIB_PATH) $(MAKE) $(PARALLELMFLAGS) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -77,19 +81,9 @@ $(STATEDIR)/host-zlib.compile: $(host_zlib_compile_deps_default) host-zlib_install: $(STATEDIR)/host-zlib.install -$(STATEDIR)/host-zlib.install: $(host_zlib_install_deps_default) - @$(call targetinfo, $@) - @$(call install, HOST_ZLIB, $(HOST_ZLIB_BUILDDIR),h) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -host-zlib_targetinstall: $(STATEDIR)/host-zlib.targetinstall - -$(STATEDIR)/host-zlib.targetinstall: $(host_zlib_targetinstall_deps_default) +$(STATEDIR)/host-zlib.install: $(host-zlib_install_deps_default) @$(call targetinfo, $@) + @$(call install, HOST_ZLIB,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -98,6 +92,6 @@ $(STATEDIR)/host-zlib.targetinstall: $(host_zlib_targetinstall_deps_default) host-zlib_clean: rm -rf $(STATEDIR)/host-zlib.* - rm -rf $(HOST_ZLIB_BUILDDIR) + rm -rf $(HOST_ZLIB_DIR) # vim: syntax=make diff --git a/rules/zlib.make b/rules/zlib.make index 3ba96fc50..eb0efa8f8 100644 --- a/rules/zlib.make +++ b/rules/zlib.make @@ -2,6 +2,7 @@ # $Id$ # # Copyright (C) 2002-2006 by Pengutronix e.K., Hildesheim, Germany +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -16,13 +17,13 @@ PACKAGES-$(PTXCONF_ZLIB) += zlib # # Paths and names # -ZLIB_VERSION := 1.2.3 +ZLIB_VERSION := 1.2.3-ptx2 ZLIB := zlib-$(ZLIB_VERSION) -ZLIB_URL := http://www.zlib.net/$(ZLIB).tar.gz -ZLIB_SOURCE := $(SRCDIR)/$(ZLIB).tar.gz +ZLIB_SUFFIX := tar.bz2 +ZLIB_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(ZLIB).$(ZLIB_SUFFIX) +ZLIB_SOURCE := $(SRCDIR)/$(ZLIB).$(ZLIB_SUFFIX) ZLIB_DIR := $(BUILDDIR)/$(ZLIB) - # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -57,12 +58,19 @@ $(STATEDIR)/zlib.extract: $(zlib_extract_deps_default) zlib_prepare: $(STATEDIR)/zlib.prepare ZLIB_PATH := PATH=$(CROSS_PATH) -ZLIB_ENV := $(CROSS_ENV) AR="$(CROSS_AR) rc" -ZLIB_AUTOCONF := --shared --prefix=/usr +ZLIB_ENV := $(CROSS_ENV) + +# +# autoconf +# +ZLIB_AUTOCONF := $(CROSS_AUTOCONF_USR) $(STATEDIR)/zlib.prepare: $(zlib_prepare_deps_default) @$(call targetinfo, $@) - cd $(ZLIB_DIR) && $(ZLIB_ENV) $(ZLIB_PATH) ./configure $(ZLIB_AUTOCONF) + @$(call clean, $(ZLIB_DIR)/config.cache) + cd $(ZLIB_DIR) && \ + $(ZLIB_PATH) $(ZLIB_ENV) \ + ./configure $(ZLIB_AUTOCONF) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -73,8 +81,7 @@ zlib_compile: $(STATEDIR)/zlib.compile $(STATEDIR)/zlib.compile: $(zlib_compile_deps_default) @$(call targetinfo, $@) - $(ZLIB_PATH) cd $(ZLIB_DIR) && make - $(ZLIB_PATH) cd $(ZLIB_DIR) && make libz.a + cd $(ZLIB_DIR) && $(ZLIB_PATH) $(MAKE) $(PARALLELMFLAGS) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -85,8 +92,7 @@ zlib_install: $(STATEDIR)/zlib.install $(STATEDIR)/zlib.install: $(zlib_install_deps_default) @$(call targetinfo, $@) - cd $(ZLIB_DIR) && $(ZLIB_PATH) make install prefix=$(SYSROOT)/usr - $(INSTALL) $(ZLIB_DIR)/libz.a $(SYSROOT)/usr/lib/libz.a + @$(call install, ZLIB) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -107,9 +113,8 @@ $(STATEDIR)/zlib.targetinstall: $(zlib_targetinstall_deps_default) @$(call install_fixup, zlib,DEPENDS,) @$(call install_fixup, zlib,DESCRIPTION,missing) - @$(call install_copy, zlib, 0, 0, 0644, $(ZLIB_DIR)/libz.so.1.2.3, /usr/lib/libz.so.1.2.3) - @$(call install_link, zlib, libz.so.1.2.3, /usr/lib/libz.so.1) - @$(call install_link, zlib, libz.so.1.2.3, /usr/lib/libz.so) + @$(call install_copy, zlib, 0, 0, 0644, $(ZLIB_DIR)/.libs/libz-1.2.3-ptx2.so, /usr/lib/libz-1.2.3-ptx2.so) + @$(call install_link, zlib, libz-1.2.3-ptx2.so, /usr/lib/libz.so) @$(call install_finish, zlib) |