From: nico Date: Fri, 13 May 2005 03:36:39 +0000 (+0000) Subject: Convert gmp to new packaging style X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/5e4fe2fceaa9f170006177bdbada0c8a61f6a887 Convert gmp to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk@870 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index 2ae53d54b..c4314a08c 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -21,7 +21,6 @@ package-$(BR2_PACKAGE_FPING) += fping package-$(BR2_PACKAGE_FPROBE) += fprobe package-$(BR2_PACKAGE_FUSE) += fuse package-$(BR2_PACKAGE_GLIB1) += glib -package-$(BR2_PACKAGE_GMP) += gmp package-$(BR2_PACKAGE_HASERL) += haserl package-$(BR2_PACKAGE_IPKG) += ipkg package-$(BR2_PACKAGE_IPTABLES) += iptables @@ -30,6 +29,7 @@ package-$(BR2_PACKAGE_KISMET) += kismet package-$(BR2_PACKAGE_L2TPD) += l2tpd package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux package-$(BR2_PACKAGE_LIBELF) += libelf +package-$(BR2_PACKAGE_LIBGMP) += gmp package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread package-$(BR2_PACKAGE_LIBUSB) += libusb package-$(BR2_PACKAGE_LZO) += lzo diff --git a/openwrt/package/gmp/Config.in b/openwrt/package/gmp/Config.in index 132697dff..d561f6782 100644 --- a/openwrt/package/gmp/Config.in +++ b/openwrt/package/gmp/Config.in @@ -1,6 +1,9 @@ -config BR2_PACKAGE_GMP +config BR2_PACKAGE_LIBGMP tristate "libgmp" default m if CONFIG_DEVEL help - libgmp + GNU multiprecision arithmetic library + http://www.swox.com/gmp/ + + diff --git a/openwrt/package/gmp/Makefile b/openwrt/package/gmp/Makefile index f32d98811..10e95e70d 100644 --- a/openwrt/package/gmp/Makefile +++ b/openwrt/package/gmp/Makefile @@ -9,62 +9,69 @@ PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891 PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/gmp/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=bzcat -PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +include $(TOPDIR)/package/rules.mk -$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.unpacked +$(eval $(call PKG_template,LIBGMP,libgmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked - (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ + --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_NLS) \ + $(DISABLE_LARGEFILE) \ + --enable-shared \ + --enable-static \ ); touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/.libs/libgmp.so: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) + mkdir -p $(PKG_INSTALL_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + install + touch $(PKG_BUILD_DIR)/.built + +$(IPKG_LIBGMP): + install -m0755 -d $(IDIR_LIBGMP)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(IDIR_LIBGMP)/usr/lib/ + $(RSTRIP) $(IDIR_LIBGMP) + $(IPKG_BUILD) $(IDIR_LIBGMP) $(PACKAGE_DIR) -$(PKG_IPK): $(PKG_BUILD_DIR)/.libs/libgmp.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(STAGING_DIR)" install - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_IPK_DIR)" install - rm $(PKG_IPK_DIR)/usr/lib/*.la - rm $(PKG_IPK_DIR)/usr/lib/*.a - $(STRIP) $(PKG_IPK_DIR)/usr/lib/*.so - rm -rf $(PKG_IPK_DIR)/usr/info - rm -rf $(PKG_IPK_DIR)/usr/include - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +$(STAGING_DIR)/usr/lib/libgmp.so: $(PKG_BUILD_DIR)/.built + mkdir -p $(STAGING_DIR)/usr/include + cp -fpR $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/ + mkdir -p $(I_LIBPCAP_DEV)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/ + touch $(STAGING_DIR)/usr/lib/libgmp.so -$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) +install-dev: $(STAGING_DIR)/usr/lib/libgmp.so -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.unpacked -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list +uninstall-dev: + rm -rf $(STAGING_DIR)/usr/include/gmp* + rm -rf $(STAGING_DIR)/usr/lib/libgmp.{a,so*} -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) +compile: install-dev +clean: uninstall-dev diff --git a/openwrt/package/gmp/gmp.control b/openwrt/package/gmp/gmp.control deleted file mode 100644 index 66c8cc906..000000000 --- a/openwrt/package/gmp/gmp.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: gmp -Priority: optional -Section: net -Maintainer: Waldemar Brodkorb -Source: buildroot internal -Description: GNU multiprecision library diff --git a/openwrt/package/gmp/ipkg/libgmp.control b/openwrt/package/gmp/ipkg/libgmp.control new file mode 100644 index 000000000..a4d7c8ce3 --- /dev/null +++ b/openwrt/package/gmp/ipkg/libgmp.control @@ -0,0 +1,6 @@ +Package: libgmp +Priority: optional +Section: net +Maintainer: Waldemar Brodkorb +Source: buildroot internal +Description: GNU multiprecision arithmetic library diff --git a/openwrt/package/openswan/Config.in b/openwrt/package/openswan/Config.in index 9b7cc60d2..f8e8ec1a2 100644 --- a/openwrt/package/openswan/Config.in +++ b/openwrt/package/openswan/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_OPENSWAN tristate "Openswan" - select BR2_PACKAGE_GMP + select BR2_PACKAGE_LIBGMP default m if CONFIG_DEVEL help Openswan is an implementation of IPsec for Linux. + + http://www.openswan.org/ + +