From 215424aa27a1ab49c9ccf0182d494a26c74e6a2e Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Thu, 21 Jan 2010 12:07:03 +0100 Subject: [PATCH] add variant of lzma, update and cleanup tntnet/openzim-related packages - thanks a lot tommi! --- cxxtools/Makefile | 10 ++++------ tntnet/Makefile | 5 +++-- xz/Makefile | 41 +++++++++++++++++++++++++++++++++++++++++ zimlib/Makefile | 21 ++++++++++----------- 4 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 xz/Makefile diff --git a/cxxtools/Makefile b/cxxtools/Makefile index d360911..c896944 100644 --- a/cxxtools/Makefile +++ b/cxxtools/Makefile @@ -8,11 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cxxtools -PKG_VERSION:=1.99.4 +PKG_VERSION:=1.99.5.20091227-1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.tntnet.org/download +PKG_MD5SUM:=c0cb4270f33b46b1fb3fb7d7abd974c0 PKG_INSTALL:=1 @@ -21,19 +22,16 @@ PKG_FIXUP:=libtool include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include -TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib - define Package/cxxtools TITLE:=cxxtools SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libiconv endef define Build/Configure $(call Build/Configure/Default, \ - --with-atomictype=generic \ + --disable-demos \ + --disable-unittest \ ) endef diff --git a/tntnet/Makefile b/tntnet/Makefile index acd905c..c6ed4e5 100644 --- a/tntnet/Makefile +++ b/tntnet/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tntnet -PKG_VERSION:=1.6.99 +PKG_VERSION:=1.6.991.20091227-1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -28,7 +28,7 @@ define Package/tntnet TITLE:=tntnet SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libiconv +zlib +cxxtools/host + DEPENDS:=+zlib +cxxtools endef define Build/Configure @@ -39,6 +39,7 @@ define Build/Configure --with-demos=no \ --with-server=no \ --with-sdk=no \ + --disable-unittest \ ) endef diff --git a/xz/Makefile b/xz/Makefile new file mode 100644 index 0000000..d47797a --- /dev/null +++ b/xz/Makefile @@ -0,0 +1,41 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=xz +PKG_VERSION:=4.999.9beta +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://tukaani.org/xz +PKG_MD5SUM:=f2073579b6da2fe35d453adee1aaf1b2 + +include $(INCLUDE_DIR)/package.mk + +define Package/xz + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:= + TITLE:=xz utils + URL:=http://tukaani.org/ +endef + +TARGET_CFLAGS += -std=c99 + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install +endef + +define Package/xz/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,la,so*} $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,xz)) diff --git a/zimlib/Makefile b/zimlib/Makefile index 05447ee..8dfbcb4 100644 --- a/zimlib/Makefile +++ b/zimlib/Makefile @@ -4,19 +4,16 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # +# include $(TOPDIR)/rules.mk PKG_NAME:=zimlib -PKG_REV:=239 -PKG_VERSION:=r$(PKG_REV) +PKG_VERSION:=0.92.20091227-3 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=svn -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://svn.openzim.org/svnroot/trunk/zimlib -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://www.openzim.org/download PKG_INSTALL:=1 @@ -36,14 +33,16 @@ define Package/zimlib TITLE:=zimlib SECTION:=libs CATEGORY:=Libraries - #DEPENDS:=+zlib +bzip2 +cxxtools +uclibcxx - DEPENDS:=+zlib +bzip2 +cxxtools +libstdcpp + DEPENDS:=+zlib +bzip2 +cxxtools +libstdcpp +xz URL:=http://openzim.org endef define Build/Configure - ( cd $(PKG_BUILD_DIR); ./autogen.sh ); - $(call Build/Configure/Default) + $(call Build/Configure/Default, \ + --with-cluster-cache-size=5 \ + --disable-unittest \ + --enable-benchmark \ + ) endef define Build/InstallDev