diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-17 22:24:10 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:29 +0200 |
| commit | d343c57f982af1b2a9a37362e82e7369b6edf948 (patch) | |
| tree | 605acc30b2923a5ad609f82791f4bf4500a739bc /solenv/gbuild/LinkTarget.mk | |
| parent | d263c22a0924ece4663c023618bba93fcb7300c3 (diff) | |
gbuild: make the versioned library the linktarget on Unixes
If there is a SOVERSION then the versioned library is a real file and
the unversioned one just a symlink; better to have the real file be the
target.
- add gb_Library_UDK_MAJORVER variable for SOVERSION
- remove version parameter of gb_Library_set_soversion_script;
instead hardcode the SOVERSION since it must be included in the
file name in gb_Library_FILENAMES anyway
- store the unversioned symlink in the ILIBTARGET variable
- via new gb_Library_get_workdir_target_versionlink function
- removed gb_Helper_install call that resulted in both versioned
and unversioned libs in instdir
Change-Id: I2c6f1698f0e39fdb2c07964d43ed9485cbca0b30
Diffstat (limited to 'solenv/gbuild/LinkTarget.mk')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index a162b7367f8e..d0ddb74ccdc7 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 > $(1).$(SOVERSION))),\ + $(if $(SOVERSION),&& echo invalid > $(basename $(1)))),\ $(call gb_LinkTarget__command,$(1),$(2))) $(call gb_LinkTarget__command_objectlist,$(WORKDIR)/LinkTarget/$(2).objectlist) endef @@ -615,12 +615,11 @@ gb_LinkTarget_CXX_SUFFIX_$(call gb_LinkTarget__get_workdir_linktargetname,$(1)) endef -# call gb_LinkTarget_set_soversion_script,linktarget,soversion,soversionscript +# call gb_LinkTarget_set_soversion_script,linktarget,soversionscript define gb_LinkTarget_set_soversion_script -$(call gb_LinkTarget_get_target,$(1)) : $(3) -$(call gb_LinkTarget_get_target,$(1)) : SOVERSION := $(2) -$(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT := $(3) -$(call gb_LinkTarget_get_target,$(1)).$(2) : $(call gb_LinkTarget_get_target,$(1)) +$(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 |