From f32f481af401630c3221d80b3f01962c93b2f2e2 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Tue, 18 Mar 2008 07:30:02 +0000 Subject: popt: add 1.13, close oebug 4070 * fix native install * fix dependency mangling between target and native * explicitly DEPENDS virtual/libintl * verified the m4.patch and intl.patch in 1.7 has landed upstream in 1.13 * 1.7 is annoyingly slow or even impossible to fetch --- packages/popt/popt-native_1.13.bb | 16 ++++++++++++++++ packages/popt/popt-native_1.7.bb | 19 +++++++++++++++++-- packages/popt/popt.inc | 5 +++++ packages/popt/popt_1.13.bb | 16 ++++++++++++++++ packages/popt/popt_1.7.bb | 19 +++++++++---------- 5 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 packages/popt/popt-native_1.13.bb create mode 100644 packages/popt/popt.inc create mode 100644 packages/popt/popt_1.13.bb (limited to 'packages/popt') diff --git a/packages/popt/popt-native_1.13.bb b/packages/popt/popt-native_1.13.bb new file mode 100644 index 0000000000..0124aa8485 --- /dev/null +++ b/packages/popt/popt-native_1.13.bb @@ -0,0 +1,16 @@ +require popt.inc + +DEPENDS = "gettext-native" + +PR = "r0" + +inherit native autotools + +SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz" + +S = "${WORKDIR}/popt-${PV}" + +do_install() { + oe_libinstall -a -so libpopt ${STAGING_LIBDIR_NATIVE} + install -m 0644 popt.h ${STAGING_INCDIR_NATIVE} +} diff --git a/packages/popt/popt-native_1.7.bb b/packages/popt/popt-native_1.7.bb index 75b90d0763..a83d384eee 100644 --- a/packages/popt/popt-native_1.7.bb +++ b/packages/popt/popt-native_1.7.bb @@ -1,5 +1,20 @@ -require popt_${PV}.bb -inherit native +require popt.inc + +DEPENDS = "gettext-native" + +PR = "r5" + +inherit native autotools + +SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ + file://m4.patch;patch=1 \ + file://intl.patch;patch=1" S = "${WORKDIR}/popt-${PV}" + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/popt-${PV}" + +do_install() { + oe_libinstall -a -so libpopt ${STAGING_LIBDIR_NATIVE} + install -m 0644 popt.h ${STAGING_INCDIR_NATIVE} +} diff --git a/packages/popt/popt.inc b/packages/popt/popt.inc new file mode 100644 index 0000000000..3917805129 --- /dev/null +++ b/packages/popt/popt.inc @@ -0,0 +1,5 @@ +DESCRIPTION = "Popt is a C library for parsing command line parameters" +HOMEPAGE = "http://freshmeat.net/projects/popt" +AUTHOR = "Jeff Johnson" +LICENSE = "MIT" +SECTION = "libs" diff --git a/packages/popt/popt_1.13.bb b/packages/popt/popt_1.13.bb new file mode 100644 index 0000000000..9b071ba731 --- /dev/null +++ b/packages/popt/popt_1.13.bb @@ -0,0 +1,16 @@ +require popt.inc + +DEPENDS = "gettext virtual/libintl" + +PR = "r0" + +inherit autotools + +SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz" + +do_stage() { + oe_libinstall -a -so libpopt ${STAGING_LIBDIR} + install -m 0644 popt.h ${STAGING_INCDIR} +} + + diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb index 137b6744dc..7992db56e7 100644 --- a/packages/popt/popt_1.7.bb +++ b/packages/popt/popt_1.7.bb @@ -1,17 +1,16 @@ -DESCRIPTION = "The popt library exists essentially \ -for parsing command line options." -LICENSE = "MIT" -SECTION = "libs" -DEPENDS = "gettext-native" -PR = "r4" +require popt.inc + +DEPENDS = "gettext virtual/libintl" + +PR = "r5" + +inherit autotools SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ file://m4.patch;patch=1 \ file://intl.patch;patch=1" -inherit autotools - -do_stage () { +do_stage() { oe_libinstall -a -so libpopt ${STAGING_LIBDIR} - install -m 0644 popt.h ${STAGING_INCDIR}/ + install -m 0644 popt.h ${STAGING_INCDIR} } -- cgit v1.2.3