From f6a3c2f9f55f5578c110d3464d1d5a9e007000e7 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 23 Oct 2024 11:42:06 +0800
Subject: [PATCH 1/2] Ensure cmake-compiled libraries aren't installed with an
 rpath.

---
 library_builders.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library_builders.sh b/library_builders.sh
index 317ab731..1b1b50a1 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -167,7 +167,7 @@ function build_libjpeg_turbo {
     local cmake=$(get_modern_cmake)
     fetch_unpack https://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-${JPEGTURBO_VERSION}.tar.gz
     (cd libjpeg-turbo-${JPEGTURBO_VERSION} \
-        && $cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib . \
+        && $cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
         && make install)
 
     # Prevent build_jpeg
@@ -234,7 +234,7 @@ function build_openjpeg {
     fi
     local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/${archive_prefix}${OPENJPEG_VERSION}.tar.gz)
     (cd $out_dir \
-        && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \
+        && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
         && make install)
     touch openjpeg-stamp
 }
@@ -342,7 +342,7 @@ function build_blosc {
     local cmake=$(get_modern_cmake)
     fetch_unpack https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz
     (cd c-blosc-${BLOSC_VERSION} \
-        && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \
+        && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
         && make install)
     if [ -n "$IS_MACOS" ]; then
         # Fix blosc library id bug

From d63718c899074786f8a7e480cdaea0204854ed26 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 23 Oct 2024 11:52:06 +0800
Subject: [PATCH 2/2] Remove workaround for library naming.

---
 library_builders.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/library_builders.sh b/library_builders.sh
index 1b1b50a1..2a8b7321 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -344,12 +344,6 @@ function build_blosc {
     (cd c-blosc-${BLOSC_VERSION} \
         && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
         && make install)
-    if [ -n "$IS_MACOS" ]; then
-        # Fix blosc library id bug
-        for lib in $(ls ${BUILD_PREFIX}/lib/libblosc*.dylib); do
-            install_name_tool -id $lib $lib
-        done
-    fi
     touch blosc-stamp
 }