From: Nicolas Thill Date: Sun, 6 Mar 2005 12:30:39 +0000 (+0000) Subject: Add popt package X-Git-Tag: reboot~33394 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2adfbaaa8d5265bd670ce14c6702c2109f3d9a13;p=openwrt%2Fopenwrt.git Add popt package SVN-Revision: 317 --- diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in index ecb0885c36..e5460a23b4 100644 --- a/openwrt/package/Config.in +++ b/openwrt/package/Config.in @@ -22,6 +22,7 @@ source "package/zlib/Config.in" source "package/matrixssl/Config.in" source "package/lzo/Config.in" source "package/openssl/Config.in" +source "package/popt/Config.in" endmenu diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index 638a0ebc28..39c5b9cc66 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -15,6 +15,7 @@ package-$(BR2_PACKAGE_ZLIB) += zlib package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl package-$(BR2_PACKAGE_OPENSSL) += openssl package-$(BR2_PACKAGE_OPENVPN) += openvpn +package-$(BR2_PACKAGE_POPT) += popt package-$(BR2_PACKAGE_PPTPD) += pptpd package-$(BR2_PACKAGE_IPROUTE2) += iproute2 diff --git a/openwrt/package/popt/Config.in b/openwrt/package/popt/Config.in new file mode 100644 index 0000000000..291e69330b --- /dev/null +++ b/openwrt/package/popt/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_POPT + tristate "popt (a command line option parsing library)" + default m + help + A command line option parsing library + + ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ + + diff --git a/openwrt/package/popt/Makefile b/openwrt/package/popt/Makefile new file mode 100644 index 0000000000..ac05eb53c3 --- /dev/null +++ b/openwrt/package/popt/Makefile @@ -0,0 +1,46 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME := popt +PKG_VERSION := 1.7 +PKG_RELEASE := 2 + +PKG_SOURCE_SITE := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ +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_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk + + +$(DL_DIR)/$(PKG_SOURCE_FILE): + mkdir -p $(DL_DIR) + $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + +$(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) - + $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME)-\*.diff + chmod a+x $(PKG_BUILD_DIR)/ipkg/rules + +$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules + cd $(PKG_BUILD_DIR); \ + ipkg/rules \ + TOPDIR="$(TOPDIR)" \ + IPKG_RULES_INC="$(TOPDIR)/rules.mk" \ + INSTALL_DIR="$(STAGING_DIR)" \ + package + +$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + +source: $(DL_DIR)/$(PKG_SOURCE_FILE) +prepare: $(PKG_BUILD_DIR)/ipkg/rules +compile: $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list + +clean: + rm -rf $(PKG_BUILD_DIR) + rm -f $(STAGING_DIR)/usr/include/popt.h + rm -f $(STAGING_DIR)/usr/lib/libpopt\* + rm -f $(PACKAGE_DIR)/lib$(PKG_NAME)\*.ipk + diff --git a/openwrt/package/popt/popt-1.7-2.diff b/openwrt/package/popt/popt-1.7-2.diff new file mode 100644 index 0000000000..9cff3c978d --- /dev/null +++ b/openwrt/package/popt/popt-1.7-2.diff @@ -0,0 +1,146 @@ +diff -ruN popt-1.7-orig/ipkg/libpopt/CONTROL/control popt-1.7-2/ipkg/libpopt/CONTROL/control +--- popt-1.7-orig/ipkg/libpopt/CONTROL/control 1970-01-01 01:00:00.000000000 +0100 ++++ popt-1.7-2/ipkg/libpopt/CONTROL/control 2005-02-27 16:29:21.000000000 +0100 +@@ -0,0 +1,8 @@ ++Package: libpopt ++Priority: optional ++Section: libs ++Version: 1.7-2 ++Architecture: mipsel ++Maintainer: Nico ++Source: http://nthill.free.fr/openwrt/sources/popt/ ++Description: a command line option parsing library +diff -ruN popt-1.7-orig/ipkg/libpopt-dev/CONTROL/control popt-1.7-2/ipkg/libpopt-dev/CONTROL/control +--- popt-1.7-orig/ipkg/libpopt-dev/CONTROL/control 1970-01-01 01:00:00.000000000 +0100 ++++ popt-1.7-2/ipkg/libpopt-dev/CONTROL/control 2005-02-27 16:29:29.000000000 +0100 +@@ -0,0 +1,8 @@ ++Package: libpopt-dev ++Priority: optional ++Section: devel ++Version: 1.7-2 ++Architecture: mipsel ++Maintainer: Nico ++Source: http://nthill.free.fr/openwrt/sources/popt/ ++Description: a command line option parsing library (development) +diff -ruN popt-1.7-orig/ipkg/rules popt-1.7-2/ipkg/rules +--- popt-1.7-orig/ipkg/rules 1970-01-01 01:00:00.000000000 +0100 ++++ popt-1.7-2/ipkg/rules 2005-02-27 16:31:03.000000000 +0100 +@@ -0,0 +1,118 @@ ++#!/usr/bin/make -f ++ ++ifneq ($(strip ${IPKG_RULES_INC}),) ++ include $(IPKG_RULES_INC) ++endif ++ ++## ++ ++CURRENT_DIR := $(shell pwd) ++ ++INSTALL_DIR = $(CURRENT_DIR)/ipkg-install ++ ++I_LIBPOPT := ipkg/libpopt ++I_LIBPOPT_DEV := ipkg/libpopt-dev ++ ++BUILD_DEPS := \ ++ ++## ++ ++all: package ++ ++.stamp-configured: $(BUILD_DEPS) ++ ++ rm -rf config.cache ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ am_cv_func_iconv=no \ ++ ./configure \ ++ --target=$(GNU_TARGET_NAME) \ ++ --host=$(GNU_TARGET_NAME) \ ++ --build=$(GNU_HOST_NAME) \ ++ --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) \ ++ --enable-shared \ ++ --enable-static \ ++ ++ touch .stamp-configured ++ ++ ++.stamp-built: .stamp-configured ++ ++ $(MAKE) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ ++ touch .stamp-built ++ ++ ++$(INSTALL_DIR)/usr/include/popt.h: .stamp-built ++ ++ mkdir -p $(INSTALL_DIR) ++ ++ $(MAKE) \ ++ DESTDIR="$(INSTALL_DIR)" \ ++ program_transform_name="s,x,x," \ ++ install ++ ++ ++configure: .stamp-configured ++ ++ ++build: .stamp-built ++ ++ ++install: $(INSTALL_DIR)/usr/include/popt.h ++ ++ ++package: $(INSTALL_DIR)/usr/include/popt.h ++ ++ mkdir -p $(I_LIBPOPT)/usr/lib ++ cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.so.* $(I_LIBPOPT)/usr/lib/ ++ $(STRIP) $(I_LIBPOPT)/usr/lib/lib*.so.* ++ ++ mkdir -p $(I_LIBPOPT_DEV)/usr/include ++ cp -fpR $(INSTALL_DIR)/usr/include/popt.h $(I_LIBPOPT_DEV)/usr/include/ ++ mkdir -p $(I_LIBPOPT_DEV)/usr/lib ++ cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.a $(I_LIBPOPT_DEV)/usr/lib/ ++ cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.so* $(I_LIBPOPT_DEV)/usr/lib/ ++ ++ chmod 0755 $(I_LIBPOPT)/CONTROL/ ++ chmod 0644 $(I_LIBPOPT)/CONTROL/control ++ ++ chmod 0755 $(I_LIBPOPT_DEV)/CONTROL/ ++ chmod 0644 $(I_LIBPOPT_DEV)/CONTROL/control ++ ++ $(IPKG_BUILD) $(I_LIBPOPT) $(IPKG_TARGET_DIR) ++ $(IPKG_BUILD) $(I_LIBPOPT_DEV) $(IPKG_TARGET_DIR) ++ ++ ++clean: ++ ++ -$(MAKE) clean ++ rm -rf .stamp-* ++ rm -rf $(INSTALL_DIR) ++ rm -rf $(I_LIBPOPT)/usr ++ rm -rf $(I_LIBPOPT_DEV)/usr ++ ++ ++control: ++ ++ @cat $(I_LIBPOPT)/CONTROL/control ++ @echo ++ @cat $(I_LIBPOPT_DEV)/CONTROL/control ++ @echo ++ ++ ++.PHONY: configure build install package clean control