diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-04 23:38:25 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-04 23:38:25 +0100 |
| commit | 62b445308e0e28999bcfc89cad0fd68082066438 (patch) | |
| tree | d26d56bb3066461059643820bfda2355c44d9af8 /reproduce/software/make/high-level.mk | |
| parent | c64c85b311088d8de29da1ab94658cd75e8d8881 (diff) | |
The build of M4 and XLSX I/O on macOS has been fixed
Until now, the M4 that was built on macOS had internal problems (as
discussed in #1): it would simply print `Abort trap: 6' in the output and
abort. After looking at the build of Homebrew, I noticed that they apply a
patch (correct one line) to fix this problem. To be able to apply that
patch on macOS systems, I had fully open up the build recipe of M4 and
atleast on the testing system, it was built successfully.
Also, after successfully building M4, and thus Autoconf and thus Minizip,
we were able to build XLSX I/O on a macOS and found out that the internal
library's full address wasn't being put in the libraries and
executables. With this commit, we now use macOS's `install_name_tool' to
correct the positions of the two `libxlsxio_*' libraries in all its
executables.
Diffstat (limited to 'reproduce/software/make/high-level.mk')
| -rw-r--r-- | reproduce/software/make/high-level.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index b9b291f..605ca74 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -1197,10 +1197,17 @@ $(ibidir)/xlsxio: $(ibidir)/cmake \ -DMINIZIP_DIR:PATH=$(idir) \ -DMINIZIP_LIBRARIES=$(idir) \ -DMINIZIP_INCLUDE_DIRS=$(iidir)) \ - && if [ "x$(on_mac_os)" != xyes ]; then \ - echo "Adding RPATH to the XLSX I/O executables..."; \ + && echo "Correcting internal linking of XLSX I/O executables..." \ + && if [ "x$(on_mac_os)" = xyes ]; then \ + for f in $(ibdir)/xlsxio_* $(ildir)/libxlsxio_*.dylib; do \ + install_name_tool -change libxlsxio_read.dylib \ + $(ildir)/libxlsxio_read.dylib $$f; \ + install_name_tool -change libxlsxio_write.dylib \ + $(ildir)/libxlsxio_write.dylib $$f; \ + done; \ + else \ for f in $(ibdir)/xlsxio_* $(ildir)/libxlsxio_*.so; do \ - patchelf --set-rpath $(ildir) $$f; \ + patchelf --set-rpath $(ildir) $$f; \ done; \ fi \ && echo "Deleting XLSX I/O example files..." \ |