diff options
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | reproduce/config/pipeline/dependency-versions.mk | 12 | ||||
| -rw-r--r-- | reproduce/src/make/dependencies-basic.mk | 3 | ||||
| -rw-r--r-- | reproduce/src/make/dependencies.mk | 73 |
4 files changed, 67 insertions, 26 deletions
@@ -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 diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index 99d55ee..dc161c6 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -36,7 +36,15 @@ cfitsio-version = 3.45 curl-version = 7.62.0 gsl-version = 2.5 libjpeg-version = v9b -libgit2-version = 0.26.0 libtiff-version = 4.0.10 -wcslib-version = 6.2 zlib-version = 1.2.11 + +# Special libraries +# ----------------- +# +# The shared library name of the following libraries is explicity mentioned +# the software build Makefiles (`reproduce/src/make/dependencies*.mk'). If +# you change their version, also please change the explicit shared library +# names also. +libgit2-version = 0.26.0 +wcslib-version = 6.2 diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk index b007778..bedf0a0 100644 --- a/reproduce/src/make/dependencies-basic.mk +++ b/reproduce/src/make/dependencies-basic.mk @@ -208,8 +208,9 @@ $(ibdir)/low-level-links: | $(ibdir) $(ildir) $(call makelink,ps) $(call makelink,ranlib) - # Mac OS information (used by TeX Live). + # Mac OS specific $(call makelink,sw_vers) + $(call makelink,install_name_tool) # On Mac OS, libtool is different compared to GNU Libtool. The # libtool we'll build in the high-level dependencies has the diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index e309473..24f42a9 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -188,23 +188,6 @@ $(ilidir)/cfitsio: $(tdir)/cfitsio-$(cfitsio-version).tar.gz \ --enable-sse2 --enable-reentrant) \ && echo "CFITSIO is built" > $@ - -# The libgit2 page recommends doing a static build, especially for Mac -# systems (with `-DBUILD_SHARED_LIBS=OFF'). Under XCode, the following link -# has written "It’s highly recommended that you build libgit2 as a static -# library for Xcode projects. This simplifies distribution significantly, -# as the resolution of dynamic libraries at runtime can be extremely -# problematic.". This is a major problem we have been having so far with -# Mac systems: https://libgit2.org/docs/guides/build-and-link -$(ilidir)/libgit2: $(tdir)/libgit2-$(libgit2-version).tar.gz \ - $(ibdir)/cmake \ - $(ibdir)/curl - export LDFLAGS="$$LDFLAGS -lssl -lcrypto -lz"; \ - $(call cbuild, $<, libgit2-$(libgit2-version), static, \ - -DUSE_SSH=OFF -DBUILD_CLAR=OFF \ - -DTHREADSAFE=ON ) \ - && echo "Libgit2 is built" > $@ - $(ilidir)/gsl: $(tdir)/gsl-$(gsl-version).tar.gz $(call gbuild, $<, gsl-$(gsl-version), static) \ && echo "GNU Scientific Library is built" > $@ @@ -217,20 +200,68 @@ $(ilidir)/libtiff: $(tdir)/tiff-$(libtiff-version).tar.gz \ $(call gbuild, $<, tiff-$(libtiff-version), static) \ && echo "Libtiff is built" > $@ + + + + +# Libraries with special attention on Mac OS +# ------------------------------------------ +# +# Libgit2 and WCSLIB don't set their installation path, or don't do it +# properly, in their finally installed shared libraries. But since we are +# linking everything (including OpenSSL and its dependencies) dynamically, +# we need to also make a shared libraries and can't use static +# libraries. So for Mac OS systems we have to correct their addresses +# manually. +# +# For example, Libgit2 page recommends doing a static build, especially for +# Mac systems (with `-DBUILD_SHARED_LIBS=OFF'): "It’s highly recommended +# that you build libgit2 as a static library for Xcode projects. This +# simplifies distribution significantly, as the resolution of dynamic +# libraries at runtime can be extremely problematic.". This is a major +# problem we have been having so far with Mac systems: +# https://libgit2.org/docs/guides/build-and-link +$(ilidir)/libgit2: $(tdir)/libgit2-$(libgit2-version).tar.gz \ + $(ibdir)/cmake \ + $(ibdir)/curl + # Build and install the library. + $(call cbuild, $<, libgit2-$(libgit2-version), static, \ + -DUSE_SSH=OFF -DBUILD_CLAR=OFF \ + -DTHREADSAFE=ON ) + + # The builders didn't set the shared library name (ID) for Mac OS + # systems. So we'll have to fix it manually. + if [ x$(on_mac_os) = xyes ]; then + install_name_tool -id $(ildir)/libgit2.26.dylib + $(ildir)/libgit2.26.dylib + fi + + # Write the target file. + echo "Libgit2 is built" > $@ + $(ilidir)/wcslib: $(tdir)/wcslib-$(wcslib-version).tar.bz2 \ $(ilidir)/cfitsio - # Unfortunately WCSLIB forces the building of shared libraries. So - # we'll just delete any shared library that is produced afterwards. - $(call gbuild, $<, wcslib-$(wcslib-version), , \ + # Build and install the library. + $(call gbuild, $<, wcslib-$(wcslib-version), , \ LIBS="-pthread -lcurl -lssl -lcrypto -lz -lm" \ --with-cfitsiolib=$(ildir) \ --with-cfitsioinc=$(idir)/include \ - --without-pgplot --disable-fortran) && \ + --without-pgplot --disable-fortran) + + # The builders didn't set the shared library name (ID) for Mac OS + # systems. So we'll have to fix it manually. + if [ x$(on_mac_os) = xyes ]; then + install_name_tool -id $(ildir)/libwcs.6.2.dylib + $(ildir)/libwcs.6.2.dylib; + fi + + # Write the target file. echo "WCSLIB is built" > $@ + # Programs # -------- # |