diff options
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch')
| -rw-r--r-- | meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch index 93ef1868c5..9947954dbe 100644 --- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch +++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch @@ -1,7 +1,7 @@ Upstream-Status: Pending -Index: unix/configure -=================================================================== +diff --git unix.orig/configure unix/configure +index 163b210..e531122 100755 --- unix.orig/configure +++ unix/configure @@ -6757,6 +6757,7 @@ fi @@ -12,11 +12,11 @@ Index: unix/configure DL_OBJS="tclLoadDl.o" LD_LIBRARY_PATH_VAR="LIBPATH" -Index: unix/tcl.m4 -=================================================================== +diff --git unix.orig/tcl.m4 unix/tcl.m4 +index 3974753..46870fa 100644 --- unix.orig/tcl.m4 +++ unix/tcl.m4 -@@ -1399,12 +1399,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ +@@ -1420,12 +1420,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: unix/tcl.m4 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) AS_IF([test $do64bit = yes], [ -@@ -1430,6 +1433,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ +@@ -1451,6 +1454,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ GNU*) SHLIB_CFLAGS="-fPIC" SHLIB_SUFFIX=".so" @@ -41,12 +41,12 @@ Index: unix/tcl.m4 SHLIB_LD='${CC} -shared' DL_OBJS="" -@@ -2081,7 +2085,7 @@ dnl # preprocessing tests use only CPPFL +@@ -2103,7 +2107,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} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)' - ], [ - LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} + AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' + DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" |