mirror of
https://git.yoctoproject.org/poky
synced 2026-02-09 18:23:02 +01:00
5505bde50f
This helps in compiling other programs like expect which depend on private headers but 8.5, 8.6 and so on is enough granularity and currently we had 8.6.x and so on which means that expect recipe will need to be touched whenever there is minor update of tcl. Additionally the encode creating symlink to shared object in patch and remove it from recipe Refresh patches after making changes to Configure.in we propertly generate configure and not patch is directly as was the case. (From OE-Core rev: 67f44193135c789e478410347ff58ed110ed9484) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
Upstream-Status: Pending
|
|
|
|
Index: unix/configure
|
|
===================================================================
|
|
--- unix.orig/configure 2013-09-19 13:17:13.000000000 -0700
|
|
+++ unix/configure 2013-11-11 00:20:51.519490342 -0800
|
|
@@ -7599,6 +7599,9 @@
|
|
# get rid of the warnings.
|
|
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
|
|
|
|
+ # following line added by CW for Debian GNU/Linux
|
|
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
|
|
+
|
|
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
|
|
DL_OBJS="tclLoadDl.o"
|
|
DL_LIBS="-ldl"
|
|
Index: unix/tcl.m4
|
|
===================================================================
|
|
--- unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700
|
|
+++ unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800
|
|
@@ -1415,6 +1415,9 @@
|
|
# get rid of the warnings.
|
|
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
|
|
|
|
+ # following line added by CW for Debian GNU/Linux
|
|
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
|
|
+
|
|
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
|
|
DL_OBJS="tclLoadDl.o"
|
|
DL_LIBS="-ldl"
|
|
Index: unix/Makefile.in
|
|
===================================================================
|
|
--- unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700
|
|
+++ unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800
|
|
@@ -796,7 +796,10 @@
|
|
done;
|
|
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
|
|
@@INSTALL_LIB@
|
|
- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
|
|
+ mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
|
|
+ ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
|
|
+ ln -sf "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ./
|
|
+ @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
|
|
@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
|
|
@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
|
|
@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
|