aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-09-19 05:33:18 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-09-19 05:33:18 +0000
commit0bfe08d1b182d7dcdc422f77803659b1bb71e30a (patch)
tree70af7c66e875d9ff0b17411cfed9cd89fb0148ba
parent12eda380d1184aac4a684a685f0e6651f14aa1af (diff)
downloadupstream-0bfe08d1b182d7dcdc422f77803659b1bb71e30a.tar.gz
upstream-0bfe08d1b182d7dcdc422f77803659b1bb71e30a.tar.bz2
upstream-0bfe08d1b182d7dcdc422f77803659b1bb71e30a.zip
package/zlib: fix Darwin compile failure (closes #7963)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23085 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/zlib/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 4eef6a1c96..5cea85fc85 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -31,19 +31,18 @@ define Build/Configure
$(TARGET_CONFIGURE_OPTS) \
LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
- UNAME_S="Linux" \
./configure \
--prefix=/usr \
--shared \
+ --uname=Linux \
);
endef
define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
- LDSHARED="$(TARGET_CROSS)ld -shared" \
- CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
- libz.a
+ CFLAGS="$(TARGET_CFLAGS)" \
+ libz.a libz.so.$(PKG_VERSION)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \