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 | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch index c4283c4f34..3123d289a1 100644 --- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch +++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | |||
@@ -1,25 +1,21 @@ | |||
1 | From d6155ec08b355d64f1a7db407254d159037bb72a Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <rpurdie@linux.intel.com> | ||
3 | Date: Wed, 9 Dec 2009 23:59:44 +0000 | ||
4 | Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function | ||
5 | |||
1 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
2 | 7 | ||
3 | Index: unix/tcl.m4 | 8 | --- |
4 | =================================================================== | 9 | unix/Makefile.in | 5 ++++- |
5 | --- a/unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700 | 10 | unix/tcl.m4 | 3 +++ |
6 | +++ b/unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800 | 11 | 2 files changed, 7 insertions(+), 1 deletion(-) |
7 | @@ -1415,6 +1415,9 @@ | 12 | |
8 | # get rid of the warnings. | 13 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
9 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | 14 | index 398afd0..804532e 100644 |
10 | 15 | --- a/unix/Makefile.in | |
11 | + # following line added by CW for Debian GNU/Linux | 16 | +++ b/unix/Makefile.in |
12 | + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" | 17 | @@ -893,7 +893,10 @@ install-binaries: binaries |
13 | + | 18 | done |
14 | SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' | ||
15 | DL_OBJS="tclLoadDl.o" | ||
16 | DL_LIBS="-ldl" | ||
17 | Index: unix/Makefile.in | ||
18 | =================================================================== | ||
19 | --- a/unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700 | ||
20 | +++ b/unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800 | ||
21 | @@ -796,7 +796,10 @@ | ||
22 | done; | ||
23 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" | 19 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" |
24 | @@INSTALL_LIB@ | 20 | @@INSTALL_LIB@ |
25 | - @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" | 21 | - @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" |
@@ -30,3 +26,17 @@ Index: unix/Makefile.in | |||
30 | @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" | 26 | @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" |
31 | @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" | 27 | @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" |
32 | @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" | 28 | @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" |
29 | diff --git a/unix/tcl.m4 b/unix/tcl.m4 | ||
30 | index f3d08ec..797c93f 100644 | ||
31 | --- a/unix/tcl.m4 | ||
32 | +++ b/unix/tcl.m4 | ||
33 | @@ -1382,6 +1382,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ | ||
34 | # get rid of the warnings. | ||
35 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | ||
36 | |||
37 | + # following line added by CW for Debian GNU/Linux | ||
38 | + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" | ||
39 | + | ||
40 | SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' | ||
41 | DL_OBJS="tclLoadDl.o" | ||
42 | DL_LIBS="-ldl" | ||