diff options
Diffstat (limited to 'meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-soname-to-appropriate-libraries.patch')
| -rw-r--r-- | meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-soname-to-appropriate-libraries.patch | 168 |
1 files changed, 0 insertions, 168 deletions
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-soname-to-appropriate-libraries.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-soname-to-appropriate-libraries.patch deleted file mode 100644 index 430585e0..00000000 --- a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-soname-to-appropriate-libraries.patch +++ /dev/null @@ -1,168 +0,0 @@ -From: Mike Hommey <glandium@debian.org> -Date: Thu, 13 Mar 2008 08:22:05 +0100 -Subject: Add soname to appropriate libraries. - -This is a stripped down version, compared to the dpatch version, because we -actually are never going to use minor and micro version numbers. Also, we -now don't set a SO version on libxul and libxpcom because they will now -be dlloaded() by the standalone xpcomglue. ---- - config/makefiles/target_libs.mk | 4 +++- - config/rules.mk | 16 +++++++++++++++- - js/src/Makefile.in | 4 ++++ - js/src/config/makefiles/target_libs.mk | 4 +++- - js/src/config/rules.mk | 16 +++++++++++++++- - 5 files changed, 40 insertions(+), 4 deletions(-) - -diff --git a/config/makefiles/target_libs.mk b/config/makefiles/target_libs.mk -index 707fdd1..254e2d3 100644 ---- a/config/makefiles/target_libs.mk -+++ b/config/makefiles/target_libs.mk -@@ -80,7 +80,7 @@ GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib)) - endif - endif # EXPORT_LIBRARY - --libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY) -+libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(UNVERSIONED_LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY) - ifndef NO_DIST_INSTALL - ifdef LIBRARY - ifdef EXPORT_LIBRARY # Stage libs that will be linked into a static build -@@ -109,8 +109,10 @@ ifndef NO_INSTALL_IMPORT_LIBRARY - endif - else - $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib -+ $(call MKSHLINKS,$(DIST)/lib) - endif - $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET) -+ $(call MKSHLINKS,$(FINAL_TARGET)) - endif # IS_COMPONENT - endif # SHARED_LIBRARY - ifdef PROGRAM -diff --git a/config/rules.mk b/config/rules.mk -index d1b969b..c64b4d5 100644 ---- a/config/rules.mk -+++ b/config/rules.mk -@@ -290,6 +290,18 @@ else - SHARED_LIBRARY := $(DLL_PREFIX)$(SHARED_LIBRARY_NAME)$(DLL_SUFFIX) - endif - -+ifdef SO_VERSION -+UNVERSIONED_LIBRARY := $(notdir $(SHARED_LIBRARY)) -+ -+ifeq ($(strip $(SHARED_LIBRARY)),$(strip $(SDK_LIBRARY))) -+SDK_LIBRARY := $(SHARED_LIBRARY) -+endif -+ -+SHARED_LIBRARY := $(SHARED_LIBRARY).$(SO_VERSION) -+ -+MKSHLINKS = rm -f $(1)/$(UNVERSIONED_LIBRARY); ln -s $(SHARED_LIBRARY) $(1)/$(UNVERSIONED_LIBRARY) -+endif -+ - ifeq ($(OS_ARCH),OS2) - DEF_FILE := $(SHARED_LIBRARY:.dll=.def) - endif -@@ -380,7 +392,7 @@ SIMPLE_PROGRAMS := - endif - - ifndef TARGETS --TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY) -+TARGETS = $(LIBRARY) $(UNVERSIONED_LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY) - endif - - ifndef OBJS -@@ -1059,6 +1071,8 @@ endif - # so instead of deleting .o files after repacking them into a dylib, we make - # symlinks back to the originals. The symlinks are a no-op for stabs debugging, - # so no need to conditionalize on OS version or debugging format. -+$(UNVERSIONED_LIBRARY): $(SHARED_LIBRARY) -+ $(call MKSHLINKS,.) - - $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) - ifndef INCREMENTAL_LINKER -diff --git a/js/src/Makefile.in b/js/src/Makefile.in -index fc48cbd..1200ae6 100644 ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -74,6 +74,7 @@ MODULE = js - LIBRARY_NAME = mozjs - STATIC_LIBRARY_NAME = js_static - GRE_MODULE = 1 -+SO_VERSION = $(JS_SO_VERSION) - - LIBS = $(NSPR_LIBS) - -@@ -922,6 +923,9 @@ ifneq (,$(LIBRARY)) - endif - ifneq (,$(SHARED_LIBRARY)) - $(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir) -+ifneq (,$(UNVERSIONED_LIBRARY)) -+ ln -s $(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(UNVERSIONED_LIBRARY) -+endif - endif - ifneq (,$(IMPORT_LIBRARY)) - $(SYSINSTALL) $(IMPORT_LIBRARY) $(DESTDIR)$(libdir) -diff --git a/js/src/config/makefiles/target_libs.mk b/js/src/config/makefiles/target_libs.mk -index 707fdd1..254e2d3 100644 ---- a/js/src/config/makefiles/target_libs.mk -+++ b/js/src/config/makefiles/target_libs.mk -@@ -80,7 +80,7 @@ GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib)) - endif - endif # EXPORT_LIBRARY - --libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY) -+libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(UNVERSIONED_LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY) - ifndef NO_DIST_INSTALL - ifdef LIBRARY - ifdef EXPORT_LIBRARY # Stage libs that will be linked into a static build -@@ -109,8 +109,10 @@ ifndef NO_INSTALL_IMPORT_LIBRARY - endif - else - $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib -+ $(call MKSHLINKS,$(DIST)/lib) - endif - $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET) -+ $(call MKSHLINKS,$(FINAL_TARGET)) - endif # IS_COMPONENT - endif # SHARED_LIBRARY - ifdef PROGRAM -diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk -index d1b969b..c64b4d5 100644 ---- a/js/src/config/rules.mk -+++ b/js/src/config/rules.mk -@@ -290,6 +290,18 @@ else - SHARED_LIBRARY := $(DLL_PREFIX)$(SHARED_LIBRARY_NAME)$(DLL_SUFFIX) - endif - -+ifdef SO_VERSION -+UNVERSIONED_LIBRARY := $(notdir $(SHARED_LIBRARY)) -+ -+ifeq ($(strip $(SHARED_LIBRARY)),$(strip $(SDK_LIBRARY))) -+SDK_LIBRARY := $(SHARED_LIBRARY) -+endif -+ -+SHARED_LIBRARY := $(SHARED_LIBRARY).$(SO_VERSION) -+ -+MKSHLINKS = rm -f $(1)/$(UNVERSIONED_LIBRARY); ln -s $(SHARED_LIBRARY) $(1)/$(UNVERSIONED_LIBRARY) -+endif -+ - ifeq ($(OS_ARCH),OS2) - DEF_FILE := $(SHARED_LIBRARY:.dll=.def) - endif -@@ -380,7 +392,7 @@ SIMPLE_PROGRAMS := - endif - - ifndef TARGETS --TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY) -+TARGETS = $(LIBRARY) $(UNVERSIONED_LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY) - endif - - ifndef OBJS -@@ -1059,6 +1071,8 @@ endif - # so instead of deleting .o files after repacking them into a dylib, we make - # symlinks back to the originals. The symlinks are a no-op for stabs debugging, - # so no need to conditionalize on OS version or debugging format. -+$(UNVERSIONED_LIBRARY): $(SHARED_LIBRARY) -+ $(call MKSHLINKS,.) - - $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) - ifndef INCREMENTAL_LINKER |