From 9df0bbed01a6943430dbfb7508f02e0be524fad2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 11 Oct 2008 09:47:05 +0200 Subject: [PATCH] gettext-runtime: do not link against libintl from base. --HG-- extra : convert_revision : 59206e9b1a020b0687d4505895cf3de711486c90 --- templates/gettext-runtime-fix-build.diff | 23 +++++++++++++++++++++++ templates/gettext-runtime.tmpl | 1 + 2 files changed, 24 insertions(+) create mode 100644 templates/gettext-runtime-fix-build.diff diff --git a/templates/gettext-runtime-fix-build.diff b/templates/gettext-runtime-fix-build.diff new file mode 100644 index 00000000000..78243e5c172 --- /dev/null +++ b/templates/gettext-runtime-fix-build.diff @@ -0,0 +1,23 @@ +Don't link against libintl from base, will cause conflicts when this +package is installed. + +--- Makefile.in.orig 2008-10-11 09:28:14.000000000 +0200 ++++ Makefile.in 2008-10-11 09:28:32.000000000 +0200 +@@ -350,7 +350,7 @@ LDFLAGS = @LDFLAGS@ + LIBGRT_LIBDEPS = @LIBGRT_LIBDEPS@ + LIBGRT_LTLIBDEPS = @LIBGRT_LTLIBDEPS@ + LIBICONV = @LIBICONV@ +-LIBINTL = @LIBINTL@ ++LIBINTL = + LIBMULTITHREAD = @LIBMULTITHREAD@ + LIBOBJS = @LIBOBJS@ + LIBPTH = @LIBPTH@ +@@ -362,7 +362,7 @@ LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ + LTLIBC = @LTLIBC@ + LTLIBICONV = @LTLIBICONV@ +-LTLIBINTL = @LTLIBINTL@ ++LTLIBINTL = + LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ + LTLIBOBJS = @LTLIBOBJS@ + LTLIBPTH = @LTLIBPTH@ diff --git a/templates/gettext-runtime.tmpl b/templates/gettext-runtime.tmpl index eea3af7075a..c5437adf26d 100755 --- a/templates/gettext-runtime.tmpl +++ b/templates/gettext-runtime.tmpl @@ -1,6 +1,7 @@ # Template build file for 'gettext-runtime'. pkgname=gettext-runtime version=0.17 +patch_files="$pkgname-fix-build.diff" distfiles="gettext-$version" wrksrc="gettext-$version/gettext-runtime" extract_sufx=".tar.gz"