Update Tk to 8.6.9.1 to fix PR pkg/54324. ok during freeze jperkin@ Alongside the Tcl/Tk 8.6.9 releases just announced, you will find one additional file, tk8.6.9.1-src.tar.gz . This is an errata release fixing a critical error on the Mac OSX 10.14 Mojave platform only. If you are building Tk for any other platform, there is no need to upgrade to the errata release. If you do upgrade to it anyway, you will see no difference, so it will be harmless through wasted effort, as the details below will explain. When unpacked, the errata archive differs from the tk8.6.9-src.tar.gz contents in only three lines of the file tk8.6.9/macosx/tkMacOSXWindowEvent.c which is a file compiled only for Mac OSX builds of Tk. The lines are written to have effect only on Mojave. Every other byte of the source code distribution is unchanged.diff -r1.84 -r1.85 pkgsrc/x11/tk/Makefile
(bsiegert)
@@ -1,49 +1,49 @@ | @@ -1,49 +1,49 @@ | |||
1 | # $NetBSD: Makefile,v 1.84 2018/12/09 18:35:44 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.85 2019/06/25 12:06:41 bsiegert Exp $ | |
2 | 2 | |||
3 | DISTNAME= tk${TK_VERSION}-src | 3 | DISTNAME= tk${TK_VERSION}.1-src | |
4 | PKGNAME= tk-${TK_VERSION} | 4 | PKGNAME= tk-${TK_VERSION}.1 | |
5 | CATEGORIES= x11 lang | 5 | CATEGORIES= x11 lang | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://www.tcl.tk/ | 9 | HOMEPAGE= http://www.tcl.tk/ | |
10 | COMMENT= Graphical toolkit for TCL | 10 | COMMENT= Graphical toolkit for TCL | |
11 | LICENSE= 2-clause-bsd | 11 | LICENSE= 2-clause-bsd | |
12 | 12 | |||
13 | .include "../../x11/tk/Makefile.version" | 13 | .include "../../x11/tk/Makefile.version" | |
14 | 14 | |||
15 | WRKSRC= ${WRKDIR}/tk${TK_VERSION} | 15 | WRKSRC= ${WRKDIR}/tk${TK_VERSION} | |
16 | 16 | |||
17 | USE_GCC_RUNTIME= yes | 17 | USE_GCC_RUNTIME= yes | |
18 | 18 | |||
19 | GNU_CONFIGURE= yes | 19 | GNU_CONFIGURE= yes | |
20 | CONFIGURE_DIRS= unix | 20 | CONFIGURE_DIRS= unix | |
21 | BUILD_DIRS= ${CONFIGURE_DIRS} | 21 | BUILD_DIRS= ${CONFIGURE_DIRS} | |
22 | CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib | 22 | CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib | |
23 | CONFIGURE_ARGS+= --x-includes=${X11BASE}/include | 23 | CONFIGURE_ARGS+= --x-includes=${X11BASE}/include | |
24 | CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q} | 24 | CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q} | |
25 | CONFIGURE_ENV+= LIB_RUNTIME_DIR=${PREFIX}/lib | 25 | CONFIGURE_ENV+= LIB_RUNTIME_DIR=${PREFIX}/lib | |
26 | PTHREAD_OPTS+= require | 26 | PTHREAD_OPTS+= require | |
27 | 27 | |||
28 | PKGCONFIG_OVERRIDE+= unix/tk.pc.in | 28 | PKGCONFIG_OVERRIDE+= unix/tk.pc.in | |
29 | 29 | |||
30 | TEST_TARGET= test | 30 | TEST_TARGET= test | |
31 | 31 | |||
32 | .if defined(ABI) && ${ABI} == "64" | 32 | .if defined(ABI) && ${ABI} == "64" | |
33 | CONFIGURE_ARGS+= --enable-64bit | 33 | CONFIGURE_ARGS+= --enable-64bit | |
34 | .endif | 34 | .endif | |
35 | 35 | |||
36 | .include "options.mk" | 36 | .include "options.mk" | |
37 | 37 | |||
38 | SUBST_CLASSES+= tk-config | 38 | SUBST_CLASSES+= tk-config | |
39 | SUBST_STAGE.tk-config= post-build | 39 | SUBST_STAGE.tk-config= post-build | |
40 | SUBST_FILES.tk-config= unix/tkConfig.sh | 40 | SUBST_FILES.tk-config= unix/tkConfig.sh | |
41 | SUBST_SED.tk-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|" | 41 | SUBST_SED.tk-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|" | |
42 | SUBST_SED.tk-config+= -e "s|${WRKSRC}|${PREFIX}/include/tk|" | 42 | SUBST_SED.tk-config+= -e "s|${WRKSRC}|${PREFIX}/include/tk|" | |
43 | 43 | |||
44 | PLIST_SUBST+= SONUM=${TK_SONUM} | 44 | PLIST_SUBST+= SONUM=${TK_SONUM} | |
45 | PLIST_SUBST+= BASEVER=${TK_BASEVER} | 45 | PLIST_SUBST+= BASEVER=${TK_BASEVER} | |
46 | 46 | |||
47 | .include "../../lang/tcl/buildlink3.mk" | 47 | .include "../../lang/tcl/buildlink3.mk" | |
48 | .include "../../mk/pthread.buildlink3.mk" | 48 | .include "../../mk/pthread.buildlink3.mk" | |
49 | .include "../../mk/bsd.pkg.mk" | 49 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.52 2018/12/09 18:35:44 adam Exp $ | 1 | $NetBSD: distinfo,v 1.53 2019/06/25 12:06:41 bsiegert Exp $ | |
2 | 2 | |||
3 | SHA1 (tk8.6.9-src.tar.gz) = 9220739f077e64e974dfd8999d1de1a3b9355b9d | 3 | SHA1 (tk8.6.9.1-src.tar.gz) = 473019c00461fb55724d1923ed6330d01d9483b8 | |
4 | RMD160 (tk8.6.9-src.tar.gz) = 8df24d99ef5e80e5317001408e1f6921a6998cb9 | 4 | RMD160 (tk8.6.9.1-src.tar.gz) = 34ec51e1dbf02459960f77795009743708490831 | |
5 | SHA512 (tk8.6.9-src.tar.gz) = 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686 | 5 | SHA512 (tk8.6.9.1-src.tar.gz) = b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 | |
6 | Size (tk8.6.9-src.tar.gz) = 4364606 bytes | 6 | Size (tk8.6.9.1-src.tar.gz) = 4364603 bytes | |
7 | SHA1 (patch-unix_Makefile.in) = a94df921cf947918674c6ef26897fc702fd0c9e4 | 7 | SHA1 (patch-unix_Makefile.in) = 6238796c15a0df653109b74817c153d226c64c21 | |
8 | SHA1 (patch-unix_configure) = 5797adcb5a1fd6b280a212c611d76c11771dc0a4 | 8 | SHA1 (patch-unix_configure) = c97f33770d30a30fd1ad9127b8fa353e20340bd4 |
@@ -1,134 +1,147 @@ | @@ -1,134 +1,147 @@ | |||
1 | $NetBSD: patch-unix_Makefile.in,v 1.8 2017/08/25 11:05:33 adam Exp $ | 1 | $NetBSD: patch-unix_Makefile.in,v 1.9 2019/06/25 12:06:41 bsiegert Exp $ | |
2 | 2 | |||
3 | --- unix/Makefile.in.orig 2016-02-29 19:13:21.000000000 +0000 | 3 | Support MirBSD. | |
4 | Honor LDFLAGS. | |||
5 | Standardize file names. | |||
6 | ||||
7 | --- unix/Makefile.in.orig 2019-06-24 09:27:45.000000000 +0000 | |||
4 | +++ unix/Makefile.in | 8 | +++ unix/Makefile.in | |
5 | @@ -14,6 +14,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@ | 9 | @@ -14,6 +14,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@ | |
6 | MINOR_VERSION = @TK_MINOR_VERSION@ | 10 | MINOR_VERSION = @TK_MINOR_VERSION@ | |
7 | PATCH_LEVEL = @TK_PATCH_LEVEL@ | 11 | PATCH_LEVEL = @TK_PATCH_LEVEL@ | |
8 | LOCALES = @LOCALES@ | 12 | LOCALES = @LOCALES@ | |
9 | +SHLIB_VERSION = @SHLIB_VERSION@ | 13 | +SHLIB_VERSION = @SHLIB_VERSION@ | |
10 | 14 | |||
11 | #---------------------------------------------------------------- | 15 | #---------------------------------------------------------------- | |
12 | # Things you can change to personalize the Makefile for your own | 16 | # Things you can change to personalize the Makefile for your own | |
13 | @@ -64,6 +65,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK | 17 | @@ -64,6 +65,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK | |
14 | 18 | |||
15 | # Directory in which to install the include file tk.h: | 19 | # Directory in which to install the include file tk.h: | |
16 | INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) | 20 | INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) | |
17 | +UNIX_INCLUDE_INSTALL_DIR = $(DESTDIR)$(prefix)/include/tk/unix | 21 | +UNIX_INCLUDE_INSTALL_DIR = $(DESTDIR)$(prefix)/include/tk/unix | |
18 | +GENERIC_INCLUDE_INSTALL_DIR = $(DESTDIR)$(prefix)/include/tk/generic | 22 | +GENERIC_INCLUDE_INSTALL_DIR = $(DESTDIR)$(prefix)/include/tk/generic | |
19 | 23 | |||
20 | # Path to the private tk header dir: | 24 | # Path to the private tk header dir: | |
21 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ | 25 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ | |
22 | @@ -100,7 +103,7 @@ DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_L | 26 | @@ -100,7 +103,7 @@ DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_L | |
23 | # The directory containing the Tcl sources and headers appropriate | 27 | # The directory containing the Tcl sources and headers appropriate | |
24 | # for this version of Tk ("srcdir" will be replaced or has already | 28 | # for this version of Tk ("srcdir" will be replaced or has already | |
25 | # been replaced by the configure script): | 29 | # been replaced by the configure script): | |
26 | -TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic | 30 | -TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic | |
27 | +TCL_GENERIC_DIR = $(TCL_BIN_DIR)/../include/tcl/generic | 31 | +TCL_GENERIC_DIR = $(TCL_BIN_DIR)/../include/tcl/generic | |
28 | 32 | |||
29 | # The directory containing the platform specific Tcl sources and headers | 33 | # The directory containing the platform specific Tcl sources and headers | |
30 | # appropriate for this version of Tk: | 34 | # appropriate for this version of Tk: | |
35 | @@ -119,7 +122,7 @@ TK_SHARED_BUILD = @TK_SHARED_BUILD@ | |||
36 | # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk | |||
37 | TK_PKG_DIR = @TK_PKG_DIR@ | |||
38 | ||||
39 | -# Directory in which to install the pkgIndex.tcl file for loadable Tk | |||
40 | + # Directory in which to install the pkgIndex.tcl file for loadable Tk | |||
41 | PKG_INSTALL_DIR = $(LIB_INSTALL_DIR)/$(TK_PKG_DIR) | |||
42 | ||||
43 | # Package index file for loadable Tk | |||
31 | @@ -137,7 +140,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ | 44 | @@ -137,7 +140,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ | |
32 | #CFLAGS = $(CFLAGS_DEBUG) | 45 | #CFLAGS = $(CFLAGS_DEBUG) | |
33 | #CFLAGS = $(CFLAGS_OPTIMIZE) | 46 | #CFLAGS = $(CFLAGS_OPTIMIZE) | |
34 | #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) | 47 | #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) | |
35 | -CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ | 48 | -CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ | |
36 | +CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ | 49 | +CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ | |
37 | 50 | |||
38 | # Flags to pass to the linker | 51 | # Flags to pass to the linker | |
39 | LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ | 52 | LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ | |
40 | @@ -245,6 +248,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@ | 53 | @@ -245,6 +248,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@ | |
41 | #TK_STUB_LIB_FLAG = -ltkstub | 54 | #TK_STUB_LIB_FLAG = -ltkstub | |
42 | 55 | |||
43 | TK_LIB_FILE = @TK_LIB_FILE@ | 56 | TK_LIB_FILE = @TK_LIB_FILE@ | |
44 | +TK_LIB_A_FILE = ${TK_LIB_FILE:@SHLIB_SUFFIX@=.a} | 57 | +TK_LIB_A_FILE = ${TK_LIB_FILE:@SHLIB_SUFFIX@=.a} | |
45 | #TK_LIB_FILE = libtk.a | 58 | #TK_LIB_FILE = libtk.a | |
46 | 59 | |||
47 | # Generic lib name used in rules that apply to tcl and tk | 60 | # Generic lib name used in rules that apply to tcl and tk | |
48 | @@ -276,6 +280,8 @@ SHLIB_LD = @SHLIB_LD@ | 61 | @@ -276,6 +280,8 @@ SHLIB_LD = @SHLIB_LD@ | |
49 | SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ | 62 | SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ | |
50 | TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@ | 63 | TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@ | |
51 | 64 | |||
52 | +SHLIB_SUFFIX = @SHLIB_SUFFIX@ | 65 | +SHLIB_SUFFIX = @SHLIB_SUFFIX@ | |
53 | + | 66 | + | |
54 | # Additional search flags needed to find the various shared libraries | 67 | # Additional search flags needed to find the various shared libraries | |
55 | # at run-time. The first symbol is for use when creating a binary | 68 | # at run-time. The first symbol is for use when creating a binary | |
56 | # with cc, and the second is for use when running ld directly. | 69 | # with cc, and the second is for use when running ld directly. | |
57 | @@ -562,6 +568,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $( | 70 | @@ -563,6 +569,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $( | |
58 | 71 | |||
59 | DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget | 72 | DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget | |
60 | 73 | |||
61 | +INSTALL_HDRS = tk.h tkInt.h tkDecls.h tkIntDecls.h tkPlatDecls.h \ | 74 | +INSTALL_HDRS = tk.h tkInt.h tkDecls.h tkIntDecls.h tkPlatDecls.h \ | |
62 | + tkIntPlatDecls.h tkIntXlibDecls.h | 75 | + tkIntPlatDecls.h tkIntXlibDecls.h | |
63 | + | 76 | + | |
64 | SHELL_ENV = \ | 77 | SHELL_ENV = \ | |
65 | @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ | 78 | @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ | |
66 | export @LD_LIBRARY_PATH_VAR@; \ | 79 | export @LD_LIBRARY_PATH_VAR@; \ | |
67 | @@ -585,6 +594,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_ | 80 | @@ -586,6 +595,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_ | |
68 | rm -f $@ | 81 | rm -f $@ | |
69 | @MAKE_LIB@ | 82 | @MAKE_LIB@ | |
70 | 83 | |||
71 | +${TK_LIB_A_FILE}: ${OBJS} | 84 | +${TK_LIB_A_FILE}: ${OBJS} | |
72 | + rm -f $@ | 85 | + rm -f $@ | |
73 | + ar cr $@ ${OBJS} | 86 | + ar cr $@ ${OBJS} | |
74 | + $(RANLIB) $@ | 87 | + $(RANLIB) $@ | |
75 | + | 88 | + | |
76 | ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} | 89 | ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} | |
77 | @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ | 90 | @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ | |
78 | (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \ | 91 | (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \ | |
79 | @@ -709,7 +723,7 @@ install-strip: | 92 | @@ -710,7 +724,7 @@ install-strip: | |
80 | INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \ | 93 | INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \ | |
81 | INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}" | 94 | INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}" | |
82 | 95 | |||
83 | -install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} | 96 | -install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} | |
84 | +install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $(TK_LIB_A_FILE) ${WISH_EXE} ${TK_LIB_A_FILE} | 97 | +install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $(TK_LIB_A_FILE) ${WISH_EXE} ${TK_LIB_A_FILE} | |
85 | @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ | 98 | @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ | |
86 | "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ | 99 | "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ | |
87 | do \ | 100 | do \ | |
88 | @@ -739,7 +753,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $( | 101 | @@ -740,7 +754,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $( | |
89 | fi | 102 | fi | |
90 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" | 103 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" | |
91 | @@INSTALL_LIB@ | 104 | @@INSTALL_LIB@ | |
92 | - @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" | 105 | - @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" | |
93 | + @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \ | 106 | + @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \ | |
94 | + ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \ | 107 | + ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \ | |
95 | + else \ | 108 | + else \ | |
96 | + ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX)$(SHLIB_VERSION) $(LIB_FILE) ; \ | 109 | + ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX)$(SHLIB_VERSION) $(LIB_FILE) ; \ | |
97 | + fi | 110 | + fi | |
98 | + @echo "Installing ${TK_LIB_A_FILE} to $(DLL_INSTALL_DIR)/" | 111 | + @echo "Installing ${TK_LIB_A_FILE} to $(DLL_INSTALL_DIR)/" | |
99 | + @$(INSTALL_DATA) ${TK_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TK_LIB_A_FILE} | 112 | + @$(INSTALL_DATA) ${TK_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TK_LIB_A_FILE} | |
100 | @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ | 113 | @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ | |
101 | $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ | 114 | $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ | |
102 | chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ | 115 | chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ | |
103 | @@ -748,6 +768,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $( | 116 | @@ -749,6 +769,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $( | |
104 | fi | 117 | fi | |
105 | @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" | 118 | @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" | |
106 | @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" | 119 | @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" | |
107 | + @cd "$(BIN_INSTALL_DIR)" && ln -sf wish$(VERSION)@EXEEXT@ wish | 120 | + @cd "$(BIN_INSTALL_DIR)" && ln -sf wish$(VERSION)@EXEEXT@ wish | |
108 | @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" | 121 | @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" | |
109 | @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" | 122 | @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" | |
110 | @if test "$(STUB_LIB_FILE)" != "" ; then \ | 123 | @if test "$(STUB_LIB_FILE)" != "" ; then \ | |
111 | @@ -855,7 +876,7 @@ install-doc: | 124 | @@ -856,7 +877,7 @@ install-doc: | |
112 | install-headers: | 125 | install-headers: | |
113 | @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ | 126 | @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ | |
114 | XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ | 127 | XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ | |
115 | - for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \ | 128 | - for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \ | |
116 | + for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ | 129 | + for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ | |
117 | do \ | 130 | do \ | |
118 | if [ -n "$$i" -a ! -d "$$i" ] ; then \ | 131 | if [ -n "$$i" -a ! -d "$$i" ] ; then \ | |
119 | echo "Making directory $$i"; \ | 132 | echo "Making directory $$i"; \ | |
120 | @@ -864,9 +885,12 @@ install-headers: | 133 | @@ -865,9 +886,12 @@ install-headers: | |
121 | fi; \ | 134 | fi; \ | |
122 | done; | 135 | done; | |
123 | @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; | 136 | @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; | |
124 | - @for i in $(PUBLIC_HDRS); \ | 137 | - @for i in $(PUBLIC_HDRS); \ | |
125 | + $(INSTALL_DATA) $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/ | 138 | + $(INSTALL_DATA) $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/ | |
126 | + $(INSTALL_DATA) $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/ | 139 | + $(INSTALL_DATA) $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/ | |
127 | + @for i in $(INSTALL_HDRS); \ | 140 | + @for i in $(INSTALL_HDRS); \ | |
128 | do \ | 141 | do \ | |
129 | - $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ | 142 | - $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ | |
130 | + j=`basename $$i` ; \ | 143 | + j=`basename $$i` ; \ | |
131 | + cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tk/generic/$$j $$j ; \ | 144 | + cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tk/generic/$$j $$j ; \ | |
132 | done; | 145 | done; | |
133 | @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ | 146 | @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ | |
134 | do \ | 147 | do \ |
@@ -1,156 +1,157 @@ | @@ -1,156 +1,157 @@ | |||
1 | $NetBSD: patch-unix_configure,v 1.13 2018/12/09 18:35:44 adam Exp $ | 1 | $NetBSD: patch-unix_configure,v 1.14 2019/06/25 12:06:41 bsiegert Exp $ | |
2 | 2 | |||
3 | Support MirBSD. | 3 | Support MirBSD. | |
4 | Honor LDFLAGS. | 4 | Honor LDFLAGS. | |
5 | Standardize file names. | 5 | Standardize file names. | |
6 | 6 | |||
7 | --- unix/configure.orig 2018-11-16 19:02:48.000000000 +0000 | 7 | --- unix/configure.orig 2018-11-16 19:02:48.000000000 +0000 | |
8 | +++ unix/configure | 8 | +++ unix/configure | |
9 | @@ -4391,10 +4391,10 @@ fi | 9 | @@ -4391,10 +4391,10 @@ fi | |
10 | # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load] | 10 | # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load] | |
11 | # is disabled by the user. [Bug 1016796] | 11 | # is disabled by the user. [Bug 1016796] | |
12 | LDFLAGS_ARCH="" | 12 | LDFLAGS_ARCH="" | |
13 | - UNSHARED_LIB_SUFFIX="" | 13 | - UNSHARED_LIB_SUFFIX="" | |
14 | + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' | 14 | + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' | |
15 | TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' | 15 | TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' | |
16 | ECHO_VERSION='`echo ${VERSION}`' | 16 | ECHO_VERSION='`echo ${VERSION}`' | |
17 | - TCL_LIB_VERSIONS_OK=ok | 17 | - TCL_LIB_VERSIONS_OK=ok | |
18 | + TCL_LIB_VERSIONS_OK=nodots | 18 | + TCL_LIB_VERSIONS_OK=nodots | |
19 | CFLAGS_DEBUG=-g | 19 | CFLAGS_DEBUG=-g | |
20 | if test "$GCC" = yes; then | 20 | if test "$GCC" = yes; then | |
21 | 21 | |||
22 | @@ -5357,7 +5357,7 @@ fi | 22 | @@ -5357,7 +5357,7 @@ fi | |
23 | CC_SEARCH_FLAGS="" | 23 | CC_SEARCH_FLAGS="" | |
24 | LD_SEARCH_FLAGS="" | 24 | LD_SEARCH_FLAGS="" | |
25 | ;; | 25 | ;; | |
26 | - OpenBSD-*) | 26 | - OpenBSD-*) | |
27 | + OpenBSD-*|MirBSD-*) | 27 | + OpenBSD-*|MirBSD-*) | |
28 | arch=`arch -s` | 28 | arch=`arch -s` | |
29 | case "$arch" in | 29 | case "$arch" in | |
30 | alpha|sparc64) | 30 | alpha|sparc64) | |
31 | @@ -5378,7 +5378,7 @@ fi | 31 | @@ -5378,7 +5378,7 @@ fi | |
32 | 32 | |||
33 | LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} | 33 | LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} | |
34 | SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' | 34 | SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' | |
35 | - LDFLAGS="-Wl,-export-dynamic" | 35 | - LDFLAGS="-Wl,-export-dynamic" | |
36 | + LDFLAGS="-Wl,--export-dynamic" | 36 | + LDFLAGS="-Wl,--export-dynamic" | |
37 | CFLAGS_OPTIMIZE="-O2" | 37 | CFLAGS_OPTIMIZE="-O2" | |
38 | if test "${TCL_THREADS}" = "1"; then | 38 | if test "${TCL_THREADS}" = "1"; then | |
39 | 39 | |||
40 | @@ -5396,11 +5396,10 @@ fi | 40 | @@ -5396,11 +5396,10 @@ fi | |
41 | NetBSD-*) | 41 | NetBSD-*) | |
42 | # NetBSD has ELF and can use 'cc -shared' to build shared libs | 42 | # NetBSD has ELF and can use 'cc -shared' to build shared libs | |
43 | SHLIB_CFLAGS="-fPIC" | 43 | SHLIB_CFLAGS="-fPIC" | |
44 | - SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared' | 44 | - SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared' | |
45 | + SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS}' | 45 | + SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS}' | |
46 | SHLIB_SUFFIX=".so" | 46 | SHLIB_SUFFIX=".so" | |
47 | DL_OBJS="tclLoadDl.o" | 47 | DL_OBJS="tclLoadDl.o" | |
48 | DL_LIBS="" | 48 | DL_LIBS="" | |
49 | - LDFLAGS="$LDFLAGS -export-dynamic" | 49 | - LDFLAGS="$LDFLAGS -export-dynamic" | |
50 | if test $doRpath = yes; then | 50 | if test $doRpath = yes; then | |
51 | 51 | |||
52 | CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' | 52 | CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' | |
53 | @@ -6646,12 +6645,12 @@ fi | 53 | @@ -6646,12 +6645,12 @@ fi | |
54 | 54 | |||
55 | if test "$SHARED_LIB_SUFFIX" = ""; then | 55 | if test "$SHARED_LIB_SUFFIX" = ""; then | |
56 | 56 | |||
57 | - SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}' | 57 | - SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}' | |
58 | + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${SHLIB_SUFFIX}' | 58 | + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${SHLIB_SUFFIX}' | |
59 | fi | 59 | fi | |
60 | 60 | |||
61 | if test "$UNSHARED_LIB_SUFFIX" = ""; then | 61 | if test "$UNSHARED_LIB_SUFFIX" = ""; then | |
62 | 62 | |||
63 | - UNSHARED_LIB_SUFFIX='${VERSION}.a' | 63 | - UNSHARED_LIB_SUFFIX='${VERSION}.a' | |
64 | + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' | 64 | + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' | |
65 | fi | 65 | fi | |
66 | 66 | |||
67 | DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" | 67 | DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" | |
68 | @@ -6667,7 +6666,11 @@ fi | 68 | @@ -6667,8 +6666,11 @@ fi | |
69 | 69 | |||
70 | else | 70 | else | |
71 | 71 | |||
72 | - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' | 72 | - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' | |
73 | - | |||
73 | + if test "${SHLIB_SUFFIX}" = ".dylib" ; then | 74 | + if test "${SHLIB_SUFFIX}" = ".dylib" ; then | |
74 | + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' | 75 | + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' | |
75 | + else | 76 | + else | |
76 | + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"' | 77 | + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"' | |
77 | + fi | 78 | + fi | |
78 | ||||
79 | fi | 79 | fi | |
80 | 80 | |||
81 | @@ -6702,7 +6705,7 @@ else | 81 | ||
82 | @@ -6702,7 +6704,7 @@ else | |||
82 | 83 | |||
83 | fi | 84 | fi | |
84 | 85 | |||
85 | - INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' | 86 | - INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' | |
86 | + INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' | 87 | + INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' | |
87 | 88 | |||
88 | # Define TCL_LIBS now that we know what DL_LIBS is. | 89 | # Define TCL_LIBS now that we know what DL_LIBS is. | |
89 | # The trick here is that we don't want to change the value of TCL_LIBS if | 90 | # The trick here is that we don't want to change the value of TCL_LIBS if | |
90 | @@ -9713,7 +9716,7 @@ echo $ECHO_N "checking for X11 libraries | 91 | @@ -9713,7 +9715,7 @@ echo $ECHO_N "checking for X11 libraries | |
91 | if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then | 92 | if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then | |
92 | echo "$as_me:$LINENO: result: $i" >&5 | 93 | echo "$as_me:$LINENO: result: $i" >&5 | |
93 | echo "${ECHO_T}$i" >&6 | 94 | echo "${ECHO_T}$i" >&6 | |
94 | - XLIBSW="-L$i -lX11" | 95 | - XLIBSW="-L$i -lX11" | |
95 | + XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11" | 96 | + XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11" | |
96 | x_libraries="$i" | 97 | x_libraries="$i" | |
97 | break | 98 | break | |
98 | fi | 99 | fi | |
99 | @@ -9722,7 +9725,7 @@ echo "${ECHO_T}$i" >&6 | 100 | @@ -9722,7 +9724,7 @@ echo "${ECHO_T}$i" >&6 | |
100 | if test "$x_libraries" = ""; then | 101 | if test "$x_libraries" = ""; then | |
101 | XLIBSW=-lX11 | 102 | XLIBSW=-lX11 | |
102 | else | 103 | else | |
103 | - XLIBSW="-L$x_libraries -lX11" | 104 | - XLIBSW="-L$x_libraries -lX11" | |
104 | + XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11" | 105 | + XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11" | |
105 | fi | 106 | fi | |
106 | fi | 107 | fi | |
107 | if test "$XLIBSW" = nope ; then | 108 | if test "$XLIBSW" = nope ; then | |
108 | @@ -9818,11 +9821,6 @@ fi | 109 | @@ -9818,11 +9820,6 @@ fi | |
109 | # be replaced by spaces. | 110 | # be replaced by spaces. | |
110 | #-------------------------------------------------------------------- | 111 | #-------------------------------------------------------------------- | |
111 | 112 | |||
112 | -if test "x${x_libraries}" != "x"; then | 113 | -if test "x${x_libraries}" != "x"; then | |
113 | - if test "x${x_libraries}" != "xNONE"; then | 114 | - if test "x${x_libraries}" != "xNONE"; then | |
114 | - LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}" | 115 | - LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}" | |
115 | - fi | 116 | - fi | |
116 | -fi | 117 | -fi | |
117 | if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then | 118 | if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then | |
118 | LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` | 119 | LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` | |
119 | fi | 120 | fi | |
120 | @@ -11058,14 +11056,10 @@ else | 121 | @@ -11058,14 +11055,10 @@ else | |
121 | TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" | 122 | TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" | |
122 | TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" | 123 | TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" | |
123 | else | 124 | else | |
124 | - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then | 125 | - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then | |
125 | - TK_LIB_FLAG="-ltk${TK_VERSION}" | 126 | - TK_LIB_FLAG="-ltk${TK_VERSION}" | |
126 | - else | 127 | - else | |
127 | TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" | 128 | TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" | |
128 | - fi | 129 | - fi | |
129 | TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" | 130 | TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" | |
130 | fi | 131 | fi | |
131 | - TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" | 132 | - TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" | |
132 | + TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}" | 133 | + TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} {TK_LIB_FLAG}" | |
133 | fi | 134 | fi | |
134 | 135 | |||
135 | #-------------------------------------------------------------------- | 136 | #-------------------------------------------------------------------- | |
136 | @@ -11077,11 +11071,7 @@ fi | 137 | @@ -11077,11 +11070,7 @@ fi | |
137 | eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" | 138 | eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" | |
138 | eval "TK_STUB_LIB_DIR=${libdir}" | 139 | eval "TK_STUB_LIB_DIR=${libdir}" | |
139 | 140 | |||
140 | -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then | 141 | -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then | |
141 | - TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}" | 142 | - TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}" | |
142 | -else | 143 | -else | |
143 | - TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" | 144 | - TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" | |
144 | -fi | 145 | -fi | |
145 | +TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" | 146 | +TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" | |
146 | 147 | |||
147 | TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}" | 148 | TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}" | |
148 | TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}" | 149 | TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}" | |
149 | @@ -11902,6 +11892,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t | 150 | @@ -11902,6 +11893,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t | |
150 | s,@REZ@,$REZ,;t t | 151 | s,@REZ@,$REZ,;t t | |
151 | s,@REZ_FLAGS@,$REZ_FLAGS,;t t | 152 | s,@REZ_FLAGS@,$REZ_FLAGS,;t t | |
152 | s,@LTLIBOBJS@,$LTLIBOBJS,;t t | 153 | s,@LTLIBOBJS@,$LTLIBOBJS,;t t | |
153 | +s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t | 154 | +s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t | |
154 | CEOF | 155 | CEOF | |
155 | 156 | |||
156 | _ACEOF | 157 | _ACEOF |