diff options
Diffstat (limited to 'package/zlib')
-rw-r--r-- | package/zlib/Config.in | 9 | ||||
-rw-r--r-- | package/zlib/Makefile | 31 | ||||
-rw-r--r-- | package/zlib/ipkg/zlib.control | 4 |
3 files changed, 17 insertions, 27 deletions
diff --git a/package/zlib/Config.in b/package/zlib/Config.in deleted file mode 100644 index 4b96d94153..0000000000 --- a/package/zlib/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_ZLIB - prompt "zlib.............................. Library implementing the deflate compression method" - tristate - default m if CONFIG_DEVEL - help - A library implementing the 'deflate' compression method - - http://www.zlib.net/ - diff --git a/package/zlib/Makefile b/package/zlib/Makefile index cfd82800a8..aaa3f4d429 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -5,21 +5,28 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zlib PKG_VERSION:=1.2.3 PKG_RELEASE:=3 -PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +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_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 PKG_CAT:=bzcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +define Package/zlib +SECTION:=base +CATEGORY:=Libraries +DEFAULT:=n +TITLE:=Library implementing the deflate compression method +DESCRIPTION:=A library implementing the 'deflate' compression method +URL:=http://www.zlib.net/ +endef -$(PKG_BUILD_DIR)/.configured: +define Build/Configure (cd $(PKG_BUILD_DIR); \ $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \ @@ -28,9 +35,9 @@ $(PKG_BUILD_DIR)/.configured: --prefix=/usr \ --shared \ ); - touch $@ +endef -$(PKG_BUILD_DIR)/.built: +define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \ @@ -39,13 +46,12 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ install - touch $@ +endef -$(IPKG_ZLIB): +define Package/zlib/install install -m0755 -d $(IDIR_ZLIB)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ - $(RSTRIP) $(IDIR_ZLIB) - $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR) +endef $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include @@ -60,6 +66,3 @@ uninstall-dev: rm -rf $(STAGING_DIR)/usr/include/zconf.h rm -rf $(STAGING_DIR)/usr/include/zlib.h rm -rf $(STAGING_DIR)/usr/lib/libz.* - -compile-targets: install-dev -clean-targets: uninstall-dev diff --git a/package/zlib/ipkg/zlib.control b/package/zlib/ipkg/zlib.control deleted file mode 100644 index 35fcac26e5..0000000000 --- a/package/zlib/ipkg/zlib.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: zlib -Priority: optional -Section: libs -Description: an implementation of the deflate compression method (library) |