From b4e37acb2b9a25c08b95737ac9e994bfdbb6f4c2 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 18 Sep 2013 00:18:28 +0200 Subject: gbuild: remove SOVERSION variable since it is hardcoded anyway Change-Id: I625291ea86c1c3caf7fa5400e380defa6d0d0bc8 --- solenv/gbuild/Library.mk | 2 -- solenv/gbuild/LinkTarget.mk | 5 +---- solenv/gbuild/platform/macosx.mk | 2 +- solenv/gbuild/platform/solaris.mk | 6 +++--- solenv/gbuild/platform/unxgcc.mk | 6 +++--- 5 files changed, 8 insertions(+), 13 deletions(-) (limited to 'solenv/gbuild') diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 33ee1e0c7e23..fc5a258db24f 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -53,7 +53,6 @@ ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS))) $$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk)) endif -$(call gb_Library_get_target,$(1)) : SOVERSION := $(if $(gb_Package_PRESTAGEDIR),\ $(if $(wildcard $(gb_Package_PRESTAGEDIR)/$(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1))),\ @@ -130,7 +129,6 @@ endef define gb_Library__set_soversion_script $(call gb_LinkTarget_set_soversion_script,$(call gb_Library_get_linktarget,$(1)),$(2)) -$(call gb_Library_get_target,$(1)) : SOVERSION := $(gb_Library_UDK_MAJORVER) $(call gb_Library__add_soversion_link,$(1),$(call gb_Library_get_workdir_target_versionlink,$(1))) endef diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index d0ddb74ccdc7..21b4ab2c5601 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -448,7 +448,7 @@ define gb_LinkTarget__command_impl $(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$(2))),\ $(call gb_LinkTarget__command,$(1),$(2)),\ mkdir -p $(dir $(1)) && echo invalid > $(1) \ - $(if $(SOVERSION),&& echo invalid > $(basename $(1)))),\ + $(if $(SOVERSIONSCRIPT),&& echo invalid > $(basename $(1)))),\ $(call gb_LinkTarget__command,$(1),$(2))) $(call gb_LinkTarget__command_objectlist,$(WORKDIR)/LinkTarget/$(2).objectlist) endef @@ -580,7 +580,6 @@ $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS := $(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_LinkTarget_get_target,$(1)) : VISIBILITY := $(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS := -$(call gb_LinkTarget_get_target,$(1)) : SOVERSION := $(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT := ifeq ($(gb_FULLDEPS),$(true)) @@ -607,7 +606,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME := $(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS := $(call gb_LinkTarget_get_dep_target,$(1)) : VISIBILITY := $(call gb_LinkTarget_get_dep_target,$(1)) : WARNINGS_NOT_ERRORS := -$(call gb_LinkTarget_get_dep_target,$(1)) : SOVERSION := $(call gb_LinkTarget_get_dep_target,$(1)) : SOVERSIONSCRIPT := endif @@ -618,7 +616,6 @@ endef # call gb_LinkTarget_set_soversion_script,linktarget,soversionscript define gb_LinkTarget_set_soversion_script $(call gb_LinkTarget_get_target,$(1)) : $(2) -$(call gb_LinkTarget_get_target,$(1)) : SOVERSION := $(gb_Library_UDK_MAJORVER) $(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT := $(2) endef diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index a0daf19c59f7..c46e2f869dcf 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -153,7 +153,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(LIBS) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ -o $(1) && \ - $(if $(SOVERSION),ln -sf $(notdir $(1)) $(ILIBTARGET),:) && \ + $(if $(SOVERSIONSCRIPT),ln -sf $(notdir $(1)) $(ILIBTARGET),:) && \ $(if $(filter Executable,$(TARGETTYPE)), \ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app $(LAYER) $(1) &&) \ $(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index ce95fe3ae3a8..185f92ea5f5b 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -172,8 +172,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library__get_workdir_linktargetname,$(lib))),$(2)),$(gb_LTOFLAGS)) \ - $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1))) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ + $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \ + -Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT)) \ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ @@ -187,7 +187,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(LIBS) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ -o $(1) \ - $(if $(SOVERSION),&& ln -sf $(notdir $(1)) $(ILIBTARGET)) \ + $(if $(SOVERSIONSCRIPT),&& ln -sf $(notdir $(1)) $(ILIBTARGET)) \ $(if $(filter Library,$(TARGETTYPE)),&& \ readelf -d $(1) | grep SONAME > $(1).exports.tmp ; \ $(NM) --dynamic --extern-only --defined-only --format=posix $(1) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 67f4dd597772..88e70d0e9022 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -174,8 +174,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library__get_workdir_linktargetname,$(lib))),$(2)),$(gb_LTOFLAGS)) \ - $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1))) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ + $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \ + -Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT)) \ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ @@ -189,7 +189,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(LIBS) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ -o $(1) \ - $(if $(SOVERSION),&& ln -sf $(notdir $(1)) $(ILIBTARGET)) \ + $(if $(SOVERSIONSCRIPT),&& ln -sf $(notdir $(1)) $(ILIBTARGET)) \ $(if $(filter Library,$(TARGETTYPE)),&& \ readelf -d $(1) | grep SONAME > $(1).exports.tmp ; \ $(NM) --dynamic --extern-only --defined-only --format=posix $(1) \ -- cgit