Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
823ad6b0
Kaydet (Commit)
823ad6b0
authored
Eyl 17, 2013
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
gbuild: remove SOVERSION variable since it is hardcoded anyway
Change-Id: I625291ea86c1c3caf7fa5400e380defa6d0d0bc8
üst
6c5b494e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
13 deletions
+8
-13
Library.mk
solenv/gbuild/Library.mk
+0
-2
LinkTarget.mk
solenv/gbuild/LinkTarget.mk
+1
-4
macosx.mk
solenv/gbuild/platform/macosx.mk
+1
-1
solaris.mk
solenv/gbuild/platform/solaris.mk
+3
-3
unxgcc.mk
solenv/gbuild/platform/unxgcc.mk
+3
-3
No files found.
solenv/gbuild/Library.mk
Dosyayı görüntüle @
823ad6b0
...
...
@@ -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
...
...
solenv/gbuild/LinkTarget.mk
Dosyayı görüntüle @
823ad6b0
...
...
@@ -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 $(SOVERSION
SCRIPT
),&& 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
...
...
solenv/gbuild/platform/macosx.mk
Dosyayı görüntüle @
823ad6b0
...
...
@@ -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 $(SOVERSION
SCRIPT
),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)),\
...
...
solenv/gbuild/platform/solaris.mk
Dosyayı görüntüle @
823ad6b0
...
...
@@ -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 $(SOVERSION
SCRIPT),-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 $(SOVERSION
SCRIPT
),&& 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) \
...
...
solenv/gbuild/platform/unxgcc.mk
Dosyayı görüntüle @
823ad6b0
...
...
@@ -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 $(SOVERSION
SCRIPT),-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 $(SOVERSION
SCRIPT
),&& 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) \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment