summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2008-03-25 20:59:41 +0000
committerHenning Heinold <heinold@inf.fu-berlin.de>2008-03-25 20:59:41 +0000
commit5064915a62b2c6535caed2f2f6a67e02430efb9f (patch)
treea3376919b57ab352ea9382149079c5c874cc11e2
parent6da1288e1528f73367d792817ea1b46a9f30f87c (diff)
pop-1.13: fix uclibc builds
* add iconv.patch so libpopt.la finds all symbols even for libicionv * bump pr
-rw-r--r--packages/popt/popt-1.13/.mtn2git_empty0
-rw-r--r--packages/popt/popt-1.13/iconv.patch13
-rw-r--r--packages/popt/popt_1.13.bb6
3 files changed, 17 insertions, 2 deletions
diff --git a/packages/popt/popt-1.13/.mtn2git_empty b/packages/popt/popt-1.13/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/popt/popt-1.13/.mtn2git_empty
diff --git a/packages/popt/popt-1.13/iconv.patch b/packages/popt/popt-1.13/iconv.patch
new file mode 100644
index 0000000000..83c70b0560
--- /dev/null
+++ b/packages/popt/popt-1.13/iconv.patch
@@ -0,0 +1,13 @@
+Index: popt-1.13/Makefile.am
+===================================================================
+--- popt-1.13.orig/Makefile.am 2008-03-25 21:51:12.000000000 +0100
++++ popt-1.13/Makefile.am 2008-03-25 21:51:42.000000000 +0100
+@@ -39,7 +39,7 @@
+ usrlib_LTLIBRARIES = libpopt.la
+
+ libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
+-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@
++libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+
+ if HAVE_LD_VERSION_SCRIPT
+ libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
diff --git a/packages/popt/popt_1.13.bb b/packages/popt/popt_1.13.bb
index 9b071ba731..7a736bde87 100644
--- a/packages/popt/popt_1.13.bb
+++ b/packages/popt/popt_1.13.bb
@@ -2,11 +2,13 @@ require popt.inc
DEPENDS = "gettext virtual/libintl"
-PR = "r0"
+PR = "r1"
inherit autotools
-SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz"
+SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz \
+ file://iconv.patch;patch=1 \
+ "
do_stage() {
oe_libinstall -a -so libpopt ${STAGING_LIBDIR}