From 972dcfcdbfe75dcfeb777150c136576cf1a71e99 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 9 Oct 2015 22:59:03 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- .../tcltk/tcl/alter-includedir.patch | 76 ++++++++++++++++++++++ .../recipes-devtools/tcltk/tcl/fix-configure.patch | 46 +++++++++++++ .../tcl/fix_issue_with_old_distro_glibc.patch | 39 +++++++++++ .../tcltk/tcl/fix_non_native_build_issue.patch | 64 ++++++++++++++++++ meta/recipes-devtools/tcltk/tcl/no_packages.patch | 53 +++++++++++++++ meta/recipes-devtools/tcltk/tcl/run-ptest | 8 +++ .../tcltk/tcl/tcl-add-soname.patch | 46 +++++++++++++ .../tcl/tcl-remove-hardcoded-install-path.patch | 47 +++++++++++++ 8 files changed, 379 insertions(+) create mode 100644 meta/recipes-devtools/tcltk/tcl/alter-includedir.patch create mode 100644 meta/recipes-devtools/tcltk/tcl/fix-configure.patch create mode 100644 meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch create mode 100644 meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch create mode 100644 meta/recipes-devtools/tcltk/tcl/no_packages.patch create mode 100644 meta/recipes-devtools/tcltk/tcl/run-ptest create mode 100644 meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch create mode 100644 meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch (limited to 'meta/recipes-devtools/tcltk/tcl') 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..c8530e1f58 --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch @@ -0,0 +1,76 @@ +Lets install the include header and private header files into +usr/include/tcl8.6 when version of tcl is 8.6.x + +Upstream-Status: Inappropriate [Configuration Specific] + +Signed-off-by: Khem Raj + +Fixed the TCL_INCLUDE_SPEC + +Signed-off-by: Robert Yang +--- + Makefile.in | 2 +- + configure | 4 ++-- + configure.in | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 97b983b..dc2a4df 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -53,7 +53,7 @@ DLL_INSTALL_DIR = @DLL_INSTALL_DIR@ + SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) + + # Directory in which to install the include file tcl.h: +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION) + + # Path to the private tcl header dir: + PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ +diff --git a/configure b/configure +index 3e78b49..24b3f92 100755 +--- a/configure ++++ b/configure +@@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" + eval "TCL_LIB_FILE=${TCL_LIB_FILE}" + + TCL_LIBRARY='$(libdir)/tcl$(VERSION)' +-PRIVATE_INCLUDE_DIR='$(includedir)' ++PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' + HTML_DIR='$(DISTDIR)/html' + + # Note: in the following variable, it's important to use the absolute +@@ -19293,7 +19293,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" + TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" + + # Install time header dir can be set via --includedir +-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" ++eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\"" + + #------------------------------------------------------------------------ + # tclConfig.sh refers to this by a different name +diff --git a/configure.in b/configure.in +index 0e28b14..62d9b41 100755 +--- a/configure.in ++++ b/configure.in +@@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" + eval "TCL_LIB_FILE=${TCL_LIB_FILE}" + + TCL_LIBRARY='$(libdir)/tcl$(VERSION)' +-PRIVATE_INCLUDE_DIR='$(includedir)' ++PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' + HTML_DIR='$(DISTDIR)/html' + + # Note: in the following variable, it's important to use the absolute +@@ -912,7 +912,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" + TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" + + # Install time header dir can be set via --includedir +-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" ++eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\"" + + #------------------------------------------------------------------------ + # tclConfig.sh refers to this by a different name +-- +1.7.10.4 + diff --git a/meta/recipes-devtools/tcltk/tcl/fix-configure.patch b/meta/recipes-devtools/tcltk/tcl/fix-configure.patch new file mode 100644 index 0000000000..b692a0ebe0 --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl/fix-configure.patch @@ -0,0 +1,46 @@ +Upstream-Status: Pending + +Index: unix/tcl.m4 +=================================================================== +--- tcl8.4.11/unix.orig/tcl.m4 ++++ tcl8.4.11/unix/tcl.m4 +@@ -845,7 +845,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ + # results, and the version is kept in special file). + + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print $3}' /etc/.relid'` ++ system=MP-RAS-`awk '{print $3}' /etc/.relid` + fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` +@@ -2250,7 +2250,7 @@ AC_DEFUN(SC_BLOCKING_STYLE, [ + # results, and the version is kept in special file). + + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print $3}' /etc/.relid'` ++ system=MP-RAS-`awk '{print $3}' /etc/.relid` + fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` +Index: unix/configure +=================================================================== +--- tcl8.4.11/unix.orig/configure ++++ tcl8.4.11/unix/configure +@@ -2130,7 +2130,7 @@ echo "configure:2121: checking system ve + # results, and the version is kept in special file). + + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print }' /etc/.relid'` ++ system=MP-RAS-`awk '{print }' /etc/.relid` + fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` +@@ -7608,7 +7608,7 @@ echo "configure:7600: checking FIONBIO v + # results, and the version is kept in special file). + + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print }' /etc/.relid'` ++ system=MP-RAS-`awk '{print }' /etc/.relid` + fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` 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 new file mode 100644 index 0000000000..be273419ae --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch @@ -0,0 +1,39 @@ +Upstream-Status: inappropriate [embedded specific] + +Fixes tcl target recipe build on old distros which have glibc older than 2.14 + +| + echo 'NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install' +| NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install +| + make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/lib +| Installing message catalogs +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/share/man +| tclsh: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/tcl8.5.11/unix/libtcl8.5.so) +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/bin +| make: *** [install-msgs] Error 1 + +Signed-Off-By: Nitin A Kamble +2012/04/26 + +Index: unix/Makefile.in +=================================================================== +--- unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800 ++++ unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800 +@@ -686,7 +686,7 @@ + # tcltest executable gets the build directory burned into its ld search path. + # This keeps tcltest from picking up an already installed version of the Tcl + # library. +-SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \ ++SHELL_ENV = @LD_LIBRARY_PATH_VAR@=${@LD_LIBRARY_PATH_VAR@} \ + TCLLIBPATH="@abs_builddir@/pkgs" \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}" + +@@ -712,7 +712,7 @@ + $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) + + gdb-test: ${TCLTEST_EXE} +- @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run ++ @echo "set env @LD_LIBRARY_PATH_VAR@=$${@LD_LIBRARY_PATH_VAR@}" > gdb.run + @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run + @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run + $(GDB) ${TCLTEST_EXE} --command=gdb.run 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 new file mode 100644 index 0000000000..c60eb75379 --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch @@ -0,0 +1,64 @@ +Upstream-Status: Pending + +Index: unix/Makefile.in +=================================================================== +--- unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800 ++++ unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800 +@@ -709,23 +709,23 @@ + test: test-tcl test-packages + + test-tcl: ${TCLTEST_EXE} +- $(SHELL_ENV) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) ++ $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) + + gdb-test: ${TCLTEST_EXE} + @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run + @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run + @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run +- $(GDB) ./${TCLTEST_EXE} --command=gdb.run ++ $(GDB) ${TCLTEST_EXE} --command=gdb.run + rm gdb.run + + # Useful target to launch a built tcltest with the proper path,... + runtest: ${TCLTEST_EXE} +- $(SHELL_ENV) ./${TCLTEST_EXE} ++ $(SHELL_ENV) ${TCLTEST_EXE} + + # Useful target for running the test suite with an unwritable current + # directory... + ro-test: ${TCLTEST_EXE} +- echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ./${TCLTEST_EXE} ++ echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ${TCLTEST_EXE} + + # The following target generates the shared libraries in dltest/ that are used + # for testing; they are included as part of the "tcltest" target (via the +@@ -743,23 +743,23 @@ + # This target can be used to run tclsh from the build directory + # via `make shell SCRIPT=/tmp/foo.tcl` + shell: ${TCL_EXE} +- $(SHELL_ENV) ./${TCL_EXE} $(SCRIPT) ++ $(SHELL_ENV) ${TCL_EXE} $(SCRIPT) + + # This target can be used to run tclsh inside either gdb or insight + gdb: ${TCL_EXE} +- $(SHELL_ENV) $(GDB) ./${TCL_EXE} ++ $(SHELL_ENV) $(GDB) ${TCL_EXE} + + valgrind: ${TCL_EXE} ${TCLTEST_EXE} +- $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind $(TESTFLAGS) ++ $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind $(TESTFLAGS) + + valgrindshell: ${TCL_EXE} +- $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT) ++ $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) + + trace-shell: ${TCL_EXE} +- $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCL_EXE} $(SCRIPT) ++ $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ${TCL_EXE} $(SCRIPT) + + trace-test: ${TCLTEST_EXE} +- $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) ++ $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) + + #-------------------------------------------------------------------------- + # Installation rules diff --git a/meta/recipes-devtools/tcltk/tcl/no_packages.patch b/meta/recipes-devtools/tcltk/tcl/no_packages.patch new file mode 100644 index 0000000000..ab6cc43169 --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl/no_packages.patch @@ -0,0 +1,53 @@ +tcl 8.6.0 builds by default a number of packages that are not needed in Yocto. +This patch changes the makefile so that these packages are not built by default. + +Upstream-Status:Inappropriate [embedded specific] + +Signed-off-by: Bogdan Marinescu + +Index: unix/Makefile.in +=================================================================== +--- unix.orig/Makefile.in 2013-11-10 23:38:12.235425891 -0800 ++++ unix/Makefile.in 2013-11-10 23:38:12.231425891 -0800 +@@ -611,7 +611,7 @@ + # Start of rules + #-------------------------------------------------------------------------- + +-all: binaries libraries doc packages ++all: binaries libraries doc + + binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} + +@@ -653,12 +653,12 @@ + #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in + # $(SHELL) config.status + +-clean: clean-packages ++clean: + rm -f *.a *.o libtcl* core errs *~ \#* TAGS *.E a.out \ + errors ${TCL_EXE} ${TCLTEST_EXE} lib.exp Tcl @DTRACE_HDR@ + cd dltest ; $(MAKE) clean + +-distclean: distclean-packages clean ++distclean: clean + rm -rf Makefile config.status config.cache config.log tclConfig.sh \ + tclConfig.h *.plist Tcl.framework tcl.pc + cd dltest ; $(MAKE) distclean +@@ -706,7 +706,7 @@ + # tcltest, ie: + # % make test TESTFLAGS="-verbose bps -file fileName.test" + +-test: test-tcl test-packages ++test: test-tcl + + test-tcl: ${TCLTEST_EXE} + $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) +@@ -771,7 +771,7 @@ + INSTALL_DEV_TARGETS = install-headers + INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ + INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ +- $(INSTALL_PACKAGE_TARGETS) $(INSTALL_EXTRA_TARGETS) ++ $(INSTALL_EXTRA_TARGETS) + + install: $(INSTALL_TARGETS) + diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest new file mode 100644 index 0000000000..dadba655f2 --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl/run-ptest @@ -0,0 +1,8 @@ +#!/bin/sh + +for i in `ls tests/*.test |awk -F/ '{print $2}'`; \ + do TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i >$i.tmp 2>&1; \ + grep -q "^Files with failing tests:" $i.tmp; \ + if [ $? -eq 0 ]; then echo "FAIL: $i"; \ + else echo "PASS: $i"; rm -f $i.tmp; fi; \ +done diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch new file mode 100644 index 0000000000..96276eab0e --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch @@ -0,0 +1,46 @@ +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)/" 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 new file mode 100644 index 0000000000..16f7c80516 --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch @@ -0,0 +1,47 @@ +From 6efc98774681795712073c2b91e5e9d1763239b8 Mon Sep 17 00:00:00 2001 +From: "Song.Li" +Date: Wed, 1 Aug 2012 19:05:51 +0800 +Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target + +Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}. + +[YOCTO #2876] + +This is not a bug, but libraries should be installed into directory .../lib/. +On 64bit target that should be lib64/. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Song.Li +Signed-off-by: Kai Kang + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: unix/configure +=================================================================== +--- unix.orig/configure 2013-11-10 23:38:33.643426430 -0800 ++++ unix/configure 2013-11-10 23:39:51.347428387 -0800 +@@ -19134,7 +19134,7 @@ + + eval "TCL_LIB_FILE=${TCL_LIB_FILE}" + +-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' ++TCL_LIBRARY='$(libdir)/tcl$(VERSION)' + PRIVATE_INCLUDE_DIR='$(includedir)' + HTML_DIR='$(DISTDIR)/html' + +Index: unix/configure.in +=================================================================== +--- unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800 ++++ unix/configure.in 2013-11-10 23:39:41.199428131 -0800 +@@ -790,7 +790,7 @@ + + eval "TCL_LIB_FILE=${TCL_LIB_FILE}" + +-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' ++TCL_LIBRARY='$(libdir)/tcl$(VERSION)' + PRIVATE_INCLUDE_DIR='$(includedir)' + HTML_DIR='$(DISTDIR)/html' + -- cgit v1.2.3-54-g00ecf