From 2e15e51079708e1c54f1a7ba7750a07849992373 Mon Sep 17 00:00:00 2001
From: James Foster <James.Foster@csiro.au>
Date: Tue, 21 May 2024 17:38:22 +1000
Subject: [PATCH] Restore @rpath

---
 L/libflame/bundled/patches/mac-update-makefile.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/L/libflame/bundled/patches/mac-update-makefile.patch b/L/libflame/bundled/patches/mac-update-makefile.patch
index c9d38172d32..d9935faeece 100644
--- a/L/libflame/bundled/patches/mac-update-makefile.patch
+++ b/L/libflame/bundled/patches/mac-update-makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index c7a2b7f7..6059b581 100644
+index c7a2b7f7..0c509288 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -140,7 +140,7 @@ LIBFLAME_SO_OUTPUT_NAME := $(LIBFLAME_SO_PATH)
@@ -7,7 +7,7 @@ index c7a2b7f7..6059b581 100644
  # OS X shared library link flags.
  SOFLAGS    := -dynamiclib
 -SOFLAGS    += -Wl,-install_name,$(LIBFLAME_SONAME)
-+SOFLAGS    += -Wl,-install_name,$(libdir)/$(LIBFLAME_SONAME)
++SOFLAGS    += -Wl,-install_name,@rpath/$(LIBFLAME_SONAME)
  else
  SOFLAGS    := -shared
  # Linux shared library link flags.
@@ -16,7 +16,7 @@ index c7a2b7f7..6059b581 100644
  	$(CAT) $(AR_OBJ_LIST_FILE).sotmp | xargs -n$(AR_CHUNK_SIZE) $(AR) $(ARFLAGS) $(LIBFLAME_A)
  ifeq ($(OS_NAME),Darwin)
 -	$(LINKER) $(SOFLAGS) -o $@ -Wl,-force_load,$(LIBFLAME_A) $(LDFLAGS)
-+	$(LINKER) $(SOFLAGS) -o $@ -Wl,-force_load,$(LIBFLAME_A) -Wl,-rpath,$(LIBFLAME_A_PATH) $(LDFLAGS)
++	$(LINKER) $(SOFLAGS) -o $@ -Wl,-rpath,$(LIBFLAME_A_PATH) -Wl,-force_load,$(LIBFLAME_A) -Wl,-all_load $(LDFLAGS)
  else
  	$(LINKER) $(SOFLAGS) -o $@ -Wl,--whole-archive $(LIBFLAME_A) -Wl,--no-whole-archive $(LDFLAGS)
  endif
@@ -25,7 +25,7 @@ index c7a2b7f7..6059b581 100644
  	@$(CAT) $(AR_OBJ_LIST_FILE).sotmp | xargs -n$(AR_CHUNK_SIZE) $(AR) $(ARFLAGS) $(LIBFLAME_A)
  ifeq ($(OS_NAME),Darwin)
 -	@$(LINKER) $(SOFLAGS) -o $@ -Wl,-force_load,$(LIBFLAME_A) $(LDFLAGS)
-+	@$(LINKER) $(SOFLAGS) -o $@ -Wl,-force_load,$(LIBFLAME_A) -Wl,-rpath,$(LIBFLAME_A_PATH) $(LDFLAGS)
++	@$(LINKER) $(SOFLAGS) -o $@ -Wl,-rpath,$(LIBFLAME_A_PATH) -Wl,-force_load,$(LIBFLAME_A) -Wl,-all_load $(LDFLAGS)
  else
  	@$(LINKER) $(SOFLAGS) -o $@ -Wl,--whole-archive $(LIBFLAME_A) -Wl,--no-whole-archive $(LDFLAGS)
  endif