[oe-commits] org.oe.dev popt: add 1.13, close oebug 4070

[xjqian commit]

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

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 6a285e10260332154a41a5fe8d5585c8f7f628d4
ViewMTN: http://monotone.openembedded.org/revision/info/6a285e10260332154a41a5fe8d5585c8f7f628d4
Files:
1
packages/popt/popt-native_1.13.bb
packages/popt/popt.inc
packages/popt/popt_1.13.bb
packages/popt/popt-native_1.7.bb
packages/popt/popt_1.7.bb
Diffs:

#
# mt diff -r4af75eb3c5b2e1ba697ef8bd51a72d7a651dffab -r6a285e10260332154a41a5fe8d5585c8f7f628d4
#
#
#
# add_file "packages/popt/popt-native_1.13.bb"
#  content [9adc79c1a7a3af77525ed1e840b04bd2fea5b02c]
# 
# add_file "packages/popt/popt.inc"
#  content [e2669a5fc0d0dde108a4371fd079255d2f24e099]
# 
# add_file "packages/popt/popt_1.13.bb"
#  content [db37282a2a969d0043017d2270519e9e2551fc32]
# 
# patch "packages/popt/popt-native_1.7.bb"
#  from [8f7c7d6e57edc279b8dfce0a9719928f830db433]
#    to [246cebdb1d197fa3340433865a16f8c8e5c47cd3]
# 
# patch "packages/popt/popt_1.7.bb"
#  from [8261c0c81090853da051d8d0b1f6c476afd817fc]
#    to [0ad3fc90c79b97f9f457f5a179e6eb7c3606b294]
#
============================================================
--- packages/popt/popt-native_1.13.bb	9adc79c1a7a3af77525ed1e840b04bd2fea5b02c
+++ packages/popt/popt-native_1.13.bb	9adc79c1a7a3af77525ed1e840b04bd2fea5b02c
@@ -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}
+}
============================================================
--- packages/popt/popt.inc	e2669a5fc0d0dde108a4371fd079255d2f24e099
+++ packages/popt/popt.inc	e2669a5fc0d0dde108a4371fd079255d2f24e099
@@ -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"
============================================================
--- packages/popt/popt_1.13.bb	db37282a2a969d0043017d2270519e9e2551fc32
+++ packages/popt/popt_1.13.bb	db37282a2a969d0043017d2270519e9e2551fc32
@@ -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}
+}
+
+
============================================================
--- packages/popt/popt-native_1.7.bb	8f7c7d6e57edc279b8dfce0a9719928f830db433
+++ packages/popt/popt-native_1.7.bb	246cebdb1d197fa3340433865a16f8c8e5c47cd3
@@ -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}
+}
============================================================
--- packages/popt/popt_1.7.bb	8261c0c81090853da051d8d0b1f6c476afd817fc
+++ packages/popt/popt_1.7.bb	0ad3fc90c79b97f9f457f5a179e6eb7c3606b294
@@ -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}
 }