summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-09-18 11:58:10 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-09-18 11:58:10 +0200
commitb23e1d1c9093237e74b20b71036cbda7e9a755d9 (patch)
treefc6f71bc5b3c22e37161ff2d182d58e3fa593cda /package
parentbd05145b6d1d09ffc8aae586a9d50b33dfaf3e0a (diff)
parentd8cfe503249af76a3a029bcda1c20655d8b7dc20 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/zlib/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 1428154c2..1f0e11ef6 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= zlib
PKG_VERSION:= 1.2.3
-PKG_RELEASE:= 5
+PKG_RELEASE:= 6
PKG_MD5SUM:= dee233bf288ee795ac96a98cc2e369b6
PKG_DESCR:= implementation of the deflate compression method (library)
PKG_SECTION:= libs
@@ -24,9 +24,12 @@ CONFIGURE_STYLE= manual
BUILD_STYLE= auto
INSTALL_STYLE= auto
+ifeq ($(ADK_NATIVE),n)
+COPTS:= $(TARGET_CONFIGURE_OPTS)
+endif
+
do-configure:
- (cd $(WRKBUILD); \
- $(TARGET_CONFIGURE_OPTS) \
+ (cd $(WRKBUILD); $(COPTS) \
CFLAGS="$(TARGET_CFLAGS) -fPIC" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \