From 15596298bc4c41c719472e6683d03751e04c3bc2 Mon Sep 17 00:00:00 2001 From: Mirko Viviani Date: Thu, 10 May 2001 20:07:23 +0000 Subject: [PATCH] * target.make (SHARED_FRAMEWORK_LINK_CMD): fix framework soname for FreeBSD ELF. * framework.make (internal-framework-install): handle symlink for libxxx.so.n files. (patches by Kim Shrier ) git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@9918 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ framework.make | 10 ++++++++-- target.make | 7 ++++--- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f75f464..476ec701 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-05-10 Mirko Viviani + + * target.make (SHARED_FRAMEWORK_LINK_CMD): fix framework soname for + FreeBSD ELF. + * framework.make (internal-framework-install): handle symlink for + libxxx.so.n files. (patches by Kim Shrier ) + 2001-05-08 Adam Fedor * bundle.make ($(BUNDLE_DIR_NAME)/Contents/Resources): Remove diff --git a/framework.make b/framework.make index 0a0974e6..0f4fbb30 100644 --- a/framework.make +++ b/framework.make @@ -102,8 +102,8 @@ FRAMEWORK_CURRENT_LIBRARY_DIR_NAME := $(FRAMEWORK_CURRENT_DIR_NAME)/$(GNUSTEP_TA FRAMEWORK_LIBRARY_FILE = lib$(INTERNAL_framework_NAME)$(SHARED_LIBEXT) FRAMEWORK_LIBRARY_FILE_EXT = $(SHARED_LIBEXT) VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(VERSION) -SOVERSION = `echo $(VERSION)|awk -F. '{print $$1}'` -SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(SOVERSION) +SOVERSION = $(word 1,$(subst ., ,$(VERSION))) +SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(SOVERSION) FRAMEWORK_FILE := $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) @@ -430,10 +430,16 @@ internal-framework-install:: $(FRAMEWORK_INSTALL_DIR) $(GNUSTEP_FRAMEWORKS_LIBRA if test -f "$(FRAMEWORK_LIBRARY_FILE)"; then \ rm -f $(FRAMEWORK_LIBRARY_FILE); \ fi; \ + if test -f "$(SONAME_FRAMEWORK_FILE)"; then \ + rm -f $(SONAME_FRAMEWORK_FILE); \ + fi; \ if test -f "$(VERSION_FRAMEWORK_LIBRARY_FILE)"; then \ rm -f $(VERSION_FRAMEWORK_LIBRARY_FILE); \ fi; \ $(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE); \ + if test -f "$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)"; then \ + $(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE) $(SONAME_FRAMEWORK_FILE); \ + fi; \ $(LN_S) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) $(VERSION_FRAMEWORK_LIBRARY_FILE);) $(FRAMEWORK_DIR_NAME)/Resources $(FRAMEWORK_INSTALL_DIR):: diff --git a/target.make b/target.make index 03ab6167..4fb80c42 100644 --- a/target.make +++ b/target.make @@ -561,14 +561,15 @@ SHARED_LIB_LINK_CMD = \ $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE)) SHARED_FRAMEWORK_LINK_CMD = \ - $(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \ + $(CC) -shared -Wl,-soname,$(SONAME_FRAMEWORK_FILE) \ -o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \ $^ $(ALL_FRAMEWORK_DIRS) \ $(LIBRARIES_DEPEND_UPON) \ $(SHARED_LD_POSTFLAGS);\ (cd $(FRAMEWORK_LIBRARY_DIR_NAME); \ - rm -f $(FRAMEWORK_LIBRARY_FILE); \ - $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE)) + rm -f $(FRAMEWORK_LIBRARY_FILE) $(SONAME_FRAMEWORK_FILE); \ + $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(SONAME_FRAMEWORK_FILE); \ + $(LN_S) $(SONAME_FRAMEWORK_FILE) $(FRAMEWORK_LIBRARY_FILE)) AFTER_INSTALL_SHARED_LIB_COMMAND = \ (cd $(LIBRARY_INSTALL_DIR); \ rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \