revert accidental change to madwifi.sh

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 2934625..9c8058b 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.3
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.3

-PKG_RELEASE:=4
+PKG_RELEASE:=5

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib


@@ -29,7 +29,7 @@ define Build/Configure
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \

-               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+               CFLAGS="$(TARGET_CFLAGS) $(FPIC) $(CFLAGS_LARGEFILE)" \

                UNAME_S="Linux" \
                ./configure \
                        --prefix=/usr \
                UNAME_S="Linux" \
                ./configure \
                        --prefix=/usr \


@@ -40,7 +40,7 @@ endef
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

-               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+               CFLAGS="$(TARGET_CFLAGS) -fPIC $(CFLAGS_LARGEFILE)" \

                libz.a libz.so
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                libz.a libz.so
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \


@@ -56,11 +56,6 @@ define Build/InstallDev
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
                $(1)/usr/lib/
 endef
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
                $(1)/usr/lib/
 endef

-       
-define Build/UninstallDev
-       rm -rf  $(1)/usr/include/z{conf,lib}.h \
-               $(1)/usr/lib/libz.{a,so*}
-endef

 
 # libz.so is needed for openssl (zlib-dynamic)
 define Package/zlib/install
 
 # libz.so is needed for openssl (zlib-dynamic)
 define Package/zlib/install