diff options
| author | Rodrigo Vivi <rodrigo.vivi@gmail.com> | 2008-03-27 18:45:00 +0000 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@gmail.com> | 2008-03-27 18:45:00 +0000 |
| commit | bab0bc1011c17ac35ac7499b3db23fa85419e05f (patch) | |
| tree | 26fe87bc48e130d6f1b1a0c1c990622c1c48d63c /packages/popt | |
| parent | e3ba7f3f4a1345008ca97eab8663150fb00b10da (diff) | |
| parent | 6775017f8db3583d4166f48f937bc339b97d0b35 (diff) | |
merge of '487f86d7da4356e5d8c6832b7ff5f0ee9ab8c293'
and 'd1dfc5df9769c50ec5328454ab737f091f6c573f'
Diffstat (limited to 'packages/popt')
| -rw-r--r-- | packages/popt/popt-1.13/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/popt/popt-1.13/iconv.patch | 25 | ||||
| -rw-r--r-- | packages/popt/popt_1.13.bb | 6 |
3 files changed, 29 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..4faf4c4a1d --- /dev/null +++ b/packages/popt/popt-1.13/iconv.patch @@ -0,0 +1,25 @@ +Index: popt-1.13/Makefile.am +=================================================================== +--- popt-1.13.orig/Makefile.am 2007-11-14 20:42:27.000000000 +0000 ++++ popt-1.13/Makefile.am 2008-03-26 22:14:05.000000000 +0000 +@@ -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 +Index: popt-1.13/configure.ac +=================================================================== +--- popt-1.13.orig/configure.ac 2007-11-14 20:42:27.000000000 +0000 ++++ popt-1.13/configure.ac 2008-03-26 22:20:16.000000000 +0000 +@@ -95,6 +95,7 @@ + AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror iconv) + + AM_GNU_GETTEXT([external]) ++AM_ICONV_LINK + + popt_sysconfdir="${sysconfdir}" + eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix} 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} |