diff options
author | Ross Burton <ross.burton@arm.com> | 2021-07-09 17:17:38 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-13 14:27:53 +0100 |
commit | 49474b8edd1a6307d167d88469ab0f5ab6926b67 (patch) | |
tree | 3e2c712ddb0871d789bd81ec84559c6b851b0db1 /meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | |
parent | 4b016a2d472170b0037ce2bf43e729b2b6d67a1d (diff) | |
download | poky-49474b8edd1a6307d167d88469ab0f5ab6926b67.tar.gz |
tcl: use AUTOTOOLS_SCRIPT_PATH
Inside tcl the configure.ac is inside a unix/ directory. Instead of
setting S to BPNPV/unix and having to use ../ to reach files outside of
unix, simply set S as usual and use AUTOTOOLS_SCRIPT_PATH to run the
correct configure script.
(From OE-Core rev: 40516f7db7c29d956038fc74dc7d8c3a7b62325a)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch index d1fc9b92e5..c4283c4f34 100644 --- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch +++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | |||
@@ -1,23 +1,9 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Pending |
2 | 2 | ||
3 | Index: unix/configure | ||
4 | =================================================================== | ||
5 | --- unix.orig/configure 2013-09-19 13:17:13.000000000 -0700 | ||
6 | +++ unix/configure 2013-11-11 00:20:51.519490342 -0800 | ||
7 | @@ -7599,6 +7599,9 @@ | ||
8 | # get rid of the warnings. | ||
9 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | ||
10 | |||
11 | + # following line added by CW for Debian GNU/Linux | ||
12 | + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" | ||
13 | + | ||
14 | SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' | ||
15 | DL_OBJS="tclLoadDl.o" | ||
16 | DL_LIBS="-ldl" | ||
17 | Index: unix/tcl.m4 | 3 | Index: unix/tcl.m4 |
18 | =================================================================== | 4 | =================================================================== |
19 | --- unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700 | 5 | --- a/unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700 |
20 | +++ unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800 | 6 | +++ b/unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800 |
21 | @@ -1415,6 +1415,9 @@ | 7 | @@ -1415,6 +1415,9 @@ |
22 | # get rid of the warnings. | 8 | # get rid of the warnings. |
23 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | 9 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" |
@@ -30,8 +16,8 @@ Index: unix/tcl.m4 | |||
30 | DL_LIBS="-ldl" | 16 | DL_LIBS="-ldl" |
31 | Index: unix/Makefile.in | 17 | Index: unix/Makefile.in |
32 | =================================================================== | 18 | =================================================================== |
33 | --- unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700 | 19 | --- a/unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700 |
34 | +++ unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800 | 20 | +++ b/unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800 |
35 | @@ -796,7 +796,10 @@ | 21 | @@ -796,7 +796,10 @@ |
36 | done; | 22 | done; |
37 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" | 23 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" |