diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-26 14:23:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-26 14:27:49 +0100 |
| commit | 482ab0d09620f92eb3618125930dc7c4c8335b5e (patch) | |
| tree | 150ddffadff6a64981341dd95a0d38679fe1d054 /solenv/gbuild/extensions | |
| parent | Remove visual noise from ucbhelper (diff) | |
| download | core-482ab0d09620f92eb3618125930dc7c4c8335b5e.tar.gz core-482ab0d09620f92eb3618125930dc7c4c8335b5e.zip | |
fdo#75526: sdk: install URE library symlinks / import libs again
This is a bit involved because since the LinkTarget now creates the
instdir/sdk/lib/* files itself a Package cannot be used; so convert the
URE libraries to AutoInstall and add special handling for them to
gb_Helper_register_libraries_for_install to create the necessary links
in the "sdk" install-module.
(regression from 70c35265f517ef372cb739d4cc64499abf57a838)
Change-Id: Ia5467f3303d59f7f5f4a88adc22ceffb82a21ff1
Diffstat (limited to 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/post_PackageInfo.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index e4bbd144cc31..2bd677830df6 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -27,6 +27,7 @@ gb_PackageInfo_InstallModules := \ define gb_PackageInfo_emit_binaries_command @touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/$(1).$(suf)) @$(foreach executable,$(gb_Executable_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Executable_get_target,$(executable)))" >> $(gb_PackageInfo_get_target)/$(1).executables &&) true +@$(foreach library,$(gb_SdkLinkLibrary_MODULE_$(1)),echo "sdk/lib/$(call gb_Library_get_linktarget,$(library))" >> $(gb_PackageInfo_get_target)/$(1).sdklinklibraries &&) true @$(foreach library,$(gb_Library_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Library_get_target,$(library)))" >> $(gb_PackageInfo_get_target)/$(1).libraries &&) true @$(foreach jar,$(gb_Jar_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Jar_get_target,$(jar)))" >> $(gb_PackageInfo_get_target)/$(1).jars &&) true @$(foreach pkg,$(gb_Package_MODULE_$(1)),echo "$(call gb_Package_get_target,$(pkg))" >> $(gb_PackageInfo_get_target)/$(1).packages &&) true @@ -100,6 +101,10 @@ install-package-%: $(gb_PackageInfo_get_target)/packageinfo_all do \ install -D $(INSTDIR)/$${executable} $(INSTALLDIR)/$${executable} ;\ done + for library in `cat $(gb_PackageInfo_get_target)/$*.sdklinklibraries`; \ + do \ + install -D -m644 $(INSTDIR)/$${library} $(INSTALLDIR)/$${library}; \ + done for library in `cat $(gb_PackageInfo_get_target)/$*.libraries`; \ do \ install -D -m644 $(INSTDIR)/$${library} $(INSTALLDIR)/$${library}; \ |