summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/tcltk
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-11-11 20:07:15 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:03:24 +0000
commit5505bde50f677650f4de775abc2c342a9fb109bc (patch)
treefed861fae50919f354cd131cf54ee0196074df84 /meta/recipes-devtools/tcltk
parent1ef7240bf3aac129fb3e67dfffb2275854d3c8d5 (diff)
downloadpoky-5505bde50f677650f4de775abc2c342a9fb109bc.tar.gz
tcl: Install header into 8.6 instead of PN-PV in user/include
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>
Diffstat (limited to 'meta/recipes-devtools/tcltk')
-rw-r--r--meta/recipes-devtools/tcltk/tcl/alter-includedir.patch46
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch12
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch12
-rw-r--r--meta/recipes-devtools/tcltk/tcl/no_packages.patch16
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch64
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch26
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.1.bb26
7 files changed, 127 insertions, 75 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
new file mode 100644
index 0000000000..f543910be9
--- /dev/null
+++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
@@ -0,0 +1,46 @@
1Lets install the include header and private header files into
2usr/include/tcl8.6 when version of tcl is 8.6.x
3
4Upstream-Status: Inappropriate [Configuration Specific]
5
6Signed-off-by: Khem Raj <raj.khem@gmai.com>
7
8Index: unix/Makefile.in
9===================================================================
10--- unix.orig/Makefile.in 2013-11-11 01:00:36.431550403 -0800
11+++ unix/Makefile.in 2013-11-11 01:05:09.587557282 -0800
12@@ -53,7 +53,7 @@
13 SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
14
15 # Directory in which to install the include file tcl.h:
16-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
17+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
18
19 # Path to the private tcl header dir:
20 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
21Index: unix/configure.in
22===================================================================
23--- unix.orig/configure.in 2013-11-11 01:00:36.467550403 -0800
24+++ unix/configure.in 2013-11-11 01:00:36.503550404 -0800
25@@ -791,7 +791,7 @@
26 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
27
28 TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
29-PRIVATE_INCLUDE_DIR='$(includedir)'
30+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
31 HTML_DIR='$(DISTDIR)/html'
32
33 # Note: in the following variable, it's important to use the absolute
34Index: unix/configure
35===================================================================
36--- unix.orig/configure 2013-11-11 01:00:36.467550403 -0800
37+++ unix/configure 2013-11-11 01:00:36.503550404 -0800
38@@ -19134,7 +19134,7 @@
39 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
40
41 TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
42-PRIVATE_INCLUDE_DIR='$(includedir)'
43+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
44 HTML_DIR='$(DISTDIR)/html'
45
46 # Note: in the following variable, it's important to use the absolute
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
index ed581755c6..be273419ae 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
@@ -15,11 +15,11 @@ Fixes tcl target recipe build on old distros which have glibc older than 2.14
15Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 15Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
162012/04/26 162012/04/26
17 17
18diff --git unix.orig/Makefile.in unix/Makefile.in 18Index: unix/Makefile.in
19index 571d53f..16351f6 100644 19===================================================================
20--- unix.orig/Makefile.in 20--- unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800
21+++ unix/Makefile.in 21+++ unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800
22@@ -679,7 +679,7 @@ topDirName: 22@@ -686,7 +686,7 @@
23 # tcltest executable gets the build directory burned into its ld search path. 23 # tcltest executable gets the build directory burned into its ld search path.
24 # This keeps tcltest from picking up an already installed version of the Tcl 24 # This keeps tcltest from picking up an already installed version of the Tcl
25 # library. 25 # library.
@@ -28,7 +28,7 @@ index 571d53f..16351f6 100644
28 TCLLIBPATH="@abs_builddir@/pkgs" \ 28 TCLLIBPATH="@abs_builddir@/pkgs" \
29 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}" 29 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"
30 30
31@@ -705,7 +705,7 @@ test-tcl: ${TCLTEST_EXE} 31@@ -712,7 +712,7 @@
32 $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) 32 $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
33 33
34 gdb-test: ${TCLTEST_EXE} 34 gdb-test: ${TCLTEST_EXE}
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
index 80d718caf1..c60eb75379 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3diff --git unix.orig/Makefile.in unix/Makefile.in 3Index: unix/Makefile.in
4index df05759..571d53f 100644 4===================================================================
5--- unix.orig/Makefile.in 5--- unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800
6+++ unix/Makefile.in 6+++ unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800
7@@ -702,23 +702,23 @@ tcltest-real: 7@@ -709,23 +709,23 @@
8 test: test-tcl test-packages 8 test: test-tcl test-packages
9 9
10 test-tcl: ${TCLTEST_EXE} 10 test-tcl: ${TCLTEST_EXE}
@@ -32,7 +32,7 @@ index df05759..571d53f 100644
32 32
33 # The following target generates the shared libraries in dltest/ that are used 33 # The following target generates the shared libraries in dltest/ that are used
34 # for testing; they are included as part of the "tcltest" target (via the 34 # for testing; they are included as part of the "tcltest" target (via the
35@@ -736,23 +736,23 @@ dltest.marker: ${STUB_LIB_FILE} 35@@ -743,23 +743,23 @@
36 # This target can be used to run tclsh from the build directory 36 # This target can be used to run tclsh from the build directory
37 # via `make shell SCRIPT=/tmp/foo.tcl` 37 # via `make shell SCRIPT=/tmp/foo.tcl`
38 shell: ${TCL_EXE} 38 shell: ${TCL_EXE}
diff --git a/meta/recipes-devtools/tcltk/tcl/no_packages.patch b/meta/recipes-devtools/tcltk/tcl/no_packages.patch
index b045814589..ab6cc43169 100644
--- a/meta/recipes-devtools/tcltk/tcl/no_packages.patch
+++ b/meta/recipes-devtools/tcltk/tcl/no_packages.patch
@@ -5,11 +5,11 @@ Upstream-Status:Inappropriate [embedded specific]
5 5
6Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> 6Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
7 7
8diff --git unix.orig/Makefile.in unix/Makefile.in 8Index: unix/Makefile.in
9index 16351f6..76ccadb 100644 9===================================================================
10--- unix.orig/Makefile.in 10--- unix.orig/Makefile.in 2013-11-10 23:38:12.235425891 -0800
11+++ unix/Makefile.in 11+++ unix/Makefile.in 2013-11-10 23:38:12.231425891 -0800
12@@ -601,7 +601,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ 12@@ -611,7 +611,7 @@
13 # Start of rules 13 # Start of rules
14 #-------------------------------------------------------------------------- 14 #--------------------------------------------------------------------------
15 15
@@ -18,7 +18,7 @@ index 16351f6..76ccadb 100644
18 18
19 binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} 19 binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
20 20
21@@ -646,12 +646,12 @@ Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in 21@@ -653,12 +653,12 @@
22 #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in 22 #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in
23 # $(SHELL) config.status 23 # $(SHELL) config.status
24 24
@@ -33,7 +33,7 @@ index 16351f6..76ccadb 100644
33 rm -rf Makefile config.status config.cache config.log tclConfig.sh \ 33 rm -rf Makefile config.status config.cache config.log tclConfig.sh \
34 tclConfig.h *.plist Tcl.framework tcl.pc 34 tclConfig.h *.plist Tcl.framework tcl.pc
35 cd dltest ; $(MAKE) distclean 35 cd dltest ; $(MAKE) distclean
36@@ -699,7 +699,7 @@ tcltest-real: 36@@ -706,7 +706,7 @@
37 # tcltest, ie: 37 # tcltest, ie:
38 # % make test TESTFLAGS="-verbose bps -file fileName.test" 38 # % make test TESTFLAGS="-verbose bps -file fileName.test"
39 39
@@ -42,7 +42,7 @@ index 16351f6..76ccadb 100644
42 42
43 test-tcl: ${TCLTEST_EXE} 43 test-tcl: ${TCLTEST_EXE}
44 $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) 44 $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
45@@ -764,7 +764,7 @@ INSTALL_PACKAGE_TARGETS = install-packages 45@@ -771,7 +771,7 @@
46 INSTALL_DEV_TARGETS = install-headers 46 INSTALL_DEV_TARGETS = install-headers
47 INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ 47 INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
48 INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ 48 INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index d3691f64fc..96276eab0e 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -2,29 +2,23 @@ Upstream-Status: Pending
2 2
3Index: unix/configure 3Index: unix/configure
4=================================================================== 4===================================================================
5--- unix.orig/configure 2013-09-19 23:17:13.000000000 +0300 5--- unix.orig/configure 2013-09-19 13:17:13.000000000 -0700
6+++ unix/configure 2013-10-16 15:58:37.450136217 +0300 6+++ unix/configure 2013-11-11 00:20:51.519490342 -0800
7@@ -6899,6 +6899,7 @@ 7@@ -7599,6 +7599,9 @@
8 LIBS="$LIBS -lc" 8 # get rid of the warnings.
9 SHLIB_CFLAGS="" 9 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
10 SHLIB_SUFFIX=".so"
11+ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0'
12 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} -shared ${CFLAGS} ${LDFLAGS}'
13 DL_OBJS="tclLoadDl.o" 15 DL_OBJS="tclLoadDl.o"
14 LD_LIBRARY_PATH_VAR="LIBPATH" 16 DL_LIBS="-ldl"
15Index: unix/tcl.m4 17Index: unix/tcl.m4
16=================================================================== 18===================================================================
17--- unix.orig/tcl.m4 2013-09-19 23:17:13.000000000 +0300 19--- unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700
18+++ unix/tcl.m4 2013-10-16 16:18:50.719586228 +0300 20+++ unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800
19@@ -1408,6 +1408,7 @@ 21@@ -1415,6 +1415,9 @@
20 Linux*|GNU*|NetBSD-Debian)
21 SHLIB_CFLAGS="-fPIC"
22 SHLIB_SUFFIX=".so"
23+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0'
24
25 CFLAGS_OPTIMIZE="-O2"
26 # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
27@@ -1415,12 +1416,15 @@
28 # get rid of the warnings. 22 # get rid of the warnings.
29 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" 23 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
30 24
@@ -34,19 +28,19 @@ Index: unix/tcl.m4
34 SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' 28 SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
35 DL_OBJS="tclLoadDl.o" 29 DL_OBJS="tclLoadDl.o"
36 DL_LIBS="-ldl" 30 DL_LIBS="-ldl"
37 LDFLAGS="$LDFLAGS -Wl,--export-dynamic" 31Index: unix/Makefile.in
38 AS_IF([test $doRpath = yes], [ 32===================================================================
39- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) 33--- unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700
40+ CC_SEARCH_FLAGS='']) 34+++ unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800
41 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} 35@@ -796,7 +796,10 @@
42 AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) 36 done;
43 AS_IF([test $do64bit = yes], [ 37 @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
44@@ -2050,7 +2054,7 @@ 38 @@INSTALL_LIB@
45 39- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
46 AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ 40+ mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
47 LIB_SUFFIX=${SHARED_LIB_SUFFIX} 41+ ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
48- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${TCL_SHLIB_LD_EXTRAS} ${SHLIB_LD_LIBS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' 42+ ln -sf "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ./
49+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' 43+ @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
50 AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ 44 @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
51 INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' 45 @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
52 DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" 46 @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
index afdd8803cc..16f7c80516 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
@@ -19,11 +19,24 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
19 configure | 2 +- 19 configure | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
21 21
22diff --git a/configure b/configure 22Index: unix/configure
23index 478a4d5..79c2979 100755 23===================================================================
24--- a/configure 24--- unix.orig/configure 2013-11-10 23:38:33.643426430 -0800
25+++ b/configure 25+++ unix/configure 2013-11-10 23:39:51.347428387 -0800
26@@ -18772,7 +18772,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 26@@ -19134,7 +19134,7 @@
27
28 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
29
30-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
31+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
32 PRIVATE_INCLUDE_DIR='$(includedir)'
33 HTML_DIR='$(DISTDIR)/html'
34
35Index: unix/configure.in
36===================================================================
37--- unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800
38+++ unix/configure.in 2013-11-10 23:39:41.199428131 -0800
39@@ -790,7 +790,7 @@
27 40
28 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 41 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
29 42
@@ -32,6 +45,3 @@ index 478a4d5..79c2979 100755
32 PRIVATE_INCLUDE_DIR='$(includedir)' 45 PRIVATE_INCLUDE_DIR='$(includedir)'
33 HTML_DIR='$(DISTDIR)/html' 46 HTML_DIR='$(DISTDIR)/html'
34 47
35--
361.7.9.5
37
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
index e23970848f..f40475d2b5 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
@@ -15,11 +15,12 @@ BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
15 file://tcl-add-soname.patch" 15 file://tcl-add-soname.patch"
16 16
17SRC_URI = "${BASE_SRC_URI} \ 17SRC_URI = "${BASE_SRC_URI} \
18 file://fix_non_native_build_issue.patch \ 18 file://fix_non_native_build_issue.patch \
19 file://fix_issue_with_old_distro_glibc.patch \ 19 file://fix_issue_with_old_distro_glibc.patch \
20 file://no_packages.patch \ 20 file://no_packages.patch \
21 file://tcl-remove-hardcoded-install-path.patch \ 21 file://tcl-remove-hardcoded-install-path.patch \
22 " 22 file://alter-includedir.patch \
23 "
23SRC_URI[md5sum] = "aae4b701ee527c6e4e1a6f9c7399882e" 24SRC_URI[md5sum] = "aae4b701ee527c6e4e1a6f9c7399882e"
24SRC_URI[sha256sum] = "16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514" 25SRC_URI[sha256sum] = "16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514"
25 26
@@ -27,6 +28,8 @@ SRC_URI_class-native = "${BASE_SRC_URI}"
27 28
28S = "${WORKDIR}/tcl${PV}/unix" 29S = "${WORKDIR}/tcl${PV}/unix"
29 30
31VER = "8.6"
32
30inherit autotools 33inherit autotools
31 34
32DEPENDS_class-native = "" 35DEPENDS_class-native = ""
@@ -43,9 +46,8 @@ do_compile_prepend() {
43} 46}
44 47
45do_install() { 48do_install() {
46 autotools_do_install 49 autotools_do_install install-private-headers
47 oe_libinstall -so libtcl8.6 ${D}${libdir} 50 ln -sf ./tclsh${VER} ${D}${bindir}/tclsh
48 ln -sf ./tclsh8.6 ${D}${bindir}/tclsh
49 sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh 51 sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
50 sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh 52 sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
51 sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh 53 sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh
@@ -54,8 +56,8 @@ do_install() {
54 cd .. 56 cd ..
55 for dir in compat generic unix 57 for dir in compat generic unix
56 do 58 do
57 install -d ${D}${includedir}/tcl${PV}/$dir 59 install -d ${D}${includedir}/${BPN}${VER}/$dir
58 install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/tcl${PV}/$dir/ 60 install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/
59 done 61 done
60} 62}
61 63
@@ -65,8 +67,8 @@ tcl_sysroot_preprocess () {
65} 67}
66 68
67PACKAGES =+ "tcl-lib" 69PACKAGES =+ "tcl-lib"
68FILES_tcl-lib = "${libdir}/libtcl8.6.so*" 70FILES_tcl-lib = "${libdir}/libtcl${VER}.so.*"
69FILES_${PN} += "${libdir}/tcl8.6 ${libdir}/tcl8" 71FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8"
70FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" 72FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh"
71 73
72# isn't getting picked up by shlibs code 74# isn't getting picked up by shlibs code