From 97c31ddb562ac6e5829e29bf416fe94e8eec569f Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 7 Nov 2005 18:26:35 +0000 Subject: change bool in BR2_COMPILE_* to tristate to avoid unnecessary package/-install calls git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2388 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/Config.in | 2 +- package/Makefile | 10 ++-- package/atftp/Config.in | 2 +- package/avahi/Config.in | 2 +- package/bind/Config.in | 2 +- package/curl/Config.in | 2 +- package/cyrus-sasl/Config.in | 2 +- package/dhcp/Config.in | 2 +- package/expat/Config.in | 2 +- package/flac/Config.in | 2 +- package/fuse/Config.in | 2 +- package/glib/Config.in | 2 +- package/gmp/Config.in | 2 +- package/gnutls/Config.in | 2 +- package/howl/Config.in | 2 +- package/iproute2/Config.in | 2 +- package/jpeg/Config.in | 2 +- package/kismet/Config.in | 2 +- package/libdb/Config.in | 2 +- package/liblzo/Config.in | 9 +++ package/liblzo/Makefile | 82 ++++++++++++++++++++++++++ package/liblzo/ipkg/liblzo.control | 4 ++ package/liblzo/patches/lzo-cross-compile.patch | 43 ++++++++++++++ package/libtool/Config.in | 2 +- package/lua/Config.in | 2 +- package/lzo/Config.in | 15 ----- package/lzo/Makefile | 82 -------------------------- package/lzo/ipkg/liblzo.control | 4 -- package/lzo/patches/lzo-cross-compile.patch | 43 -------------- package/matrixssl/Config.in | 2 +- package/mini_httpd/Config.in | 2 +- package/miredo/Config.in | 2 +- package/monit/Config.in | 2 +- package/mysql/Config.in | 2 +- package/ncurses/Config.in | 2 +- package/ndisc/Config.in | 2 +- package/net-snmp/Config.in | 2 +- package/opencdk/Config.in | 2 +- package/openldap/Config.in | 2 +- package/openssh/Config.in | 2 +- package/openssl/Config.in | 2 +- package/osiris/Config.in | 2 +- package/pcre/Config.in | 2 +- package/php4/Config.in | 2 +- package/php5/Config.in | 2 +- package/popt/Config.in | 2 +- package/postgresql/Config.in | 2 +- package/readline/Config.in | 2 +- package/rp-pppoe/Config.in | 2 +- package/rrdtool1/Config.in | 5 +- package/rrs/Config.in | 2 +- package/sablevm-classpath/Config.in | 2 +- package/samba/Config.in | 2 +- package/shfs/Config.in | 2 +- package/speex/Config.in | 2 +- package/sqlite/Config.in | 2 +- package/sqlite2/Config.in | 2 +- package/usbutils/Config.in | 2 +- package/util-linux/Config.in | 2 +- 59 files changed, 195 insertions(+), 200 deletions(-) create mode 100644 package/liblzo/Config.in create mode 100644 package/liblzo/Makefile create mode 100644 package/liblzo/ipkg/liblzo.control create mode 100644 package/liblzo/patches/lzo-cross-compile.patch delete mode 100644 package/lzo/Config.in delete mode 100644 package/lzo/Makefile delete mode 100644 package/lzo/ipkg/liblzo.control delete mode 100644 package/lzo/patches/lzo-cross-compile.patch diff --git a/package/Config.in b/package/Config.in index 8cf05585a..730b819d5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -171,7 +171,7 @@ source "package/libgpg-error/Config.in" source "package/libid3tag/Config.in" source "package/jpeg/Config.in" # libjpeg source "package/libtool/Config.in" # libltdl -source "package/lzo/Config.in" # liblzo +source "package/liblzo/Config.in" source "package/libmad/Config.in" source "package/matrixssl/Config.in" # libmatrixssl source "package/mysql/Config.in" # limysqlclient diff --git a/package/Makefile b/package/Makefile index ff6bc640f..3f53d7323 100644 --- a/package/Makefile +++ b/package/Makefile @@ -83,6 +83,7 @@ package-$(BR2_PACKAGE_LIBGD) += libgd package-$(BR2_PACKAGE_LIBGDBM) += libgdbm package-$(BR2_PACKAGE_LIBGPG_ERROR) += libgpg-error package-$(BR2_PACKAGE_LIBID3TAG) += libid3tag +package-$(BR2_PACKAGE_LIBLZO) += liblzo package-$(BR2_PACKAGE_LIBMAD) += libmad package-$(BR2_PACKAGE_LIBNET) += libnet package-$(BR2_PACKAGE_LIBNIDS) += libnids @@ -102,7 +103,6 @@ package-$(BR2_PACKAGE_LIBXSLT) += libxslt package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd package-$(BR2_PACKAGE_LINUX_ATM) += linux-atm package-$(BR2_COMPILE_LUA) += lua -package-$(BR2_COMPILE_LZO) += lzo package-$(BR2_PACKAGE_MADWIFI_TOOLS) += madwifi-tools package-$(BR2_PACKAGE_MARADNS) += maradns package-$(BR2_COMPILE_MATRIXSSL) += matrixssl @@ -212,7 +212,7 @@ package-$(BR2_PACKAGE_XINETD) += xinetd package-$(BR2_PACKAGE_XSUPPLICANT) += xsupplicant package-$(BR2_PACKAGE_ZLIB) += zlib -DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl lzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib +DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl liblzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS)) SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES)) @@ -297,10 +297,10 @@ socat-compile: openssl-compile sqlite-compile: ncurses-compile readline-compile sqlite2-compile: ncurses-compile readline-compile tcpdump-compile: libpcap-compile -tinc-compile: zlib-compile openssl-compile lzo-compile +tinc-compile: zlib-compile openssl-compile liblzo-compile tor-compile: libevent-compile openssl-compile zlib-compile usbutils-compile: libusb-compile -vtun-compile: zlib-compile openssl-compile lzo-compile +vtun-compile: zlib-compile openssl-compile liblzo-compile wificonf-compile: wireless-tools-compile nvram-compile wknock-compile: libpcap-compile wpa_supplicant-compile: openssl-compile @@ -347,7 +347,7 @@ endif openvpn-compile: openssl-compile ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) -openvpn-compile: lzo-compile +openvpn-compile: liblzo-compile endif php4-compile: openssl-compile zlib-compile diff --git a/package/atftp/Config.in b/package/atftp/Config.in index c84e316cb..32ab9512a 100644 --- a/package/atftp/Config.in +++ b/package/atftp/Config.in @@ -1,7 +1,7 @@ #menu "atftp............................. TFTP implementation" config BR2_COMPILE_ATFTP - bool + tristate default n depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD diff --git a/package/avahi/Config.in b/package/avahi/Config.in index 1f2804c62..69461a58e 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -1,7 +1,7 @@ menu "avahi............................. An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation" config BR2_COMPILE_AVAHI - bool + tristate default n depends BR2_PACKAGE_AVAHI_DAEMON || BR2_PACKAGE_AVAHI_DNSCONFD || BR2_PACKAGE_LIBAVAHI diff --git a/package/bind/Config.in b/package/bind/Config.in index 1acb5857e..38dc92f6f 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -1,7 +1,7 @@ #menu "bind.............................. A DNS server implementation" config BR2_COMPILE_BIND - bool + tristate default n depends BR2_PACKAGE_BIND_CLIENT || BR2_PACKAGE_BIND_SERVER diff --git a/package/curl/Config.in b/package/curl/Config.in index f3bf79f40..9f8768c3b 100644 --- a/package/curl/Config.in +++ b/package/curl/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_CURL - bool + tristate default n depends BR2_PACKAGE_LIBCURL diff --git a/package/cyrus-sasl/Config.in b/package/cyrus-sasl/Config.in index de3c3d3fb..599a87c5d 100644 --- a/package/cyrus-sasl/Config.in +++ b/package/cyrus-sasl/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_CYRUS_SASL - bool + tristate default n depends BR2_PACKAGE_LIBSASL2 diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in index 5449c207b..f29beeeda 100644 --- a/package/dhcp/Config.in +++ b/package/dhcp/Config.in @@ -1,7 +1,7 @@ #menu "dhcp.............................. ISC DHCP (Dynamic Host Configuration Protocol) implementation" config BR2_COMPILE_DHCP - bool + tristate default n depends BR2_PACKAGE_DHCP_RELAY || BR2_PACKAGE_DHCP_SERVER diff --git a/package/expat/Config.in b/package/expat/Config.in index 0347f3bca..9b34c52c8 100644 --- a/package/expat/Config.in +++ b/package/expat/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_EXPAT - bool + tristate default n depends BR2_PACKAGE_LIBEXPAT diff --git a/package/flac/Config.in b/package/flac/Config.in index 12405fc39..87f88a383 100644 --- a/package/flac/Config.in +++ b/package/flac/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_FLAC - bool + tristate default n depends BR2_PACKAGE_LIBFLAC diff --git a/package/fuse/Config.in b/package/fuse/Config.in index d24598619..2d8b1775a 100644 --- a/package/fuse/Config.in +++ b/package/fuse/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_FUSE - bool + tristate default n depends BR2_PACKAGE_LIBFUSE diff --git a/package/glib/Config.in b/package/glib/Config.in index 1ec23b9ef..f11c06370 100644 --- a/package/glib/Config.in +++ b/package/glib/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_GLIB - bool + tristate depends BR2_PACKAGE_GLIB1 config BR2_PACKAGE_GLIB1 diff --git a/package/gmp/Config.in b/package/gmp/Config.in index f00ee9226..1e995a734 100644 --- a/package/gmp/Config.in +++ b/package/gmp/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_GMP - bool + tristate default n depends BR2_PACKAGE_LIBGMP diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index 291084f1a..bb3ea99e7 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_GNUTLS - bool + tristate default n depends BR2_PACKAGE_LIBGNUTLS diff --git a/package/howl/Config.in b/package/howl/Config.in index a55bbf35f..a409dd2a6 100644 --- a/package/howl/Config.in +++ b/package/howl/Config.in @@ -1,7 +1,7 @@ menu "howl.............................. A Zeroconf networking implementation" config BR2_COMPILE_HOWL - bool + tristate default n depends BR2_PACKAGE_LIBHOWL diff --git a/package/iproute2/Config.in b/package/iproute2/Config.in index 85fa18421..349e3b7df 100644 --- a/package/iproute2/Config.in +++ b/package/iproute2/Config.in @@ -1,7 +1,7 @@ menu "iproute2.......................... A collection of utilites for controlling TCP/IP networking and Traffic Control" config BR2_COMPILE_IPROUTE2 - bool + tristate default n depends BR2_PACKAGE_IPROUTE2_IP || BR2_PACKAGE_IPROUTE2_TC diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index f49318335..326fa8b5f 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_JPEG - bool + tristate default n depends BR2_PACKAGE_LIBJPEG diff --git a/package/kismet/Config.in b/package/kismet/Config.in index 6a5fbebd7..425ec6c51 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -1,7 +1,7 @@ #menu "kismet............................ An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system" config BR2_COMPILE_KISMET - bool + tristate default n depends BR2_PACKAGE_KISMET_CLIENT || BR2_PACKAGE_KISMET_DRONE || BR2_PACKAGE_KISMET_SERVER diff --git a/package/libdb/Config.in b/package/libdb/Config.in index 2a7b77125..5871032a8 100644 --- a/package/libdb/Config.in +++ b/package/libdb/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_DB - bool + tristate default n depends BR2_PACKAGE_LIBDB diff --git a/package/liblzo/Config.in b/package/liblzo/Config.in new file mode 100644 index 000000000..b63a09a91 --- /dev/null +++ b/package/liblzo/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBLZO + prompt "liblzo............................ Real-time data compression library" + tristate + default m if CONFIG_DEVEL + help + A real-time data compression library + + http://www.oberhumer.com/opensource/lzo/ + diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile new file mode 100644 index 000000000..dddc3ce88 --- /dev/null +++ b/package/liblzo/Makefile @@ -0,0 +1,82 @@ +# $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/package/liblzo/ipkg/liblzo.control b/package/liblzo/ipkg/liblzo.control new file mode 100644 index 000000000..3f84ee6f2 --- /dev/null +++ b/package/liblzo/ipkg/liblzo.control @@ -0,0 +1,4 @@ +Package: liblzo +Priority: optional +Section: libs +Description: a real-time data compression library diff --git a/package/liblzo/patches/lzo-cross-compile.patch b/package/liblzo/patches/lzo-cross-compile.patch new file mode 100644 index 000000000..68a3d0449 --- /dev/null +++ b/package/liblzo/patches/lzo-cross-compile.patch @@ -0,0 +1,43 @@ +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 + + + diff --git a/package/libtool/Config.in b/package/libtool/Config.in index 5102863a3..4cc721379 100644 --- a/package/libtool/Config.in +++ b/package/libtool/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_LIBTOOL - bool + tristate depends BR2_PACKAGE_LIBLTDL config BR2_PACKAGE_LIBLTDL diff --git a/package/lua/Config.in b/package/lua/Config.in index 0b2e850ba..54c633088 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -1,7 +1,7 @@ menu "lua............................... LUA programming language" config BR2_COMPILE_LUA - bool + tristate default y depends BR2_PACKAGE_LIBLUA diff --git a/package/lzo/Config.in b/package/lzo/Config.in deleted file mode 100644 index 58000d977..000000000 --- a/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/package/lzo/Makefile b/package/lzo/Makefile deleted file mode 100644 index dddc3ce88..000000000 --- a/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/package/lzo/ipkg/liblzo.control b/package/lzo/ipkg/liblzo.control deleted file mode 100644 index 3f84ee6f2..000000000 --- a/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/package/lzo/patches/lzo-cross-compile.patch b/package/lzo/patches/lzo-cross-compile.patch deleted file mode 100644 index 68a3d0449..000000000 --- a/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 - - - diff --git a/package/matrixssl/Config.in b/package/matrixssl/Config.in index be0a306fb..3d4532e52 100644 --- a/package/matrixssl/Config.in +++ b/package/matrixssl/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_MATRIXSSL - bool + tristate depends BR2_PACKAGE_LIBMATRIXSSL config BR2_PACKAGE_LIBMATRIXSSL diff --git a/package/mini_httpd/Config.in b/package/mini_httpd/Config.in index 2273499fb..7b908815e 100644 --- a/package/mini_httpd/Config.in +++ b/package/mini_httpd/Config.in @@ -1,7 +1,7 @@ menu "mini-httpd........................ A small web server" config BR2_COMPILE_MINI_HTTPD - bool + tristate default n depends BR2_PACKAGE_MINI_HTTPD || BR2_PACKAGE_MINI_HTTPD_MATRIXSSL || BR2_PACKAGE_MINI_HTTPD_OPENSSL diff --git a/package/miredo/Config.in b/package/miredo/Config.in index d07dd8162..eadca0a6e 100644 --- a/package/miredo/Config.in +++ b/package/miredo/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_MIREDO - bool + tristate default n depends BR2_PACKAGE_MIREDO || BR2_PACKAGE_MIREDO_SERVER diff --git a/package/monit/Config.in b/package/monit/Config.in index e07fd628b..d8221ef59 100644 --- a/package/monit/Config.in +++ b/package/monit/Config.in @@ -1,7 +1,7 @@ #menu "monit............................. System services monitoring utility" config BR2_COMPILE_MONIT - bool + tristate default n depends BR2_PACKAGE_MONIT || BR2_PACKAGE_MONIT_NOSSL diff --git a/package/mysql/Config.in b/package/mysql/Config.in index 89f0e2648..bda7142ca 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_MYSQL - bool + tristate default n depends BR2_PACKAGE_LIBMYSQLCLIENT diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in index 1fbdd7b3f..552a6ccd2 100644 --- a/package/ncurses/Config.in +++ b/package/ncurses/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_NCURSES - bool + tristate depends BR2_PACKAGE_LIBNCURSES config BR2_PACKAGE_LIBNCURSES diff --git a/package/ndisc/Config.in b/package/ndisc/Config.in index a1ae2dc6d..5513edb0a 100644 --- a/package/ndisc/Config.in +++ b/package/ndisc/Config.in @@ -1,7 +1,7 @@ menu "ndisc6............................ IPv6 discovery tools" config BR2_COMPILE_NDISC6 - bool + tristate default n depends BR2_PACKAGE_NDISC6 || BR2_PACKAGE_RDISC6 || BR2_PACKAGE_TCPTRACEROUTE6 diff --git a/package/net-snmp/Config.in b/package/net-snmp/Config.in index 80c972cca..e0a6d0387 100644 --- a/package/net-snmp/Config.in +++ b/package/net-snmp/Config.in @@ -1,7 +1,7 @@ menu "net-snmp.......................... Open source SNMP (Simple Network Management Protocol) implementation" config BR2_COMPILE_NET_SNMP - bool + tristate default n depends BR2_PACKAGE_LIBNETSNMP || BR2_PACKAGE_SNMPD_STATIC diff --git a/package/opencdk/Config.in b/package/opencdk/Config.in index f96bd0a90..589b09519 100644 --- a/package/opencdk/Config.in +++ b/package/opencdk/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_OPENCDK - bool + tristate default n depends BR2_PACKAGE_LIBOPENCDK diff --git a/package/openldap/Config.in b/package/openldap/Config.in index 1afab0c83..ec04eb4bc 100644 --- a/package/openldap/Config.in +++ b/package/openldap/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_OPENLDAP - bool + tristate default n depends BR2_PACKAGE_LIBOPENLDAP diff --git a/package/openssh/Config.in b/package/openssh/Config.in index 6b344f897..387ee51fc 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -1,7 +1,7 @@ menu "openssh........................... A free implementation of the Secure Shell protocol" config BR2_COMPILE_OPENSSH - bool + tristate default n depends BR2_PACKAGE_OPENSSH_CLIENT || BR2_PACKAGE_OPENSSH_SERVER || BR2_PACKAGE_OPENSSH_SFTP_CLIENT || BR2_PACKAGE_OPENSSH_SFTP_SERVER diff --git a/package/openssl/Config.in b/package/openssl/Config.in index c81c2461c..e852c9f0f 100644 --- a/package/openssl/Config.in +++ b/package/openssl/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_OPENSSL - bool + tristate default n depends BR2_PACKAGE_LIBOPENSSL diff --git a/package/osiris/Config.in b/package/osiris/Config.in index 9a3d0a470..69afb9077 100644 --- a/package/osiris/Config.in +++ b/package/osiris/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_OSIRIS - bool + tristate default n depends BR2_PACKAGE_OSIRISD diff --git a/package/pcre/Config.in b/package/pcre/Config.in index dcbcfae58..7bb2de691 100644 --- a/package/pcre/Config.in +++ b/package/pcre/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_PCRE - bool + tristate default n depends BR2_PACKAGE_LIBPCRE diff --git a/package/php4/Config.in b/package/php4/Config.in index 434b1f341..087a62c39 100644 --- a/package/php4/Config.in +++ b/package/php4/Config.in @@ -1,7 +1,7 @@ menu "php4.............................. PHP4 Hypertext preprocessor" config BR2_COMPILE_PHP4 - bool + tristate default y depends BR2_PACKAGE_PHP4_CLI || BR2_PACKAGE_PHP4_CGI || BR2_PACKAGE_PHP4_FASTCGI diff --git a/package/php5/Config.in b/package/php5/Config.in index cae12e4d4..862df9953 100644 --- a/package/php5/Config.in +++ b/package/php5/Config.in @@ -1,7 +1,7 @@ menu "php5.............................. PHP5 Hypertext preprocessor" config BR2_COMPILE_PHP5 - bool + tristate default n depends BR2_PACKAGE_PHP5_CLI || BR2_PACKAGE_PHP5_CGI || BR2_PACKAGE_PHP5_FASTCGI diff --git a/package/popt/Config.in b/package/popt/Config.in index b06933ae7..a24882b6c 100644 --- a/package/popt/Config.in +++ b/package/popt/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_POPT - bool + tristate depends BR2_PACKAGE_LIBPOPT config BR2_PACKAGE_LIBPOPT diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in index dc9555f90..776dccc4e 100644 --- a/package/postgresql/Config.in +++ b/package/postgresql/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_POSTGRESQL - bool + tristate default n depends BR2_PACKAGE_LIBPQ diff --git a/package/readline/Config.in b/package/readline/Config.in index deca0d644..9c5519b4d 100644 --- a/package/readline/Config.in +++ b/package/readline/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_READLINE - bool + tristate default n depends BR2_PACKAGE_LIBREADLINE diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in index 2b4d9f21b..a88b09b0c 100644 --- a/package/rp-pppoe/Config.in +++ b/package/rp-pppoe/Config.in @@ -1,7 +1,7 @@ #menu "rp-pppoe.......................... Roaring Penguin PPPoE (PPP over Ethernet) implementation" config BR2_COMPILE_RP_PPPOE - bool + tristate default n depends BR2_PACKAGE_PPPOE_CLIENT || BR2_PACKAGE_PPPOE_RELAY || BR2_PACKAGE_PPPOE_SERVER || BR2_PACKAGE_PPPOE_SNIFF diff --git a/package/rrdtool1/Config.in b/package/rrdtool1/Config.in index de01aca2b..e79df5b4a 100644 --- a/package/rrdtool1/Config.in +++ b/package/rrdtool1/Config.in @@ -1,7 +1,7 @@ config BR2_COMPILE_RRDTOOL1 prompt "rrdtool1.......................... Round Robin Database (RRD) tools (v1.0.x)" - bool - default y + tristate + default m if CONFIG_DEVEL config BR2_PACKAGE_LIBRRD1 prompt "librrd1......................... Round Robin Database (RRD) management library (v1.0.x)" @@ -53,6 +53,7 @@ config BR2_PACKAGE_RRDCGI1 config BR2_PACKAGE_RRDTOOL1 prompt "rrdtool1........................ Round Robin Database (RRD) management tools (v1.0.x)" tristate + default m if CONFIG_DEVEL depends BR2_COMPILE_RRDTOOL1 select BR2_PACKAGE_LIBRRD1 help diff --git a/package/rrs/Config.in b/package/rrs/Config.in index 30651d1f2..28a3f0bde 100644 --- a/package/rrs/Config.in +++ b/package/rrs/Config.in @@ -1,7 +1,7 @@ #menu "rrs............................... A reverse (connecting) remote shell" config BR2_COMPILE_RRS - bool + tristate default n depends BR2_PACKAGE_RRS || BR2_PACKAGE_RRS_NOSSL diff --git a/package/sablevm-classpath/Config.in b/package/sablevm-classpath/Config.in index 9b57f0d78..4aef84db3 100644 --- a/package/sablevm-classpath/Config.in +++ b/package/sablevm-classpath/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_SABLEVM_CLASSPATH - bool + tristate default n depends BR2_PACKAGE_LIBSABLEVM_CLASSPATH diff --git a/package/samba/Config.in b/package/samba/Config.in index 438221620..bf018509c 100644 --- a/package/samba/Config.in +++ b/package/samba/Config.in @@ -1,7 +1,7 @@ #menu "samba............................. A NetBIOS/SMB implementation" config BR2_COMPILE_SAMBA - bool + tristate default n depends BR2_PACKAGE_SAMBA || BR2_PACKAGE_SAMBA_CLIENT || BR2_PACKAGE_SMBFS diff --git a/package/shfs/Config.in b/package/shfs/Config.in index 2ab061003..b7c7cfa85 100644 --- a/package/shfs/Config.in +++ b/package/shfs/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_SHFS - bool + tristate default n depends BR2_PACKAGE_SHFS_UTILS diff --git a/package/speex/Config.in b/package/speex/Config.in index 800de56a7..2a5104465 100644 --- a/package/speex/Config.in +++ b/package/speex/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_SPEEX - bool + tristate default n depends BR2_PACKAGE_LIBSPEEX diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index 626c5c3dc..600a05e15 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_SQLITE - bool + tristate default n depends BR2_PACKAGE_LIBSQLITE diff --git a/package/sqlite2/Config.in b/package/sqlite2/Config.in index edab7b1c0..99ba351c8 100644 --- a/package/sqlite2/Config.in +++ b/package/sqlite2/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_SQLITE2 - bool + tristate default n depends BR2_PACKAGE_LIBSQLITE2 diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in index b3e88d59e..c9f525be5 100644 --- a/package/usbutils/Config.in +++ b/package/usbutils/Config.in @@ -1,5 +1,5 @@ config BR2_COMPILE_USBUTILS - bool + tristate depends BR2_PACKAGE_LSUSB config BR2_PACKAGE_LSUSB diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 87d41ea49..9f1c3a7f9 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -1,7 +1,7 @@ menu "util-linux" config BR2_COMPILE_UTIL_LINUX - bool + tristate default n depends BR2_PACKAGE_FDISK || BR2_PACKAGE_SWAP_UTILS -- cgit v1.2.3