Revision: 77751
http://sourceforge.net/p/brlcad/code/77751
Author: starseeker
Date: 2020-11-19 17:08:03 +0000 (Thu, 19 Nov 2020)
Log Message:
-----------
Experiment to see if we can just force the rpath issue directly in configure.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/tcl.cmake
Added Paths:
-----------
brlcad/branches/extbuild/src/other/ext/CMake/tcl_configure.patch
Added: brlcad/branches/extbuild/src/other/ext/CMake/tcl_configure.patch
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/tcl_configure.patch
(rev 0)
+++ brlcad/branches/extbuild/src/other/ext/CMake/tcl_configure.patch
2020-11-19 17:08:03 UTC (rev 77751)
@@ -0,0 +1,13 @@
+Index: unix/configure
+===================================================================
+--- unix/configure (revision 77749)
++++ unix/configure (working copy)
+@@ -20059,4 +20059,8 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+ fi
+
++if test "`uname -s`" = "Darwin"; then
++ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
++fi
+
Property changes on:
brlcad/branches/extbuild/src/other/ext/CMake/tcl_configure.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/branches/extbuild/src/other/ext/tcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-19 13:11:30 UTC
(rev 77750)
+++ brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-19 17:08:03 UTC
(rev 77751)
@@ -75,7 +75,8 @@
ExternalProject_Add(TCL_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/tcl"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- PATCH_COMMAND rpath_replace ${TCL_PATCH_FILES}
+ PATCH_COMMAND patch "${TCL_SRC_DIR}/unix/configure"
"${CMAKE_CURRENT_SOURCE_DIR}/CMake/tcl_configure.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_SRC_DIR}/unix/configure
--prefix=${TCL_INSTDIR}
BUILD_COMMAND make -j${pcnt}
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
