From 617c06e82ed28f5c1c3c27373a07dae38e539d3c Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Mon, 1 Nov 2021 15:52:20 +0100 Subject: [PATCH] Ports: Patch Makefile to use normal soname flags on Mac Remove if statement altogether, as suggested by timschumi. --- Ports/zstd/patches/fix_soname_flags.patch | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Ports/zstd/patches/fix_soname_flags.patch diff --git a/Ports/zstd/patches/fix_soname_flags.patch b/Ports/zstd/patches/fix_soname_flags.patch new file mode 100644 index 00000000000..1839f3ef0bf --- /dev/null +++ b/Ports/zstd/patches/fix_soname_flags.patch @@ -0,0 +1,24 @@ +--- zstd-1.5.0/lib/Makefile.orig 2021-05-14 16:59:34.000000000 +0200 ++++ zstd-1.5.0/lib/Makefile 2021-11-01 16:24:07.000000000 +0100 +@@ -206,17 +206,10 @@ + + # macOS linker doesn't support -soname, and use different extension + # see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html +-ifeq ($(UNAME), Darwin) +- SHARED_EXT = dylib +- SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT) +- SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT) +- SONAME_FLAGS = -install_name $(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER) +-else +- SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR) +- SHARED_EXT = so +- SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR) +- SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) +-endif ++SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR) ++SHARED_EXT = so ++SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR) ++SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) + + SET_CACHE_DIRECTORY = \ + +$(MAKE) --no-print-directory $@ \