readline-5.2: fix for darwin builds

Signed-off-by: Chris Larson <chris_larson@mentor.com>

diff --git a/recipes/readline/darwin.patch b/recipes/readline/darwin.patch
new file mode 100644 (file)
index 0000000..7085a9d
--- /dev/null
+++ b/recipes/readline/darwin.patch
@@ -0,0 +1,20 @@
+--- readline/support/shobj-conf.old    2010-10-20 12:01:58.000000000 -0700
++++ readline/support/shobj-conf        2010-10-20 12:02:36.000000000 -0700
+@@ -142,7 +142,7 @@
+       ;;
+
+ # Darwin/MacOS X
+-darwin8*)
++darwin|darwin[89]*)
+       SHOBJ_STATUS=supported
+       SHLIB_STATUS=supported
+
+@@ -171,7 +171,7 @@
+       SHLIB_LIBSUFF='dylib'
+
+       case "${host_os}" in
+-      darwin[78]*)    SHOBJ_LDFLAGS=''
++      darwin|darwin[789]*)    SHOBJ_LDFLAGS=''
+                       SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+                       ;;
+       *)              SHOBJ_LDFLAGS='-dynamic'

diff --git a/recipes/readline/readline_5.2.bb b/recipes/readline/readline_5.2.bb
index aadb619..cdfa7ce 100644 (file)
--- a/recipes/readline/readline_5.2.bb
+++ b/recipes/readline/readline_5.2.bb
@@ -8,15 +8,15 @@ LICENSE = "GPLv2"
 DEPENDS += "ncurses"
 RPROVIDES_${PN} += "readline"
 LEAD_SONAME = "libreadline.so"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "\
   ftp://ftp.gnu.org/gnu/readline/readline-${PV}.tar.gz \
   file://fix-includes.patch \
   file://configure_fix.patch \
+  file://darwin.patch \
   file://acinclude.m4 \
 "
-S = "${WORKDIR}/readline-${PV}"
 
 inherit autotools
 
@@ -34,6 +34,5 @@ do_install () {
 NATIVE_INSTALL_WORKS = 1
 BBCLASSEXTEND = "native"
 
-
 SRC_URI[md5sum] = "e39331f32ad14009b9ff49cc10c5e751"
 SRC_URI[sha256sum] = "12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45"