Patchwork [2/3] readline: update configure-fix.patch

login
register
mail settings
Submitter Hongxu Jia
Date March 3, 2014, 7:16 a.m.
Message ID <9bd4ef2fae49d2aed292c0373cd99b9d7429c7a3.1393830830.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/67829/
State Accepted
Commit eddaf701929a36627fda26e2573d942756a947cc
Headers show

Comments

Hongxu Jia - March 3, 2014, 7:16 a.m.
The configure-fix.patch is used to patch configure.in in 6.2 (or 5.2),
but configure.ac in 6.3

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../{files => readline-5.2}/configure-fix.patch    |  0
 .../readline/readline-6.3/configure-fix.patch      | 35 ++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 rename meta/recipes-core/readline/{files => readline-5.2}/configure-fix.patch (100%)
 create mode 100644 meta/recipes-core/readline/readline-6.3/configure-fix.patch

Patch

diff --git a/meta/recipes-core/readline/files/configure-fix.patch b/meta/recipes-core/readline/readline-5.2/configure-fix.patch
similarity index 100%
rename from meta/recipes-core/readline/files/configure-fix.patch
rename to meta/recipes-core/readline/readline-5.2/configure-fix.patch
diff --git a/meta/recipes-core/readline/readline-6.3/configure-fix.patch b/meta/recipes-core/readline/readline-6.3/configure-fix.patch
new file mode 100644
index 0000000..ef3104f
--- /dev/null
+++ b/meta/recipes-core/readline/readline-6.3/configure-fix.patch
@@ -0,0 +1,35 @@ 
+Upstream-Status: Pending
+
+Without this it fails to link against libtermcap causing various missing
+symbols issues.
+
+RP - 8/10/08
+
+Support 6.3 which uses configure.ac rather than configure.in.
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cea8f91..9075b8f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -218,10 +218,10 @@ if test -f ${srcdir}/support/shobj-conf; then
+         AC_MSG_CHECKING(configuration for building shared libraries)
+         eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
+ 
+-#	case "$SHLIB_LIBS" in
+-#	*curses*|*termcap*|*termlib*)	;;
+-#	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
+-#	esac
++	case "$SHLIB_LIBS" in
++	*curses*|*termcap*|*termlib*)	;;
++	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
++	esac
+ 	
+         AC_SUBST(SHOBJ_CC)
+         AC_SUBST(SHOBJ_CFLAGS)
+-- 
+1.8.1.2
+