From e83142a23a54c2715a970b6771a716a01c70b841 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 19 Feb 2022 22:57:34 +0100 Subject: Fix linking for Mac OS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 1 + mk/linux.mk | 2 ++ mk/macos.mk | 4 +++- mk/windows.mk | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 94909b2..5b439de 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,7 @@ install: libblake.a libblake.$(LIBEXT) mkdir -p -- "$(DESTDIR)$(PREFIX)/include" cp -- libblake.a "$(DESTDIR)$(PREFIX)/lib/" cp -- libblake.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libblake.$(LIBMINOREXT)" + $(FIX_INSTALL_NAME) "$(DESTDIR)$(PREFIX)/lib/libblake.$(LIBMINOREXT)" ln -sf -- libblake.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libblake.$(LIBMAJOREXT)" ln -sf -- libblake.$(LIBMAJOREXT) "$(DESTDIR)$(PREFIX)/lib/libblake.$(LIBEXT)" cp -- libblake.h "$(DESTDIR)$(PREFIX)/include/" diff --git a/mk/linux.mk b/mk/linux.mk index d016d31..ad58f69 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -2,3 +2,5 @@ LIBEXT = so LIBFLAGS = -shared -Wl,-soname,lib$(LIB_NAME).$(LIBEXT).$(LIB_MAJOR) LIBMAJOREXT = $(LIBEXT).$(LIB_MAJOR) LIBMINOREXT = $(LIBEXT).$(LIB_VERSION) + +FIX_INSTALL_NAME = : diff --git a/mk/macos.mk b/mk/macos.mk index bd92de6..22c2845 100644 --- a/mk/macos.mk +++ b/mk/macos.mk @@ -1,4 +1,6 @@ LIBEXT = dylib -LIBFLAGS = -dynamiclib +LIBFLAGS = -dynamiclib -Wl,-compatibility_version,$(LIB_MAJOR) -Wl,-current_version,$(LIB_VERSION) LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT) LIBMINOREXT = $(LIB_VERSION).$(LIBEXT) + +FIX_INSTALL_NAME = install_name_tool -id "$(PREFIX)/lib/libblake.$(LIBMAJOREXT)" diff --git a/mk/windows.mk b/mk/windows.mk index ae6fc0b..ed5ec8d 100644 --- a/mk/windows.mk +++ b/mk/windows.mk @@ -2,3 +2,5 @@ LIBEXT = dll LIBFLAGS = -shared LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT) LIBMINOREXT = $(LIB_VERSION).$(LIBEXT) + +FIX_INSTALL_NAME = : -- cgit v1.2.3-70-g09d2