Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix [228476b3e9]: wish can link against incorrect libtk |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | core-8-6-branch |
| Files: | files | file ages | folders |
| SHA3-256: |
b7e2b7cc86dc319b2fe8d97b8369c8f6 |
| User & Date: | jan.nijtmans 2023-06-13 15:08:32 |
References
|
2023-06-13
| ||
| 16:15 | • Closed ticket [228476b3]: wish can link against incorrect libtk plus 7 other changes artifact: 272a2fbf user: jan.nijtmans | |
Context
|
2023-06-14
| ||
| 16:08 | (cherry-pick): Replaced the deprecated "trace variable" invocations with "trace add variable"; several further improvements. check-in: 578c60ce user: jan.nijtmans tags: core-8-6-branch | |
|
2023-06-13
| ||
| 15:08 | Fix [228476b3e9]: wish can link against incorrect libtk check-in: b7e2b7cc user: jan.nijtmans tags: core-8-6-branch | |
|
2023-06-11
| ||
| 08:36 | Fix [57844100da]: Aqua: fix leak in TkScrollWindow(). Patch from Christopher Chavez. check-in: 9f3cd915 user: fvogel tags: core-8-6-branch | |
Changes
Changes to unix/Makefile.in.
| ︙ | ︙ | |||
617 618 619 620 621 622 623 |
@echo ${OBJS}
# This targets actually build the objects needed for the lib in the above
# case
objs: ${OBJS}
${WISH_EXE}: $(TK_STUB_LIB_FILE) $(WISH_OBJS) $(TK_LIB_FILE) @APP_RSRC_FILE@
| | | | | | 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 |
@echo ${OBJS}
# This targets actually build the objects needed for the lib in the above
# case
objs: ${OBJS}
${WISH_EXE}: $(TK_STUB_LIB_FILE) $(WISH_OBJS) $(TK_LIB_FILE) @APP_RSRC_FILE@
${CC} ${CFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ ${LDFLAGS} \
$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o ${WISH_EXE}
# Resetting the LIB_RUNTIME_DIR below is required so that
# the generated tktest executable gets the build directory
# burned into its ld search path. This keeps tktest from
# picking up an already installed version of the Tcl or
# Tk shared libraries.
$(TKTEST_EXE): $(TKTEST_OBJS) $(TK_LIB_FILE)
$(MAKE) tktest-real LIB_RUNTIME_DIR="`pwd`:$(TCL_BIN_DIR)"
tktest-real: ${TK_STUB_LIB_FILE}
${CC} ${CFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ ${LDFLAGS} $(WISH_LIBS) \
${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} $(CC_SEARCH_FLAGS) -o $(TKTEST_EXE)
# # FIXME: This xttest rule seems to be broken in a number of ways. It should
# # use CC_SEARCH_FLAGS, it does not include the shared lib location logic from
# # tktest, and it is not clear where this test.o object file comes from.
#
# xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) ${TK_STUB_LIB_FILE}
# ${CC} ${CFLAGS} test.o tkTest.o tkSquare.o \
# @TK_BUILD_LIB_SPEC@ ${LDFLAGS} ${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} \
# $(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
# Note, in the target below TCL_LIBRARY needs to be set or else
# "make test" won't work in the case where the compilation directory
# isn't the same as the source directory.
# Specifying TESTFLAGS on the command line is the standard way to pass
# args to tcltest, ie:
|
| ︙ | ︙ |