summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-10-29 07:16:38 +0000
committerMike Frysinger <vapier@gentoo.org>2005-10-29 07:16:38 +0000
commitb915f4a31ad0432d939b8ea8729d6aefea804413 (patch)
tree41fae33fb4b0aba1370de7ee0dbbdcd36cfc569a
parentd11b70150e5eda6f610e0f05f2554cd14373af69 (diff)
use := instead of = for variables and make sure zlib builds with target cflags
-rw-r--r--package/zlib/zlib.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 32dc3ca2f..2d40d2330 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -3,13 +3,13 @@
# zlib
#
#############################################################
-ZLIB_VER=1.2.3
-ZLIB_SOURCE=zlib-$(ZLIB_VER).tar.bz2
-ZLIB_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
-ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER)
-ZLIB_CFLAGS= $(TARGET_CFLAGS) -fPIC
+ZLIB_VER:=1.2.3
+ZLIB_SOURCE:=zlib-$(ZLIB_VER).tar.bz2
+ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
+ZLIB_DIR:=$(BUILD_DIR)/zlib-$(ZLIB_VER)
+ZLIB_CFLAGS:=$(TARGET_CFLAGS) -fPIC
ifeq ($(BR2_LARGEFILE),y)
-ZLIB_CFLAGS+= -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ZLIB_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
endif
$(DL_DIR)/$(ZLIB_SOURCE):
@@ -23,6 +23,7 @@ $(ZLIB_DIR)/.source: $(DL_DIR)/$(ZLIB_SOURCE)
$(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.source
(cd $(ZLIB_DIR); \
$(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(ZLIB_CFLAGS)" \
./configure \
--shared \
--prefix=/usr \