diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-02-23 21:27:28 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-02-23 21:27:28 +0100 |
| commit | 4f05a61b33e5d87f23837109fb0dd538a5bd5d62 (patch) | |
| tree | f1b375060271ec5fd5da6fe89955b11b7c238fae /package/zlib/zlib.mk | |
| parent | 52fcd86f2ba1249e74ed04ef39cb3cbea16024c7 (diff) | |
| parent | f08e9eea1b70f057cc0a3efa18b2acb4faea4abe (diff) | |
| download | buildroot-novena-4f05a61b33e5d87f23837109fb0dd538a5bd5d62.tar.gz buildroot-novena-4f05a61b33e5d87f23837109fb0dd538a5bd5d62.zip | |
Merge branch 'misc-fixes5' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/zlib/zlib.mk')
| -rw-r--r-- | package/zlib/zlib.mk | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index 743247309..3144ae9fa 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -30,10 +30,26 @@ define ZLIB_CONFIGURE_CMDS ) endef +define HOST_ZLIB_CONFIGURE_CMDS + (cd $(@D); rm -rf config.cache; \ + $(HOST_CONFIGURE_ARGS) \ + $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(ZLIB_PIC)" \ + ./configure \ + $(ZLIB_SHARED) \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ + ) +endef + define ZLIB_BUILD_CMDS $(MAKE) -C $(@D) all libz.a endef +define HOST_ZLIB_BUILD_CMDS + $(MAKE) -C $(@D) all libz.a +endef + define ZLIB_INSTALL_STAGING_CMDS $(INSTALL) -D $(@D)/libz.a $(STAGING_DIR)/usr/lib/libz.a $(INSTALL) -D $(@D)/zlib.h $(STAGING_DIR)/usr/include/zlib.h @@ -41,6 +57,13 @@ define ZLIB_INSTALL_STAGING_CMDS cp -dpf $(@D)/libz.so* $(STAGING_DIR)/usr/lib/ endef +define HOST_ZLIB_INSTALL_CMDS + $(INSTALL) -D $(@D)/libz.a $(HOST_DIR)/usr/lib/libz.a + $(INSTALL) -D $(@D)/zlib.h $(HOST_DIR)/usr/include/zlib.h + $(INSTALL) $(@D)/zconf.h $(HOST_DIR)/usr/include/ + cp -dpf $(@D)/libz.so* $(HOST_DIR)/usr/lib/ +endef + ifeq ($(BR2_HAVE_DEVFILES),y) define ZLIB_INSTALL_TARGET_HEADERS $(INSTALL) -D $(@D)/zlib.h $(TARGET_DIR)/usr/include/zlib.h @@ -57,3 +80,5 @@ define ZLIB_INSTALL_TARGET_CMDS endef $(eval $(call GENTARGETS,package,zlib)) +$(eval $(call GENTARGETS,package,zlib,host)) + |