31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
|
Source: Arch Linux
|
||
|
|
Upstream: Unknown
|
||
|
|
Reason: fixes linking against libmozjs-60
|
||
|
|
|
||
|
|
diff --git i/js/src/build/Makefile.in w/js/src/build/Makefile.in
|
||
|
|
index ee19104e0ef5..a0f06fd35a18 100644
|
||
|
|
--- i/js/src/build/Makefile.in
|
||
|
|
+++ w/js/src/build/Makefile.in
|
||
|
|
@@ -89,6 +89,8 @@ ifneq (,$(REAL_LIBRARY))
|
||
|
|
endif
|
||
|
|
ifneq (,$(SHARED_LIBRARY))
|
||
|
|
$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
|
||
|
|
+ mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
|
||
|
|
+ ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
|
||
|
|
ifeq ($(OS_ARCH),Darwin)
|
||
|
|
install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
|
||
|
|
endif
|
||
|
|
diff --git i/js/src/build/moz.build w/js/src/build/moz.build
|
||
|
|
index a7f5fa4ce8eb..726687c13fb0 100644
|
||
|
|
--- i/js/src/build/moz.build
|
||
|
|
+++ w/js/src/build/moz.build
|
||
|
|
@@ -23,6 +23,7 @@ if not CONFIG['JS_STANDALONE']:
|
||
|
|
if CONFIG['JS_SHARED_LIBRARY']:
|
||
|
|
GeckoSharedLibrary('js', linkage=None)
|
||
|
|
SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
|
||
|
|
+ LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
|
||
|
|
else:
|
||
|
|
Library('js')
|
||
|
|
|
||
|
|
|