aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch')
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index 9947954dbe..eca0a18ec1 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -1,10 +1,10 @@
Upstream-Status: Pending
diff --git unix.orig/configure unix/configure
-index 163b210..e531122 100755
+index f778a7b..25083c2 100755
--- unix.orig/configure
+++ unix/configure
-@@ -6757,6 +6757,7 @@ fi
+@@ -6889,6 +6889,7 @@ fi
LIBS="$LIBS -lc"
SHLIB_CFLAGS=""
SHLIB_SUFFIX=".so"
@@ -13,10 +13,10 @@ index 163b210..e531122 100755
DL_OBJS="tclLoadDl.o"
LD_LIBRARY_PATH_VAR="LIBPATH"
diff --git unix.orig/tcl.m4 unix/tcl.m4
-index 3974753..46870fa 100644
+index b13fddd..7254f66 100644
--- unix.orig/tcl.m4
+++ unix/tcl.m4
-@@ -1420,12 +1420,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -1408,12 +1408,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -33,7 +33,7 @@ index 3974753..46870fa 100644
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
AS_IF([test $do64bit = yes], [
-@@ -1451,6 +1454,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -1439,6 +1442,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
GNU*)
SHLIB_CFLAGS="-fPIC"
SHLIB_SUFFIX=".so"
@@ -41,11 +41,11 @@ index 3974753..46870fa 100644
SHLIB_LD='${CC} -shared'
DL_OBJS=""
-@@ -2103,7 +2107,7 @@ dnl # preprocessing tests use only CPPFLAGS.
+@@ -2098,7 +2102,7 @@ dnl # preprocessing tests use only CPPFLAGS.
AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
-- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${TCL_SHLIB_LD_EXTRAS} ${SHLIB_LD_LIBS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'