Skip to content

Commit 0b0f5f1

Browse files
author
jan.nijtmans
committed
TIP #595
1 parent c6dc150 commit 0b0f5f1

File tree

7 files changed

+130
-57
lines changed

7 files changed

+130
-57
lines changed

Diff for: ‎Makefile.in

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ PKG_HEADERS = @PKG_HEADERS@
6060
#========================================================================
6161

6262
PKG_LIB_FILE = @PKG_LIB_FILE@
63+
PKG_LIB_FILE8 = @PKG_LIB_FILE8@
64+
PKG_LIB_FILE9 = @PKG_LIB_FILE9@
6365
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
6466

6567
lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)

Diff for: ‎configure

+21-2
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,8 @@ PKG_TCL_SOURCES
729729
PKG_STUB_OBJECTS
730730
PKG_STUB_SOURCES
731731
PKG_STUB_LIB_FILE
732+
PKG_LIB_FILE9
733+
PKG_LIB_FILE8
732734
PKG_LIB_FILE
733735
EXEEXT
734736
CYGPATH
@@ -2627,6 +2629,8 @@ printf "%s\n" "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;}
26272629

26282630
# This package name must be replaced statically for AC_SUBST to work
26292631

2632+
2633+
26302634
# Substitute STUB_LIB_FILE in case package creates a stub library too.
26312635

26322636

@@ -9038,6 +9042,13 @@ rm -rf conftest*
90389042
# substituted. (@@@ Might not be necessary anymore)
90399043
#--------------------------------------------------------------------
90409044

9045+
PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
9046+
PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
9047+
if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
9048+
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
9049+
else
9050+
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX8}"
9051+
fi
90419052
if test "${TEA_PLATFORM}" = "windows" ; then
90429053
if test "${SHARED_BUILD}" = "1" ; then
90439054
# We force the unresolved linking of symbols that are really in
@@ -9049,12 +9060,16 @@ rm -rf conftest*
90499060
if test "$GCC" = "yes"; then
90509061
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
90519062
fi
9063+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9064+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
90529065
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
90539066
else
9054-
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
90559067
if test "$GCC" = "yes"; then
9056-
PKG_LIB_FILE=lib${PKG_LIB_FILE}
9068+
PACKAGE_LIB_PREFIX=lib${PACKAGE_LIB_PREFIX}
90579069
fi
9070+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9071+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9072+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
90589073
fi
90599074
# Some packages build their own stubs libraries
90609075
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
@@ -9071,9 +9086,13 @@ rm -rf conftest*
90719086
if test x"${TK_BIN_DIR}" != x ; then
90729087
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
90739088
fi
9089+
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9090+
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
90749091
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
90759092
RANLIB=:
90769093
else
9094+
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9095+
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
90779096
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
90789097
fi
90799098
# Some packages build their own stubs libraries

Diff for: ‎itclWidget/Makefile.in

+41-28
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ PKG_HEADERS = @PKG_HEADERS@
6060
#========================================================================
6161

6262
PKG_LIB_FILE = @PKG_LIB_FILE@
63+
PKG_LIB_FILE8 = @PKG_LIB_FILE8@
64+
PKG_LIB_FILE9 = @PKG_LIB_FILE9@
6365
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
6466

6567
lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)
@@ -159,9 +161,14 @@ CLEANFILES = @CLEANFILES@
159161
CPPFLAGS = @CPPFLAGS@
160162
LIBS = @PKG_LIBS@ @LIBS@
161163
AR = @AR@
162-
CFLAGS = @CFLAGS@
164+
CFLAGS = @CFLAGS@ -DTCL_NO_DEPRECATED
163165
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
164166

167+
GDB = gdb
168+
VALGRIND = valgrind
169+
VALGRINDARGS = --tool=memcheck --num-callers=8 --leak-resolution=high \
170+
--leak-check=yes --show-reachable=yes -v
171+
165172
.SUFFIXES: .c .$(OBJEXT)
166173

167174
#========================================================================
@@ -207,11 +214,11 @@ install-binaries: binaries install-lib-binaries install-bin-binaries
207214
#========================================================================
208215

209216
install-libraries: libraries
210-
@$(INSTALL_DATA_DIR) $(DESTDIR)$(includedir)
217+
@$(INSTALL_DATA_DIR) "$(DESTDIR)$(includedir)"
211218
@echo "Installing header files in $(DESTDIR)$(includedir)"
212219
@list='$(PKG_HEADERS)'; for i in $$list; do \
213220
echo "Installing $(srcdir)/$$i" ; \
214-
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
221+
$(INSTALL_DATA) $(srcdir)/$$i "$(DESTDIR)$(includedir)" ; \
215222
done;
216223

217224
#========================================================================
@@ -220,7 +227,7 @@ install-libraries: libraries
220227
#========================================================================
221228

222229
install-doc: doc
223-
@$(INSTALL_DATA_DIR) $(DESTDIR)$(mandir)/mann
230+
@$(INSTALL_DATA_DIR) "$(DESTDIR)$(mandir)/mann"
224231
@echo "Installing documentation in $(DESTDIR)$(mandir)"
225232
@list='$(srcdir)/doc/*.n'; for i in $$list; do \
226233
echo "Installing $$i"; \
@@ -234,17 +241,19 @@ shell: binaries libraries
234241
@$(TCLSH) $(SCRIPT)
235242

236243
gdb:
237-
$(TCLSH_ENV) gdb $(TCLSH_PROG) $(SCRIPT)
244+
$(TCLSH_ENV) $(PKG_ENV) $(GDB) $(TCLSH_PROG) $(SCRIPT)
238245

239-
VALGRINDARGS = --tool=memcheck --num-callers=8 --leak-resolution=high \
240-
--leak-check=yes --show-reachable=yes -v
246+
gdb-test: binaries libraries
247+
$(TCLSH_ENV) $(PKG_ENV) $(GDB) \
248+
--args $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/tests/all.tcl` \
249+
$(TESTFLAGS) -singleproc 1 -load "$(TESTLOADARG)"
241250

242251
valgrind: binaries libraries
243-
$(TCLSH_ENV) valgrind $(VALGRINDARGS) $(TCLSH_PROG) \
244-
`@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
252+
$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(TCLSH_PROG) \
253+
`@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
245254

246255
valgrindshell: binaries libraries
247-
$(TCLSH_ENV) valgrind $(VALGRINDARGS) $(TCLSH_PROG) $(SCRIPT)
256+
$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(TCLSH_PROG) $(SCRIPT)
248257

249258
depend:
250259

@@ -275,8 +284,8 @@ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
275284
# containing your extension. If your sources are in a subdirectory,
276285
# you will have to modify the paths to reflect this:
277286
#
278-
# exampleA.$(OBJEXT): $(srcdir)/generic/exampleA.c
279-
# $(COMPILE) -c `@CYGPATH@ $(srcdir)/generic/exampleA.c` -o $@
287+
# sample.$(OBJEXT): $(srcdir)/generic/sample.c
288+
# $(COMPILE) -c `@CYGPATH@ $(srcdir)/generic/sample.c` -o $@
280289
#
281290
# Setting the VPATH variable to a list of paths will cause the makefile
282291
# to look into these paths when resolving .c to .obj dependencies.
@@ -293,11 +302,13 @@ VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macos
293302
# You may need to tweak this target to make it work correctly.
294303
#========================================================================
295304

296-
TAR = tar
297-
#COMPRESS = tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
298-
COMPRESS = $(TAR) zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
299-
DIST_ROOT = /tmp/dist
300-
DIST_DIR = $(DIST_ROOT)/$(PKG_DIR)
305+
#COMPRESS = tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
306+
COMPRESS = tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
307+
DIST_ROOT = /tmp/dist
308+
DIST_DIR = $(DIST_ROOT)/$(PKG_DIR)
309+
310+
DIST_INSTALL_DATA = CPPROG='cp -p' $(INSTALL) -m 644
311+
DIST_INSTALL_SCRIPT = CPPROG='cp -p' $(INSTALL) -m 755
301312

302313
dist-clean:
303314
rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
@@ -368,25 +379,25 @@ distclean: clean
368379
#========================================================================
369380

370381
install-lib-binaries: binaries
371-
@$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
382+
@$(INSTALL_DATA_DIR) "$(DESTDIR)$(pkglibdir)"
372383
@list='$(lib_BINARIES)'; for p in $$list; do \
373384
if test -f $$p; then \
374385
echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
375-
$(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
386+
$(INSTALL_LIBRARY) $$p "$(DESTDIR)$(pkglibdir)/$$p"; \
376387
stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
377388
if test "x$$stub" = "xstub"; then \
378389
echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
379-
$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
390+
$(RANLIB_STUB) "$(DESTDIR)$(pkglibdir)/$$p"; \
380391
else \
381392
echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
382-
$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
393+
$(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
383394
fi; \
384395
ext=`echo $$p|sed -e "s/.*\.//"`; \
385396
if test "x$$ext" = "xdll"; then \
386397
lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
387398
if test -f $$lib; then \
388399
echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
389-
$(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
400+
$(INSTALL_DATA) $$lib "$(DESTDIR)$(pkglibdir)/$$lib"; \
390401
fi; \
391402
fi; \
392403
fi; \
@@ -395,12 +406,12 @@ install-lib-binaries: binaries
395406
if test -f $(srcdir)/$$p; then \
396407
destp=`basename $$p`; \
397408
echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
398-
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
409+
$(INSTALL_DATA) $(srcdir)/$$p "$(DESTDIR)$(pkglibdir)/$$destp"; \
399410
fi; \
400411
done
401412
@if test "x$(SHARED_BUILD)" = "x1"; then \
402413
echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
403-
$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
414+
$(INSTALL_DATA) pkgIndex.tcl "$(DESTDIR)$(pkglibdir)"; \
404415
fi
405416

406417
#========================================================================
@@ -417,7 +428,7 @@ install-bin-binaries: binaries
417428
@list='$(bin_BINARIES)'; for p in $$list; do \
418429
if test -f $$p; then \
419430
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \
420-
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
431+
$(INSTALL_PROGRAM) $$p "$(DESTDIR)$(bindir)/$$p"; \
421432
fi; \
422433
done
423434

@@ -427,17 +438,19 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
427438

428439
uninstall-binaries:
429440
list='$(lib_BINARIES)'; for p in $$list; do \
430-
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
441+
rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
431442
done
432443
list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
433444
p=`basename $$p`; \
434-
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
445+
rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
435446
done
436447
list='$(bin_BINARIES)'; for p in $$list; do \
437-
rm -f $(DESTDIR)$(bindir)/$$p; \
448+
rm -f "$(DESTDIR)$(bindir)/$$p"; \
438449
done
439450

440451
.PHONY: all binaries clean depend distclean doc install libraries test
452+
.PHONY: gdb gdb-test valgrind valgrindshell
453+
.PHONY: genstubs
441454

442455
# Tell versions [3.59,3.63) of GNU make to not export all variables.
443456
# Otherwise a system limit (for SysV at least) may be exceeded.

Diff for: ‎itclWidget/configure

+21-2
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,8 @@ PKG_TCL_SOURCES
740740
PKG_STUB_OBJECTS
741741
PKG_STUB_SOURCES
742742
PKG_STUB_LIB_FILE
743+
PKG_LIB_FILE9
744+
PKG_LIB_FILE8
743745
PKG_LIB_FILE
744746
EXEEXT
745747
CYGPATH
@@ -2589,6 +2591,8 @@ printf "%s\n" "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;}
25892591

25902592
# This package name must be replaced statically for AC_SUBST to work
25912593

2594+
2595+
25922596
# Substitute STUB_LIB_FILE in case package creates a stub library too.
25932597

25942598

@@ -9625,6 +9629,13 @@ rm -rf conftest*
96259629
# substituted. (@@@ Might not be necessary anymore)
96269630
#--------------------------------------------------------------------
96279631

9632+
PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
9633+
PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
9634+
if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
9635+
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
9636+
else
9637+
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX8}"
9638+
fi
96289639
if test "${TEA_PLATFORM}" = "windows" ; then
96299640
if test "${SHARED_BUILD}" = "1" ; then
96309641
# We force the unresolved linking of symbols that are really in
@@ -9636,12 +9647,16 @@ rm -rf conftest*
96369647
if test "$GCC" = "yes"; then
96379648
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
96389649
fi
9650+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9651+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
96399652
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
96409653
else
9641-
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
96429654
if test "$GCC" = "yes"; then
9643-
PKG_LIB_FILE=lib${PKG_LIB_FILE}
9655+
PACKAGE_LIB_PREFIX=lib${PACKAGE_LIB_PREFIX}
96449656
fi
9657+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9658+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9659+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
96459660
fi
96469661
# Some packages build their own stubs libraries
96479662
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
@@ -9658,9 +9673,13 @@ rm -rf conftest*
96589673
if test x"${TK_BIN_DIR}" != x ; then
96599674
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
96609675
fi
9676+
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9677+
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
96619678
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
96629679
RANLIB=:
96639680
else
9681+
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9682+
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
96649683
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
96659684
fi
96669685
# Some packages build their own stubs libraries

Diff for: ‎itclWidget/pkgIndex.tcl.in

+15-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1-
# Tcl package index file, version 1.0
1+
# -*- tcl -*-
2+
# Tcl package index file, version 1.1
3+
#
24

3-
if {![package vsatisfies [package provide Tcl] 8.6]} {return}
5+
if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
46

5-
package ifneeded itclwidget @PACKAGE_VERSION@ [list package require itcl 4.0.0]\
6-
[list package require Tk 8.6.0]\
7-
[list load [file join $dir "@PKG_LIB_FILE@"] Itclwidget]
7+
if {[package vsatisfies [package provide Tcl] 9.0-]} {
8+
package ifneeded itclwidget @PACKAGE_VERSION@ \
9+
[list package require itcl 4.0.0] \
10+
[list package require Tk 8.6-] \
11+
[list load [file join $dir @PKG_LIB_FILE9@] Itclwidget]
12+
} else {
13+
package ifneeded itclwidget @PACKAGE_VERSION@ \
14+
[list package require itcl 4.0.0] \
15+
[list package require Tk 8.6-] \
16+
[list load [file join $dir @PKG_LIB_FILE8@] Itclwidget]
17+
}

Diff for: ‎itclWidget/tclconfig/tcl.m4

+19-2
Original file line numberDiff line numberDiff line change
@@ -2732,6 +2732,8 @@ The PACKAGE_NAME variable must be defined by your TEA configure.ac])
27322732
27332733
# This package name must be replaced statically for AC_SUBST to work
27342734
AC_SUBST(PKG_LIB_FILE)
2735+
AC_SUBST(PKG_LIB_FILE8)
2736+
AC_SUBST(PKG_LIB_FILE9)
27352737
# Substitute STUB_LIB_FILE in case package creates a stub library too.
27362738
AC_SUBST(PKG_STUB_LIB_FILE)
27372739
@@ -3157,6 +3159,13 @@ print("manifest needed")
31573159
# substituted. (@@@ Might not be necessary anymore)
31583160
#--------------------------------------------------------------------
31593161
3162+
PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
3163+
PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
3164+
if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
3165+
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
3166+
else
3167+
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX8}"
3168+
fi
31603169
if test "${TEA_PLATFORM}" = "windows" ; then
31613170
if test "${SHARED_BUILD}" = "1" ; then
31623171
# We force the unresolved linking of symbols that are really in
@@ -3168,12 +3177,16 @@ print("manifest needed")
31683177
if test "$GCC" = "yes"; then
31693178
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
31703179
fi
3180+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
3181+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
31713182
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
31723183
else
3173-
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
31743184
if test "$GCC" = "yes"; then
3175-
PKG_LIB_FILE=lib${PKG_LIB_FILE}
3185+
PACKAGE_LIB_PREFIX=lib${PACKAGE_LIB_PREFIX}
31763186
fi
3187+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
3188+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
3189+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
31773190
fi
31783191
# Some packages build their own stubs libraries
31793192
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
@@ -3190,9 +3203,13 @@ print("manifest needed")
31903203
if test x"${TK_BIN_DIR}" != x ; then
31913204
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
31923205
fi
3206+
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
3207+
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
31933208
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
31943209
RANLIB=:
31953210
else
3211+
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
3212+
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
31963213
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
31973214
fi
31983215
# Some packages build their own stubs libraries

0 commit comments

Comments
 (0)