qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-27 15:01:05 +02:00
Code

fix zlib build on machines where LDFLAGS gets set to something broken

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1787 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2005-08-29 21:41:38 +00:00
parent 1b182cdd51
commit 1ec025e7e8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/zlib/Makefile
View File

@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zlib PKG_NAME:=zlib
PKG_VERSION:=1.2.2 PKG_VERSION:=1.2.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5 PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5
PKG_SOURCE_URL:=@SF/zlib PKG_SOURCE_URL:=@SF/zlib
@ -21,6 +21,7 @@ $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
(cd $(PKG_BUILD_DIR); \ (cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--shared \ --shared \
@ -46,16 +47,17 @@ $(IPKG_ZLIB):
$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/usr/include mkdir -p $(STAGING_DIR)/usr/include
cp -fpR $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h $(STAGING_DIR)/usr/include cp -fpR $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include
mkdir -p $(STAGING_DIR)/usr/lib mkdir -p $(STAGING_DIR)/usr/lib
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} $(STAGING_DIR)/usr/lib cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib
touch $(STAGING_DIR)/usr/lib/libz.so touch $(STAGING_DIR)/usr/lib/libz.so
install-dev: $(STAGING_DIR)/usr/lib/libz.so install-dev: $(STAGING_DIR)/usr/lib/libz.so
uninstall-dev: uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h rm -rf $(STAGING_DIR)/usr/include/zconf.h
rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*} rm -rf $(STAGING_DIR)/usr/include/zlib.h
rm -rf $(STAGING_DIR)/usr/lib/libz.*
compile: install-dev compile: install-dev
clean: uninstall-dev clean: uninstall-dev