From a218b814196983e00c19c3bca8f8dc9698334a13 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Tue, 4 Dec 2018 20:42:56 +0000 Subject: Shared library absolute address fixed in Libgit2 and WCSLIB on Mac OS The build systems of Libgit2 and WCSLIB on Mac OS does not account for installation in non-standard addresses: `Libgit2' keeps the absolute address of its build directory (not the installation directory) and WCSLIB doesn't write any absolute address at all (so the system uses the first one it finds). To address these issues, we are now using Mac OS's `install_name_tool' program to fix the absolute path within the installed shared library. Since the version of the library is actually present in its shared library name, in `dependency-versions.mk' we have also separated these two libraries so later when their version is changed, we are careful in correcting the shared library name also. --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 31d5eb7..8571149 100755 --- a/configure +++ b/configure @@ -655,7 +655,7 @@ fi # some systems. After some searching, I found out its because of too many # threads. if which nproc > /dev/null 2>/dev/null; then numthreads=$(nproc --all); -else numthreads=2; +else numthreads=1; fi make -f reproduce/src/make/dependencies-basic.mk \ rpath_command=$rpath_command \ @@ -677,8 +677,9 @@ make -f reproduce/src/make/dependencies-basic.mk \ # to build them in this script. But after this, we can rely on Makefiles. numthreads=$($instdir/bin/nproc) ./.local/bin/make -f reproduce/src/make/dependencies.mk \ - static_build=$static_build \ rpath_command=$rpath_command \ + static_build=$static_build \ + on_mac_os=$on_mac_os \ #-j$numthreads -- cgit v1.2.1