summaryrefslogtreecommitdiffstats
path: root/package/popt/popt-1.7-3.diff
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-08 03:57:04 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-08 03:57:04 +0000
commitde2b117c4372034bb316afe0d20a0b4b54725a61 (patch)
treeb8df7410ab392669b9aa61567c889ad9a8c2526c /package/popt/popt-1.7-3.diff
parent19330d1b7be772abb0f3047dd76dbce18bc35077 (diff)
Update popt release (fix ipkg/rules clean)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@348 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/popt/popt-1.7-3.diff')
-rw-r--r--package/popt/popt-1.7-3.diff159
1 files changed, 159 insertions, 0 deletions
diff --git a/package/popt/popt-1.7-3.diff b/package/popt/popt-1.7-3.diff
new file mode 100644
index 000000000..4aa9b8ef8
--- /dev/null
+++ b/package/popt/popt-1.7-3.diff
@@ -0,0 +1,159 @@
+diff -ruN popt-1.7-orig/ipkg/libpopt/CONTROL/control popt-1.7-3/ipkg/libpopt/CONTROL/control
+--- popt-1.7-orig/ipkg/libpopt/CONTROL/control 1970-01-01 01:00:00.000000000 +0100
++++ popt-1.7-3/ipkg/libpopt/CONTROL/control 2005-03-08 03:24:11.000000000 +0100
+@@ -0,0 +1,8 @@
++Package: libpopt
++Priority: optional
++Section: libs
++Version: [TBDL]
++Architecture: [TBDL]
++Maintainer: Nico <nthill@free.fr>
++Source: http://nthill.free.fr/openwrt/sources/popt/
++Description: a command line option parsing library
+diff -ruN popt-1.7-orig/ipkg/popt-dev/CONTROL/control popt-1.7-3/ipkg/popt-dev/CONTROL/control
+--- popt-1.7-orig/ipkg/popt-dev/CONTROL/control 1970-01-01 01:00:00.000000000 +0100
++++ popt-1.7-3/ipkg/popt-dev/CONTROL/control 2005-03-08 03:26:21.000000000 +0100
+@@ -0,0 +1,8 @@
++Package: popt-dev
++Priority: optional
++Section: devel
++Version: [TBDL]
++Architecture: [TBDL]
++Maintainer: Nico <nthill@free.fr>
++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-3/ipkg/rules
+--- popt-1.7-orig/ipkg/rules 1970-01-01 01:00:00.000000000 +0100
++++ popt-1.7-3/ipkg/rules 2005-03-08 03:50:49.000000000 +0100
+@@ -0,0 +1,126 @@
++#!/usr/bin/make -f
++
++ifneq ($(strip ${IPKG_RULES_INC}),)
++ include $(IPKG_RULES_INC)
++endif
++
++##
++
++PKG_VERSION := $(shell cat ./ipkg/version)
++CURRENT_DIR := $(shell pwd)
++INSTALL_DIR = $(CURRENT_DIR)/ipkg-install
++
++I_LIBPOPT := ipkg/libpopt
++I_POPT_DEV := ipkg/popt-dev
++
++BUILD_DEPS := \
++
++CONFIGURE_OPTS = \
++ --enable-shared \
++ --enable-static \
++
++##
++
++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) \
++ $(CONFIGURE_OPTS) \
++
++ 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)" \
++ transform="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_POPT_DEV)/usr/include
++ cp -fpR $(INSTALL_DIR)/usr/include/popt.h $(I_POPT_DEV)/usr/include/
++ mkdir -p $(I_POPT_DEV)/usr/lib
++ cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.a $(I_POPT_DEV)/usr/lib/
++ cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.so* $(I_POPT_DEV)/usr/lib/
++
++ chmod 0755 ipkg/*/CONTROL/
++ chmod 0644 ipkg/*/CONTROL/control
++
++ perl -pi -e "s/^Arch.*:.*/Architecture: $(TARGET_ARCH)/g" ipkg/*/CONTROL/control
++ifneq ($(strip $(PKG_VERSION)),)
++ perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control
++endif
++
++ $(IPKG_BUILD) $(I_LIBPOPT) $(IPKG_TARGET_DIR)
++ $(IPKG_BUILD) $(I_POPT_DEV) $(IPKG_TARGET_DIR)
++
++
++clean:
++
++ -$(MAKE) clean
++ rm -rf .stamp-*
++ rm -rf $(INSTALL_DIR)/usr/include/popt*
++ rm -rf $(INSTALL_DIR)/usr/include/libpopt*
++ rm -rf $(INSTALL_DIR)/usr/share/man/man*/popt*
++ rm -rf $(I_LIBPOPT)/usr
++ rm -rf $(I_POPT_DEV)/usr
++
++
++control:
++
++ @cat $(I_LIBPOPT)/CONTROL/control
++ @echo
++ @cat $(I_POPT_DEV)/CONTROL/control
++ @echo
++
++
++.PHONY: configure build install package clean control
+diff -ruN popt-1.7-orig/ipkg/version popt-1.7-3/ipkg/version
+--- popt-1.7-orig/ipkg/version 1970-01-01 01:00:00.000000000 +0100
++++ popt-1.7-3/ipkg/version 2005-03-08 03:23:49.000000000 +0100
+@@ -0,0 +1 @@
++1.7-3