From: Nicolas Thill Date: Mon, 11 Apr 2005 23:15:24 +0000 (+0000) Subject: Change popt to experimental coding style X-Git-Tag: reboot~33077 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2d609c7bea858a888f0d742815678f10c981a744;p=oweals%2Fopenwrt.git Change popt to experimental coding style SVN-Revision: 635 --- diff --git a/openwrt/package/popt/Makefile b/openwrt/package/popt/Makefile index 7404a703e1..264219df88 100644 --- a/openwrt/package/popt/Makefile +++ b/openwrt/package/popt/Makefile @@ -7,46 +7,84 @@ PKG_VERSION := 1.7 PKG_RELEASE := 4 PKG_MD5SUM := 5988e7aeb0ae4dac8d83561265984cc9 -PKG_SOURCE_SITE := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \ +PKG_SOURCE_URL := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \ http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ -PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_CAT := zcat -PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) +PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_CAT := zcat PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK_DIR := $(PKG_BUILD_DIR)/ipkg -$(DL_DIR)/$(PKG_SOURCE_FILE): +$(DL_DIR)/$(PKG_SOURCE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) -$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) - mkdir -p $(TOOL_BUILD_DIR) - $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - +$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE) + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - # $(PATCH) $(PKG_BUILD_DIR) ./patches - cp -fpR ./ipkg $(PKG_BUILD_DIR)/ - find $(PKG_BUILD_DIR) -name CVS | xargs rm -rf - chmod a+x $(PKG_BUILD_DIR)/ipkg/rules - touch $(PKG_BUILD_DIR)/ipkg/rules - -$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules - cd $(PKG_BUILD_DIR); \ - TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \ - INSTALL_DIR="$(STAGING_DIR)" \ - ./ipkg/rules package - -$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK) + touch $(PKG_BUILD_DIR)/.patched + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched + (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(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_NLS) \ + $(DISABLE_LARGEFILE) \ + --enable-shared \ + --enable-static \ + ); + touch $(PKG_BUILD_DIR)/.configured + +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured + $(MAKE) -C "$(PKG_BUILD_DIR)" + touch $(PKG_BUILD_DIR)/.built + +$(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built + $(MAKE) -C "$(PKG_BUILD_DIR)" \ + DESTDIR="$(STAGING_DIR)" \ + install + rm -f $(STAGING_DIR)/usr/lib/libpopt.la + +$(PKG_IPK): $(STAGING_DIR)/usr/lib/libpopt.so + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) libpopt.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(PKG_IPK_DIR)/usr/lib + cp -fp $(STAGING_DIR)/usr/lib/libpopt.so.* $(PKG_IPK_DIR)/usr/lib/ + $(STRIP) $(PKG_IPK_DIR)/usr/lib/*.so* + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) + +$(IPKG_STATE_DIR)/info/libpopt.list: $(PKG_IPK) $(IPKG) install $(PKG_IPK) -source: $(DL_DIR)/$(PKG_SOURCE_FILE) -prepare: $(PKG_BUILD_DIR)/ipkg/rules +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.patched compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list +install: $(IPKG_STATE_DIR)/info/libpopt.list clean: - -cd $(PKG_BUILD_DIR); \ - TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \ - INSTALL_DIR="$(STAGING_DIR)" \ - ./ipkg/rules clean - rm -rf $(PKG_BUILD_DIR) - rm -r $(PKG_IPK) - + -$(MAKE) -C "$(PKG_BUILD_DIR)" \ + DESTDIR="$(STAGING_DIR)" \ + uninstall + rm -rf \ + $(PKG_BUILD_DIR) \ + $(PKG_IPK) \ diff --git a/openwrt/package/popt/libpopt.control b/openwrt/package/popt/libpopt.control new file mode 100644 index 0000000000..b932c4a48f --- /dev/null +++ b/openwrt/package/popt/libpopt.control @@ -0,0 +1,8 @@ +Package: libpopt +Priority: optional +Section: libs +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico +Source: http://nthill.free.fr/openwrt/sources/popt/ +Description: a command line option parsing library