X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/77c87e07cfa1eee90e87eb33bd6c981a2157fa5e..4eddfed4b3d2c5afc0dd10662ad7f32808804329:/package/zlib/Makefile?ds=inline diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 15407d5a3..ecbfcd084 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -4,17 +4,16 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=zlib -PKG_VERSION:=1.2.3 -PKG_RELEASE:=4 +PKG_VERSION:=1.2.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib -PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 +PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng +PKG_MD5SUM:=be1e89810e66150f5b0327984d8625a0 include $(INCLUDE_DIR)/package.mk @@ -29,19 +28,19 @@ define Build/Configure (cd $(PKG_BUILD_DIR); \ $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \ - CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \ - UNAME_S="Linux" \ + CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ ./configure \ --prefix=/usr \ --shared \ + --uname=Linux \ ); endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \ - libz.a libz.so + CFLAGS="$(TARGET_CFLAGS)" \ + libz.a libz.so.$(PKG_VERSION) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ @@ -49,17 +48,15 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include + mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \ - $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include/ + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \ - $(STAGING_DIR)/usr/lib/ -endef - -define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h \ - $(STAGING_DIR)/usr/lib/libz.{a,so*} + $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \ + $(1)/usr/lib/pkgconfig/ endef # libz.so is needed for openssl (zlib-dynamic)