Revision: 77768
http://sourceforge.net/p/brlcad/code/77768
Author: starseeker
Date: 2020-11-20 21:25:00 +0000 (Fri, 20 Nov 2020)
Log Message:
-----------
LDFLAGS isn't enough - configure is actually trying to run programs that are
trying to link against the bundled libz_brl. See if this works...
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/tcl.cmake
brlcad/branches/extbuild/src/other/ext/tk.cmake
Modified: brlcad/branches/extbuild/src/other/ext/tcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-20 20:56:27 UTC
(rev 77767)
+++ brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-20 21:25:00 UTC
(rev 77768)
@@ -77,7 +77,7 @@
BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
PATCH_COMMAND rpath_replace ${TCL_PATCH_FILES}
COMMAND tcl_replace ${TCL_REWORK_FILES}
- CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR}
TCL_SHLIB_LD_EXTRAS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR}
${TCL_SRC_DIR}/unix/configure --prefix=${TCL_INSTDIR}
+ CONFIGURE_COMMAND LD_LIBRARY_PATH=-L${CMAKE_BINARY_ROOT}/${LIB_DIR}
CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR}
TCL_SHLIB_LD_EXTRAS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR}
${TCL_SRC_DIR}/unix/configure --prefix=${TCL_INSTDIR}
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${ZLIB_TARGET} tcl_replace rpath_replace
Modified: brlcad/branches/extbuild/src/other/ext/tk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-20 20:56:27 UTC
(rev 77767)
+++ brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-20 21:25:00 UTC
(rev 77768)
@@ -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_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
+ CONFIGURE_COMMAND LD_LIBRARY_PATH=-L${CMAKE_BINARY_ROOT}/${LIB_DIR}
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
