diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-11-07 18:26:35 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-11-07 18:26:35 +0000 |
commit | 9707497f94027fd67f3bdc5bc3dfca9ae983d78b (patch) | |
tree | ccde3567eab54f34b7ff670d33ebb90dac505c8f /openwrt/package/lzo | |
parent | 777c181615574f7464bb3785077187f7c7024a43 (diff) |
change bool in BR2_COMPILE_* to tristate to avoid unnecessary package/<foo>-install calls
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2388 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/lzo')
-rw-r--r-- | openwrt/package/lzo/Config.in | 15 | ||||
-rw-r--r-- | openwrt/package/lzo/Makefile | 82 | ||||
-rw-r--r-- | openwrt/package/lzo/ipkg/liblzo.control | 4 | ||||
-rw-r--r-- | openwrt/package/lzo/patches/lzo-cross-compile.patch | 43 |
4 files changed, 0 insertions, 144 deletions
diff --git a/openwrt/package/lzo/Config.in b/openwrt/package/lzo/Config.in deleted file mode 100644 index 58000d9774..0000000000 --- a/openwrt/package/lzo/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_COMPILE_LZO - bool - default n - depends BR2_PACKAGE_LIBLZO - -config BR2_PACKAGE_LIBLZO - prompt "liblzo............................ Real-time data compression library" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_LZO - help - A real-time data compression library - - http://www.oberhumer.com/opensource/lzo/ - diff --git a/openwrt/package/lzo/Makefile b/openwrt/package/lzo/Makefile deleted file mode 100644 index dddc3ce885..0000000000 --- a/openwrt/package/lzo/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=lzo -PKG_VERSION:=1.08 -PKG_RELEASE:=1 -PKG_MD5SUM:=ab94d3da364c7cbd5b78d76f1875b0f6 - -PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/lzo/download/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_CAT:=zcat - -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,LIBLZO,liblzo,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(strip $(TARGET_CFLAGS))" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --enable-shared \ - --enable-static \ - ); - touch $@ - -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - CFLAGS_O="$(TARGET_CFLAGS)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install - touch $@ - -$(IPKG_LIBLZO): - install -d -m0755 $(IDIR_LIBLZO)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblzo.so.* $(IDIR_LIBLZO)/usr/lib - $(RSTRIP) $(IDIR_LIBLZO) - $(IPKG_BUILD) $(IDIR_LIBLZO) $(PACKAGE_DIR) - -$(STAGING_DIR)/usr/lib/liblzo.so: $(PKG_BUILD_DIR)/.built - mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/lzo*.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblzo.{a,so*} $(STAGING_DIR)/usr/lib/ - touch $(STAGING_DIR)/usr/lib/liblzo.so - -install-dev: $(STAGING_DIR)/usr/lib/liblzo.so - -uninstall-dev: - rm -rf \ - $(STAGING_DIR)/usr/include/lzo*.h \ - $(STAGING_DIR)/usr/lib/liblzo.{a,so*} \ - -compile-targets: install-dev -clean-targets: uninstall-dev diff --git a/openwrt/package/lzo/ipkg/liblzo.control b/openwrt/package/lzo/ipkg/liblzo.control deleted file mode 100644 index 3f84ee6f2a..0000000000 --- a/openwrt/package/lzo/ipkg/liblzo.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: liblzo -Priority: optional -Section: libs -Description: a real-time data compression library diff --git a/openwrt/package/lzo/patches/lzo-cross-compile.patch b/openwrt/package/lzo/patches/lzo-cross-compile.patch deleted file mode 100644 index 68a3d0449e..0000000000 --- a/openwrt/package/lzo/patches/lzo-cross-compile.patch +++ /dev/null @@ -1,43 +0,0 @@ -For some reason the lzo autoconf script uses a local macro that does -a test for cross-compiles, and assumes that if the build target name -and the host target name are the same that --host was not specified to -the configure script. In the uClibc buildroot, this is not the case. - ---- lzo-1.08/aclocal.m4 2002-07-12 18:31:52.000000000 -0700 -+++ lzo-1.08/aclocal.m4.new 2004-03-10 15:32:42.000000000 -0700 -@@ -205,12 +205,6 @@ - [ - AC_REQUIRE([AC_PROG_CC]) - --if test "X$cross_compiling" = Xyes; then -- if test "X$build" = "X$host"; then -- AC_MSG_ERROR([you are cross compiling - please use the \`--host=' option]) -- fi --fi -- - ]) - - ---- lzo-1.08/configure-dist 2004-03-11 02:18:28.000000000 -0600 -+++ lzo-1.08/configure 2004-03-11 02:19:16.000000000 -0600 -@@ -2282,13 +2282,13 @@ - - - --if test "X$cross_compiling" = Xyes; then -- if test "X$build" = "X$host"; then -- { { echo "$as_me:$LINENO: error: you are cross compiling - please use the \`--host=' option" >&5 --echo "$as_me: error: you are cross compiling - please use the \`--host=' option" >&2;} -- { (exit 1); exit 1; }; } -- fi --fi -+#if test "X$cross_compiling" = Xyes; then -+# if test "X$build" = "X$host"; then -+# { { echo "$as_me:$LINENO: error: you are cross compiling - please use the \`--host=' option" >&5 -+#echo "$as_me: error: you are cross compiling - please use the \`--host=' option" >&2;} -+# { (exit 1); exit 1; }; } -+# fi -+#fi - - - |