summaryrefslogtreecommitdiff
path: root/packages/popt/popt-1.13/iconv.patch
diff options
context:
space:
mode:
authorStanislav Brabec <utx@penguin.cz>2008-03-26 22:28:24 +0000
committerStanislav Brabec <utx@penguin.cz>2008-03-26 22:28:24 +0000
commit337a56ace1b106c97fa3d54a957db3deb02bc450 (patch)
tree2752375bc9e43c635838c87e605473dd6e5358b7 /packages/popt/popt-1.13/iconv.patch
parentdd67912889f4a30c7b3731c46183d0d843a2e133 (diff)
Fix glibc build of popt-1.13
* use AM_ICONV_LINK in iconv.patch
Diffstat (limited to 'packages/popt/popt-1.13/iconv.patch')
-rw-r--r--packages/popt/popt-1.13/iconv.patch16
1 files changed, 14 insertions, 2 deletions
diff --git a/packages/popt/popt-1.13/iconv.patch b/packages/popt/popt-1.13/iconv.patch
index 83c70b0560..4faf4c4a1d 100644
--- a/packages/popt/popt-1.13/iconv.patch
+++ b/packages/popt/popt-1.13/iconv.patch
@@ -1,7 +1,7 @@
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
+--- 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
@@ -11,3 +11,15 @@ Index: popt-1.13/Makefile.am
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}