tcl: updated to 8.6.9 8.6.9: * (enhance) stop blocking conversion of object to/from class * (enhance) NR-enable [package require] * (bug)[9fd5c6] crash in object deletion, test oo-11.5 * (bug)[3c32a3] crash deleting object with class mixed in * (platform) stop using -lieee, removed from glibc-2.27 ***POTENTIAL INCOMPATIBILITY for math programs that embed Tcl*** * (bug)[8e6a9a] bad binary [string match], test string-11.55 * (bug)[1873ea] repair multi-thread std channel init * (bug)[db36fa] broken bytecode for index values * (bug) broken compiled [string replace], test string-14.19 * (bug) [string trim*] engine crashed on invalid UTF * (bug) missing trace in compiled [array set], test var-20.11 * (bug)[46a241] crash in unset array with search, var-13.[23] * (bug)[27b682] race made [file delete] raise "no such file" * (bug)[925643] 32/64 cleanup of filesystem DIR operations * (bug) leaks in TclSetEnv and env cache * (bug)[3592747] [yieldto] dying namespace, tailcall-14.1 * (bug)[270f78] race in [file mkdir] * (bug)[3f7af0] [file delete] raised "permission denied" * (bug)[d051b7] overflow crash in [format] * revised quoting of [exec] args in generated command line ***POTENTIAL INCOMPATIBILITY*** * HTTP Keep-Alive with pipelined requests => http 2.9.0 * (new)[TIP 505] [lreplace] accepts all out of range indices * (bug) Prevent crash from NULL keyName => registry 1.3.3 * (enhance) advance dde version => dde 1.4.1 * tzdata updated to Olson's tzdata2018g * Update tcltest package for Travis support => tcltest 2.5.0 * (bug)[35a8f1] overlong string length of some lists * (bug)[00d04c] Repair [binary encode base64]diff -r1.102 -r1.103 pkgsrc/lang/tcl/Makefile
(adam)
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.102 2018/07/20 03:34:18 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.103 2018/12/09 18:33:55 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= tcl${TCL_VERSION}-src | 3 | DISTNAME= tcl${TCL_VERSION}-src | |
4 | PKGNAME= tcl-${TCL_VERSION} | 4 | PKGNAME= tcl-${TCL_VERSION} | |
5 | PKGREVISION= 2 | |||
6 | CATEGORIES= lang | 5 | CATEGORIES= lang | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.tcl.tk/ | 9 | HOMEPAGE= http://www.tcl.tk/ | |
11 | COMMENT= Tool Command Language, a dynamic language | 10 | COMMENT= Tool Command Language, a dynamic language | |
12 | LICENSE= 2-clause-bsd | 11 | LICENSE= 2-clause-bsd | |
13 | 12 | |||
14 | .include "../../lang/tcl/Makefile.version" | 13 | .include "../../lang/tcl/Makefile.version" | |
15 | 14 | |||
16 | WRKSRC= ${WRKDIR}/tcl${TCL_VERSION} | 15 | WRKSRC= ${WRKDIR}/tcl${TCL_VERSION} | |
17 | 16 | |||
18 | USE_GCC_RUNTIME= yes | 17 | USE_GCC_RUNTIME= yes |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile.version,v 1.23 2018/02/03 17:51:19 adam Exp $ | 1 | # $NetBSD: Makefile.version,v 1.24 2018/12/09 18:33:55 adam Exp $ | |
2 | # used by cad/xcircuit/Makefile | 2 | # used by cad/xcircuit/Makefile | |
3 | # used by devel/tcl-tclcl/Makefile | 3 | # used by devel/tcl-tclcl/Makefile | |
4 | # used by lang/tcl/Makefile | 4 | # used by lang/tcl/Makefile | |
5 | # used by lang/tcl-otcl/Makefile | 5 | # used by lang/tcl-otcl/Makefile | |
6 | # used by print/tcl-pdflib/Makefile | 6 | # used by print/tcl-pdflib/Makefile | |
7 | 7 | |||
8 | TCL_SONUM= 86 | 8 | TCL_SONUM= 86 | |
9 | TCL_BASEVER= 8.6 | 9 | TCL_BASEVER= 8.6 | |
10 | TCL_VERSION= 8.6.8 | 10 | TCL_VERSION= 8.6.9 | |
11 | 11 | |||
12 | # Update bundled versions in lang/tcl/buildlink3.mk | 12 | # Update bundled versions in lang/tcl/buildlink3.mk | |
13 | ITCL_VERSION= 4.1.1 | 13 | ITCL_VERSION= 4.1.2 | |
14 | SQLITE3_VERSION=3.21.0 | 14 | SQLITE3_VERSION=3.25.3 | |
15 | TDBC_VERSION= 1.0.6 | 15 | TDBC_VERSION= 1.1.0 | |
16 | THREAD_VERSION= 2.8.2 | 16 | THREAD_VERSION= 2.8.4 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.24 2018/02/03 17:51:19 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.25 2018/12/09 18:33:55 adam Exp $ | |
2 | bin/sqlite3_analyzer | 2 | bin/sqlite3_analyzer | |
3 | bin/tclsh | 3 | bin/tclsh | |
4 | bin/tclsh${BASEVER} | 4 | bin/tclsh${BASEVER} | |
5 | include/fakemysql.h | 5 | include/fakemysql.h | |
6 | include/fakepq.h | 6 | include/fakepq.h | |
7 | include/fakesql.h | 7 | include/fakesql.h | |
8 | include/itcl.h | 8 | include/itcl.h | |
9 | include/itcl2TclOO.h | 9 | include/itcl2TclOO.h | |
10 | include/itclDecls.h | 10 | include/itclDecls.h | |
11 | include/itclInt.h | 11 | include/itclInt.h | |
12 | include/itclIntDecls.h | 12 | include/itclIntDecls.h | |
13 | include/itclMigrate2TclCore.h | 13 | include/itclMigrate2TclCore.h | |
14 | include/itclTclIntStubsFcn.h | 14 | include/itclTclIntStubsFcn.h | |
@@ -282,35 +282,35 @@ lib/tcl${BASEVER}/msgs/zh_hk.msg | @@ -282,35 +282,35 @@ lib/tcl${BASEVER}/msgs/zh_hk.msg | |||
282 | lib/tcl${BASEVER}/msgs/zh_sg.msg | 282 | lib/tcl${BASEVER}/msgs/zh_sg.msg | |
283 | lib/tcl${BASEVER}/msgs/zh_tw.msg | 283 | lib/tcl${BASEVER}/msgs/zh_tw.msg | |
284 | lib/tcl${BASEVER}/opt0.4/optparse.tcl | 284 | lib/tcl${BASEVER}/opt0.4/optparse.tcl | |
285 | lib/tcl${BASEVER}/opt0.4/pkgIndex.tcl | 285 | lib/tcl${BASEVER}/opt0.4/pkgIndex.tcl | |
286 | lib/tcl${BASEVER}/package.tcl | 286 | lib/tcl${BASEVER}/package.tcl | |
287 | lib/tcl${BASEVER}/parray.tcl | 287 | lib/tcl${BASEVER}/parray.tcl | |
288 | lib/tcl${BASEVER}/platform1.0/pkgIndex.tcl | 288 | lib/tcl${BASEVER}/platform1.0/pkgIndex.tcl | |
289 | lib/tcl${BASEVER}/platform1.0/platform.tcl | 289 | lib/tcl${BASEVER}/platform1.0/platform.tcl | |
290 | lib/tcl${BASEVER}/safe.tcl | 290 | lib/tcl${BASEVER}/safe.tcl | |
291 | lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl | 291 | lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl | |
292 | lib/tcl${BASEVER}/shell1.1/shell.tcl | 292 | lib/tcl${BASEVER}/shell1.1/shell.tcl | |
293 | lib/tcl${BASEVER}/tclAppInit.c | 293 | lib/tcl${BASEVER}/tclAppInit.c | |
294 | lib/tcl${BASEVER}/tclIndex | 294 | lib/tcl${BASEVER}/tclIndex | |
295 | lib/tcl${BASEVER}/tcltest2.4/pkgIndex.tcl | 295 | lib/tcl${BASEVER}/tcltest2.5/pkgIndex.tcl | |
296 | lib/tcl${BASEVER}/tcltest2.4/tcltest.tcl | 296 | lib/tcl${BASEVER}/tcltest2.5/tcltest.tcl | |
297 | lib/tcl${BASEVER}/tm.tcl | 297 | lib/tcl${BASEVER}/tm.tcl | |
298 | lib/tcl${BASEVER}/word.tcl | 298 | lib/tcl${BASEVER}/word.tcl | |
299 | lib/tcl8/8.4/platform-1.0.14.tm | 299 | lib/tcl8/8.4/platform-1.0.14.tm | |
300 | lib/tcl8/8.4/platform/shell-1.1.4.tm | 300 | lib/tcl8/8.4/platform/shell-1.1.4.tm | |
301 | lib/tcl8/8.5/msgcat-1.6.1.tm | 301 | lib/tcl8/8.5/msgcat-1.6.1.tm | |
302 | lib/tcl8/8.5/tcltest-2.4.1.tm | 302 | lib/tcl8/8.5/tcltest-2.5.0.tm | |
303 | lib/tcl8/8.6/http-2.8.12.tm | 303 | lib/tcl8/8.6/http-2.9.0.tm | |
304 | lib/tcl8/8.6/tdbc/sqlite3-${TDBC_VERSION}.tm | 304 | lib/tcl8/8.6/tdbc/sqlite3-${TDBC_VERSION}.tm | |
305 | lib/tclConfig.sh | 305 | lib/tclConfig.sh | |
306 | lib/tclooConfig.sh | 306 | lib/tclooConfig.sh | |
307 | lib/tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.so | 307 | lib/tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.so | |
308 | lib/tdbc${TDBC_VERSION}/libtdbcstub${TDBC_VERSION}.a | 308 | lib/tdbc${TDBC_VERSION}/libtdbcstub${TDBC_VERSION}.a | |
309 | lib/tdbc${TDBC_VERSION}/pkgIndex.tcl | 309 | lib/tdbc${TDBC_VERSION}/pkgIndex.tcl | |
310 | lib/tdbc${TDBC_VERSION}/tdbc.tcl | 310 | lib/tdbc${TDBC_VERSION}/tdbc.tcl | |
311 | lib/tdbc${TDBC_VERSION}/tdbcConfig.sh | 311 | lib/tdbc${TDBC_VERSION}/tdbcConfig.sh | |
312 | lib/tdbcmysql${TDBC_VERSION}/libtdbcmysql${TDBC_VERSION}.so | 312 | lib/tdbcmysql${TDBC_VERSION}/libtdbcmysql${TDBC_VERSION}.so | |
313 | lib/tdbcmysql${TDBC_VERSION}/pkgIndex.tcl | 313 | lib/tdbcmysql${TDBC_VERSION}/pkgIndex.tcl | |
314 | lib/tdbcmysql${TDBC_VERSION}/tdbcmysql.tcl | 314 | lib/tdbcmysql${TDBC_VERSION}/tdbcmysql.tcl | |
315 | lib/tdbcodbc${TDBC_VERSION}/libtdbcodbc${TDBC_VERSION}.so | 315 | lib/tdbcodbc${TDBC_VERSION}/libtdbcodbc${TDBC_VERSION}.so | |
316 | lib/tdbcodbc${TDBC_VERSION}/pkgIndex.tcl | 316 | lib/tdbcodbc${TDBC_VERSION}/pkgIndex.tcl |
@@ -1,32 +1,32 @@ | @@ -1,32 +1,32 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.30 2018/02/03 17:51:19 adam Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.31 2018/12/09 18:33:55 adam Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= tcl | 3 | BUILDLINK_TREE+= tcl | |
4 | 4 | |||
5 | .if !defined(TCL_BUILDLINK3_MK) | 5 | .if !defined(TCL_BUILDLINK3_MK) | |
6 | TCL_BUILDLINK3_MK:= | 6 | TCL_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.tcl+= tcl>=8.5.7 | 8 | BUILDLINK_API_DEPENDS.tcl+= tcl>=8.5.7 | |
9 | BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.6.1nb1 | 9 | BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.6.1nb1 | |
10 | BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl | 10 | BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl | |
11 | 11 | |||
12 | BUILDLINK_FILES.tcl+= bin/tclsh* | 12 | BUILDLINK_FILES.tcl+= bin/tclsh* | |
13 | # | 13 | # | |
14 | # Make "-ltcl" and "-ltcl8.6" resolve into "-ltcl86", so that we don't | 14 | # Make "-ltcl" and "-ltcl8.6" resolve into "-ltcl86", so that we don't | |
15 | # need to patch so many Makefiles. | 15 | # need to patch so many Makefiles. | |
16 | # | 16 | # | |
17 | BUILDLINK_TRANSFORM+= l:tcl:tcl86 | 17 | BUILDLINK_TRANSFORM+= l:tcl:tcl86 | |
18 | BUILDLINK_TRANSFORM+= l:tcl8.6:tcl86 | 18 | BUILDLINK_TRANSFORM+= l:tcl8.6:tcl86 | |
19 | 19 | |||
20 | _TOOLS_USE_PKGSRC.tclsh= yes | 20 | _TOOLS_USE_PKGSRC.tclsh= yes | |
21 | 21 | |||
22 | TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh | 22 | TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh | |
23 | TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh | 23 | TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh | |
24 | # Bundled library | 24 | # Bundled library | |
25 | ITCL_VERSION= 4.1.1 | 25 | ITCL_VERSION= 4.1.2 | |
26 | TDBC_VERSION= 1.0.6 | 26 | TDBC_VERSION= 1.1.0 | |
27 | 27 | |||
28 | .include "../../devel/zlib/buildlink3.mk" | 28 | .include "../../devel/zlib/buildlink3.mk" | |
29 | .include "../../mk/dlopen.buildlink3.mk" | 29 | .include "../../mk/dlopen.buildlink3.mk" | |
30 | .endif # TCL_BUILDLINK3_MK | 30 | .endif # TCL_BUILDLINK3_MK | |
31 | 31 | |||
32 | BUILDLINK_TREE+= -tcl | 32 | BUILDLINK_TREE+= -tcl |
@@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
1 | $NetBSD: distinfo,v 1.76 2018/02/03 17:51:19 adam Exp $ | 1 | $NetBSD: distinfo,v 1.77 2018/12/09 18:33:55 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (tcl8.6.8-src.tar.gz) = 0d014d97ca38534d4be1dfc6c563a7a3a6aa737f | 3 | SHA1 (tcl8.6.9-src.tar.gz) = 861c5c8bbce9eda892c5e63b6035e09fad90a25f | |
4 | RMD160 (tcl8.6.8-src.tar.gz) = 53723adf560606dc0403af568b6fc0d27a4fd93d | 4 | RMD160 (tcl8.6.9-src.tar.gz) = 73d064888101ab3a4a832bd9b242937e5f26315c | |
5 | SHA512 (tcl8.6.8-src.tar.gz) = 14fb8fd880ecedda61119556f404fa1da34146f82dbf771be2ab322c6c575a898e194016dc3300f6764008d8f3bf59b07e31723bf8a3aafdcee6b4ef7667b18e | 5 | SHA512 (tcl8.6.9-src.tar.gz) = 707fc0fb4f45c85e8f21692e5035d727cde27d87a2e1cd2e748ad373ebd3517aeca25ecaef3382a2f0e0a1feff96ce94a62b87abcf085e1a0afe2a23ef460112 | |
6 | Size (tcl8.6.8-src.tar.gz) = 9793786 bytes | 6 | Size (tcl8.6.9-src.tar.gz) = 10000896 bytes | |
7 | SHA1 (patch-generic_tclInt.h) = fde6a5458a138b6d61fdbab1269b1c5111a28b22 | 7 | SHA1 (patch-generic_tclInt.h) = fde6a5458a138b6d61fdbab1269b1c5111a28b22 | |
8 | SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e | 8 | SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e | |
9 | SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6 | 9 | SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6 | |
10 | SHA1 (patch-pkgs_itcl4.1.1_configure) = 6c028591222d64c428503cfebcd31a12cd27dd5b | 10 | SHA1 (patch-pkgs_itcl4.1.2_configure) = 508efecf058cfd10cc1c815fa948616ee248d6ef | |
11 | SHA1 (patch-pkgs_sqlite3.21.0_Makefile.in) = 4b3aee3a46d076cfce2ec09b04bafe9fa7fe55f5 | 11 | SHA1 (patch-pkgs_sqlite3.25.3_Makefile.in) = 985bef7d2d6d8b96a9dd8072a3194620dc32b495 | |
12 | SHA1 (patch-pkgs_sqlite3.21.0_configure) = f4e679405cb21b06d4c5b32696e065f1b149f84b | 12 | SHA1 (patch-pkgs_sqlite3.25.3_configure) = 98dd6187eb3317d1c486f439fe889160a13415ef | |
13 | SHA1 (patch-pkgs_tdbc1.0.6_configure) = 5631f7e295ed3fedee42c97e9c6a7d7a65a8abfc | 13 | SHA1 (patch-pkgs_tdbc1.1.0_configure) = ba65923172774dcd80151aa507a5633c8b7df3ba | |
14 | SHA1 (patch-pkgs_tdbcmysql1.0.6_configure) = efc7538436ac5641fc3efeeb9e956a628010dcfa | 14 | SHA1 (patch-pkgs_tdbcmysql1.1.0_configure) = 6cc5957be85cfca9df7b75dc7a932256d283d3dc | |
15 | SHA1 (patch-pkgs_tdbcodbc1.0.6_configure) = d6611925fd8297a8fb768ccd9cdf1b3c6f9b4b63 | 15 | SHA1 (patch-pkgs_tdbcodbc1.1.0_configure) = a082e2b0cd424bc19a3253a8ead2cd0ead9fb568 | |
16 | SHA1 (patch-pkgs_tdbcpostgres1.0.6_configure) = d4dece122331aa8ca293888abef85767cf71d0e1 | 16 | SHA1 (patch-pkgs_tdbcpostgres1.1.0_configure) = 6693bad209d40d8909eb35a08f93a6bbcb63d2c1 | |
17 | SHA1 (patch-pkgs_thread2.8.2_configure) = 22b494adca5a8ea1f70d9b02baddfdd554d71064 | 17 | SHA1 (patch-pkgs_thread2.8.4_configure) = 5a02414b95cd7a41ff3d6be181e9cf1fe573cf13 | |
18 | SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb | 18 | SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb | |
19 | SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 | 19 | SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 | |
20 | SHA1 (patch-unix_Makefile.in) = 6a8df92fb7dc97142ad60c72eece1062f5de1096 | 20 | SHA1 (patch-unix_Makefile.in) = a67bf7793579c80d363a62ef2efa6ed4ee1e2cbd | |
21 | SHA1 (patch-unix_configure) = 16d5030085a66b69e61ab3d55e1fd97e9a8c1836 | 21 | SHA1 (patch-unix_configure) = f5b281877a6a40db1c1850be98819ff6612b16ce | |
22 | SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31 | 22 | SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31 | |
23 | SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e | 23 | SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e | |
24 | SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f | 24 | SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f | |
25 | SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88 | 25 | SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88 | |
26 | SHA1 (patch-unix_tclUnixPort.h) = 9eff7a5d5842fe208b467fd2ad844192e2e6aec7 | 26 | SHA1 (patch-unix_tclUnixPort.h) = 9eff7a5d5842fe208b467fd2ad844192e2e6aec7 |
$NetBSD: patch-pkgs_itcl4.1.2_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/itcl4.1.2/configure.orig 2018-11-01 15:59:41.000000000 +0000
+++ pkgs/itcl4.1.2/configure
@@ -6935,7 +6935,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="-Wl,-export-dynamic"
+ LDFLAGS="-Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
@@ -6946,13 +6946,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- TCL_LIB_VERSIONS_OK=nodots
;;
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
@@ -6991,10 +6989,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
;;
esac
;;
$NetBSD: patch-pkgs_sqlite3.25.3_Makefile.in,v 1.1 2018/12/09 18:33:55 adam Exp $
Fix building with system sqlite3.
--- pkgs/sqlite3.25.3/Makefile.in.orig 2016-01-07 15:38:22.000000000 +0000
+++ pkgs/sqlite3.25.3/Makefile.in
@@ -150,7 +150,7 @@ SHARED_BUILD = @SHARED_BUILD@
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(srcdir)/..
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
-PKG_CFLAGS = @PKG_CFLAGS@ -DSQLITE_API=MODULE_SCOPE -DSQLITE_EXTERN=
+PKG_CFLAGS = @PKG_CFLAGS@
# TCL_DEFS is not strictly need here, but if you remove it, then you
# must make sure that configure.in checks for the necessary components
$NetBSD: patch-pkgs_sqlite3.25.3_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/sqlite3.25.3/configure.orig 2018-11-12 18:03:27.000000000 +0000
+++ pkgs/sqlite3.25.3/configure
@@ -6974,7 +6974,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="-Wl,-export-dynamic"
+ LDFLAGS="-Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
@@ -6985,13 +6985,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- TCL_LIB_VERSIONS_OK=nodots
;;
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
@@ -7030,10 +7028,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
;;
esac
;;
$NetBSD: patch-pkgs_tdbc1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/tdbc1.1.0/configure.orig 2018-11-01 16:02:33.000000000 +0000
+++ pkgs/tdbc1.1.0/configure
@@ -7049,7 +7049,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="-Wl,-export-dynamic"
+ LDFLAGS="-Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
@@ -7060,13 +7060,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- TCL_LIB_VERSIONS_OK=nodots
;;
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
@@ -7105,10 +7103,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
;;
esac
;;
$NetBSD: patch-pkgs_tdbcmysql1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/tdbcmysql1.1.0/configure.orig 2018-11-01 16:08:41.000000000 +0000
+++ pkgs/tdbcmysql1.1.0/configure
@@ -7393,7 +7393,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="-Wl,-export-dynamic"
+ LDFLAGS="-Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
@@ -7404,13 +7404,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- TCL_LIB_VERSIONS_OK=nodots
;;
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
@@ -7449,10 +7447,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
;;
esac
;;
$NetBSD: patch-pkgs_tdbcodbc1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/tdbcodbc1.1.0/configure.orig 2018-11-01 16:09:19.000000000 +0000
+++ pkgs/tdbcodbc1.1.0/configure
@@ -7393,7 +7393,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="-Wl,-export-dynamic"
+ LDFLAGS="-Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
@@ -7404,13 +7404,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- TCL_LIB_VERSIONS_OK=nodots
;;
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
@@ -7449,10 +7447,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
;;
esac
;;
$NetBSD: patch-pkgs_tdbcpostgres1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/tdbcpostgres1.1.0/configure.orig 2018-11-01 16:09:49.000000000 +0000
+++ pkgs/tdbcpostgres1.1.0/configure
@@ -7393,7 +7393,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="-Wl,-export-dynamic"
+ LDFLAGS="-Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
@@ -7404,13 +7404,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- TCL_LIB_VERSIONS_OK=nodots
;;
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
@@ -7449,10 +7447,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
;;
esac
;;
$NetBSD: patch-pkgs_thread2.8.4_configure,v 1.1 2018/12/09 18:33:55 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/thread2.8.4/configure.orig 2018-11-01 16:11:06.000000000 +0000
+++ pkgs/thread2.8.4/configure
@@ -6984,7 +6984,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="-Wl,-export-dynamic"
+ LDFLAGS="-Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then :
@@ -6995,13 +6995,11 @@ fi
fi
# OpenBSD doesn't do version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- TCL_LIB_VERSIONS_OK=nodots
;;
NetBSD-*)
# NetBSD has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes; then :
@@ -7040,10 +7038,6 @@ fi
case $system in
FreeBSD-3.*)
# Version numbers are dot-stripped by system policy.
- TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
;;
esac
;;
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-unix_Makefile.in,v 1.14 2018/02/03 17:51:19 adam Exp $ | 1 | $NetBSD: patch-unix_Makefile.in,v 1.15 2018/12/09 18:33:55 adam Exp $ | |
2 | 2 | |||
3 | Honour LDFLAGS. | 3 | Honour LDFLAGS. | |
4 | 4 | |||
5 | --- unix/Makefile.in.orig 2017-12-21 18:16:25.000000000 +0000 | 5 | --- unix/Makefile.in.orig 2017-12-21 18:16:25.000000000 +0000 | |
6 | +++ unix/Makefile.in | 6 | +++ unix/Makefile.in | |
7 | @@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@ | 7 | @@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@ | |
8 | MAJOR_VERSION = @TCL_MAJOR_VERSION@ | 8 | MAJOR_VERSION = @TCL_MAJOR_VERSION@ | |
9 | MINOR_VERSION = @TCL_MINOR_VERSION@ | 9 | MINOR_VERSION = @TCL_MINOR_VERSION@ | |
10 | PATCH_LEVEL = @TCL_PATCH_LEVEL@ | 10 | PATCH_LEVEL = @TCL_PATCH_LEVEL@ | |
11 | +SHLIB_VERSION = @SHLIB_VERSION@ | 11 | +SHLIB_VERSION = @SHLIB_VERSION@ | |
12 | 12 | |||
13 | #-------------------------------------------------------------------------- | 13 | #-------------------------------------------------------------------------- | |
14 | # Things you can change to personalize the Makefile for your own site (you can | 14 | # Things you can change to personalize the Makefile for your own site (you can | |
@@ -96,43 +96,43 @@ Honour LDFLAGS. | @@ -96,43 +96,43 @@ Honour LDFLAGS. | |||
96 | @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh" | 96 | @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh" | |
97 | @echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/" | 97 | @echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/" | |
98 | @@ -821,7 +837,7 @@ install-libraries: libraries | 98 | @@ -821,7 +837,7 @@ install-libraries: libraries | |
99 | else true; \ | 99 | else true; \ | |
100 | fi; \ | 100 | fi; \ | |
101 | done; | 101 | done; | |
102 | - @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \ | 102 | - @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \ | |
103 | + @for i in opt0.4 http1.0 encoding; \ | 103 | + @for i in opt0.4 http1.0 encoding; \ | |
104 | do \ | 104 | do \ | |
105 | if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ | 105 | if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ | |
106 | echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ | 106 | echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ | |
107 | @@ -842,6 +858,8 @@ install-libraries: libraries | 107 | @@ -842,6 +858,8 @@ install-libraries: libraries | |
108 | done; | 108 | done; | |
109 | @echo "Installing package http 2.8.12 as a Tcl Module"; | 109 | @echo "Installing package http 2.9.0 as a Tcl Module"; | |
110 | @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.12.tm; | 110 | @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.0.tm; | |
111 | + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl; | 111 | + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl; | |
112 | + @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl; | 112 | + @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl; | |
113 | @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; | 113 | @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; | |
114 | @for i in $(TOP_DIR)/library/opt/*.tcl ; \ | 114 | @for i in $(TOP_DIR)/library/opt/*.tcl ; \ | |
115 | do \ | 115 | do \ | |
116 | @@ -849,13 +867,21 @@ install-libraries: libraries | 116 | @@ -849,13 +867,21 @@ install-libraries: libraries | |
117 | done; | 117 | done; | |
118 | @echo "Installing package msgcat 1.6.1 as a Tcl Module"; | 118 | @echo "Installing package msgcat 1.6.1 as a Tcl Module"; | |
119 | @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm; | 119 | @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm; | |
120 | + @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/msgcat.tcl; | 120 | + @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/msgcat.tcl; | |
121 | + @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/pkgIndex.tcl; | 121 | + @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/pkgIndex.tcl; | |
122 | @echo "Installing package tcltest 2.4.1 as a Tcl Module"; | 122 | @echo "Installing package tcltest 2.5.0 as a Tcl Module"; | |
123 | @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.1.tm; | 123 | @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.5.0.tm; | |
124 | + @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.4/tcltest.tcl; | 124 | + @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/tcltest.tcl; | |
125 | + @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.4/pkgIndex.tcl; | 125 | + @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/pkgIndex.tcl; | |
126 | 126 | |||
127 | @echo "Installing package platform 1.0.14 as a Tcl Module"; | 127 | @echo "Installing package platform 1.0.14 as a Tcl Module"; | |
128 | @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm; | 128 | @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm; | |
129 | + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl; | 129 | + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl; | |
130 | + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl; | 130 | + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl; | |
131 | @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; | 131 | @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; | |
132 | @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; | 132 | @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; | |
133 | + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/shell.tcl | 133 | + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/shell.tcl | |
134 | + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/pkgIndex.tcl | 134 | + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/pkgIndex.tcl | |
135 | 135 | |||
136 | @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; | 136 | @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; | |
137 | @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ | 137 | @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ | |
138 | @@ -940,7 +966,7 @@ install-doc: doc | 138 | @@ -940,7 +966,7 @@ install-doc: doc |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-unix_configure,v 1.10 2017/08/25 11:05:33 adam Exp $ | 1 | $NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $ | |
2 | 2 | |||
3 | --- unix/configure.orig 2017-08-09 14:45:58.000000000 +0000 | 3 | --- unix/configure.orig 2017-08-09 14:45:58.000000000 +0000 | |
4 | +++ unix/configure | 4 | +++ unix/configure | |
5 | @@ -6839,12 +6839,12 @@ fi | 5 | @@ -6839,12 +6839,12 @@ fi | |
6 | LD_SEARCH_FLAGS="" | 6 | LD_SEARCH_FLAGS="" | |
7 | ;; | 7 | ;; | |
8 | BSD/OS-4.*) | 8 | BSD/OS-4.*) | |
9 | - SHLIB_CFLAGS="-export-dynamic -fPIC" | 9 | - SHLIB_CFLAGS="-export-dynamic -fPIC" | |
10 | + SHLIB_CFLAGS="-Wl,--export-dynamic -fPIC" | 10 | + SHLIB_CFLAGS="-Wl,--export-dynamic -fPIC" | |
11 | SHLIB_LD='${CC} -shared' | 11 | SHLIB_LD='${CC} -shared' | |
12 | SHLIB_SUFFIX=".so" | 12 | SHLIB_SUFFIX=".so" | |
13 | DL_OBJS="tclLoadDl.o" | 13 | DL_OBJS="tclLoadDl.o" | |
14 | DL_LIBS="-ldl" | 14 | DL_LIBS="-ldl" | |
@@ -34,52 +34,34 @@ $NetBSD: patch-unix_configure,v 1.10 201 | @@ -34,52 +34,34 @@ $NetBSD: patch-unix_configure,v 1.10 201 | |||
34 | + LDFLAGS="-Wl,--export-dynamic" | 34 | + LDFLAGS="-Wl,--export-dynamic" | |
35 | CFLAGS_OPTIMIZE="-O2" | 35 | CFLAGS_OPTIMIZE="-O2" | |
36 | if test "${TCL_THREADS}" = "1"; then | 36 | if test "${TCL_THREADS}" = "1"; then | |
37 | 37 | |||
38 | @@ -7558,7 +7558,7 @@ fi | 38 | @@ -7558,7 +7558,7 @@ fi | |
39 | SHLIB_SUFFIX=".so" | 39 | SHLIB_SUFFIX=".so" | |
40 | DL_OBJS="tclLoadDl.o" | 40 | DL_OBJS="tclLoadDl.o" | |
41 | DL_LIBS="" | 41 | DL_LIBS="" | |
42 | - LDFLAGS="$LDFLAGS -export-dynamic" | 42 | - LDFLAGS="$LDFLAGS -export-dynamic" | |
43 | + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" | 43 | + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" | |
44 | if test $doRpath = yes; then | 44 | if test $doRpath = yes; then | |
45 | 45 | |||
46 | CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' | 46 | CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' | |
47 | @@ -7575,7 +7575,7 @@ fi | |||
48 | fi | |||
49 | ||||
50 | ;; | |||
51 | - FreeBSD-*) | |||
52 | + FreeBSD-*|DragonFly-*) | |||
53 | # This configuration from FreeBSD Ports. | |||
54 | SHLIB_CFLAGS="-fPIC" | |||
55 | SHLIB_LD="${CC} -shared" | |||
56 | @@ -7609,7 +7609,6 @@ fi | 47 | @@ -7609,7 +7609,6 @@ fi | |
57 | esac | 48 | esac | |
58 | ;; | 49 | ;; | |
59 | Darwin-*) | 50 | Darwin-*) | |
60 | - CFLAGS_OPTIMIZE="-Os" | 51 | - CFLAGS_OPTIMIZE="-Os" | |
61 | SHLIB_CFLAGS="-fno-common" | 52 | SHLIB_CFLAGS="-fno-common" | |
62 | # To avoid discrepancies between what headers configure sees during | 53 | # To avoid discrepancies between what headers configure sees during | |
63 | # preprocessing tests and compiling tests, move any -isysroot and | 54 | # preprocessing tests and compiling tests, move any -isysroot and | |
64 | @@ -8783,7 +8782,7 @@ fi | |||
65 | BSD/OS*) ;; | |||
66 | CYGWIN_*|MINGW32_*) ;; | |||
67 | IRIX*) ;; | |||
68 | - NetBSD-*|FreeBSD-*|OpenBSD-*) ;; | |||
69 | + NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;; | |||
70 | Darwin-*) ;; | |||
71 | SCO_SV-3.2*) ;; | |||
72 | *) SHLIB_CFLAGS="-fPIC" ;; | |||
73 | @@ -8825,7 +8824,11 @@ fi | 55 | @@ -8825,7 +8824,11 @@ fi | |
74 | 56 | |||
75 | else | 57 | else | |
76 | 58 | |||
77 | - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' | 59 | - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' | |
78 | + if test "${SHLIB_SUFFIX}" = ".dylib" ; then | 60 | + if test "${SHLIB_SUFFIX}" = ".dylib" ; then | |
79 | + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' | 61 | + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' | |
80 | + else | 62 | + else | |
81 | + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"' | 63 | + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"' | |
82 | + fi | 64 | + fi | |
83 | 65 | |||
84 | fi | 66 | fi | |
85 | 67 |