summaryrefslogtreecommitdiff
path: root/recipes/gettext
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2009-04-17 16:02:58 -0700
committerChris Larson <clarson@mvista.com>2009-08-19 20:57:35 -0700
commit27765f8a1d20ea7923fdfb667ca9ec7a9037e106 (patch)
tree2f71eaa7b634034828ec3f70bd709dc5f932c98e /recipes/gettext
parent9f35410c925716d58d8f8cff3cf5f8296894d1cd (diff)
gettext: Correct autoconf-lib-link code to defer to the compiler's library search paths.
Ultimately we should have --with-<lib> and --without-<lib> for everything, however if a recipie does not the suspect code wanders through the host system searching for a working library. OE takes great pains to set that all up, lets let it decide the right library. Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> Signed-off-by: Chris Larson <clarson@mvista.com>
Diffstat (limited to 'recipes/gettext')
-rw-r--r--recipes/gettext/files/gettext-autoconf-lib-link-no-L.patch12
-rw-r--r--recipes/gettext/gettext-native_0.14.1.bb2
-rw-r--r--recipes/gettext/gettext-native_0.17.bb2
-rw-r--r--recipes/gettext/gettext_0.14.1.bb3
-rw-r--r--recipes/gettext/gettext_0.17.bb3
5 files changed, 19 insertions, 3 deletions
diff --git a/recipes/gettext/files/gettext-autoconf-lib-link-no-L.patch b/recipes/gettext/files/gettext-autoconf-lib-link-no-L.patch
new file mode 100644
index 0000000000..2fe62c0e19
--- /dev/null
+++ b/recipes/gettext/files/gettext-autoconf-lib-link-no-L.patch
@@ -0,0 +1,12 @@
+--- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~ 2009-04-17 15:12:30.000000000 -0700
++++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4 2009-04-17 15:37:39.000000000 -0700
+@@ -267,6 +267,9 @@
+ fi
+ fi
+ fi
++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
++ dnl when cross compiling and working with a relocated install.
++ found_dir=""
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
diff --git a/recipes/gettext/gettext-native_0.14.1.bb b/recipes/gettext/gettext-native_0.14.1.bb
index f792f3247a..3bf4b50d35 100644
--- a/recipes/gettext/gettext-native_0.14.1.bb
+++ b/recipes/gettext/gettext-native_0.14.1.bb
@@ -1,4 +1,6 @@
require gettext_${PV}.bb
+PR = "r1"
+
S = "${WORKDIR}/gettext-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
inherit native
diff --git a/recipes/gettext/gettext-native_0.17.bb b/recipes/gettext/gettext-native_0.17.bb
index c73a19d78d..89e61c2c74 100644
--- a/recipes/gettext/gettext-native_0.17.bb
+++ b/recipes/gettext/gettext-native_0.17.bb
@@ -1,5 +1,5 @@
require gettext_${PV}.bb
-PR = "r3"
+PR = "r4"
DEPENDS = ""
PROVIDES = ""
diff --git a/recipes/gettext/gettext_0.14.1.bb b/recipes/gettext/gettext_0.14.1.bb
index 9c020f34c7..30fb92d351 100644
--- a/recipes/gettext/gettext_0.14.1.bb
+++ b/recipes/gettext/gettext_0.14.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library."
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
SECTION = "libs"
LICENSE = "GPL"
-PR = "r9"
+PR = "r10"
DEPENDS = "virtual/libiconv"
PROVIDES = "virtual/libintl"
@@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
file://gettext-vpath.patch;patch=1;pnum=1 \
file://fixchicken.patch;patch=1;pnum=1 \
file://linklib_from_0.17.patch;patch=1 \
+ file://gettext-autoconf-lib-link-no-L.patch;patch=1 \
file://getline.m4.patch;patch=1 \
file://disable_java.patch;patch=1"
diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb
index 29cd58a2d4..04dee4c4f2 100644
--- a/recipes/gettext/gettext_0.17.bb
+++ b/recipes/gettext/gettext_0.17.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library."
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
SECTION = "libs"
LICENSE = "GPLv3"
-PR = "r2"
+PR = "r3"
DEPENDS = "gettext-native virtual/libiconv ncurses expat"
PROVIDES = "virtual/libintl"
@@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
file://autotools.patch;patch=1 \
file://wchar-uclibc.patch;patch=1 \
file://use_open_properly.patch;patch=1 \
+ file://gettext-autoconf-lib-link-no-L.patch;patch=1 \
"
SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"