Revision: 77767
http://sourceforge.net/p/brlcad/code/77767
Author: starseeker
Date: 2020-11-20 20:56:27 +0000 (Fri, 20 Nov 2020)
Log Message:
-----------
Try similar changes for Tk...
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/tk/unix/configure
brlcad/branches/extbuild/src/other/ext/tk.cmake
Modified: brlcad/branches/extbuild/src/other/ext/tk/unix/configure
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tk/unix/configure 2020-11-20
20:45:59 UTC (rev 77766)
+++ brlcad/branches/extbuild/src/other/ext/tk/unix/configure 2020-11-20
20:56:27 UTC (rev 77767)
@@ -5428,7 +5428,6 @@
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
- LDFLAGS=""
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
Modified: brlcad/branches/extbuild/src/other/ext/tk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-20 20:45:59 UTC
(rev 77766)
+++ brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-20 20:56:27 UTC
(rev 77767)
@@ -57,7 +57,7 @@
URL "${CMAKE_CURRENT_SOURCE_DIR}/tk"
BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
PATCH_COMMAND rpath_replace ${TK_PATCH_FILES}
- CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR} ${TK_SRC_DIR}/unix/configure
--prefix=${TK_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${TCLCONF_DIR}>
--disable-xft --enable-64bit --enable-rpath
+ CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR}
TK_SHLIB_LD_EXTRAS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR}
${TK_SRC_DIR}/unix/configure --prefix=${TK_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${TCLCONF_DIR}>
--disable-xft --enable-64bit --enable-rpath
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${TCL_TARGET} rpath_replace
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
