summaryrefslogtreecommitdiff
path: root/user/mozjs/1002_drop_build_id.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-05-07 19:07:39 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-05-07 19:07:39 +0000
commit59aa5ebb76efd757f107e61bb4cceb0a167c727e (patch)
tree2938d3db37170cccba266cf0ae899f479bbb99ad /user/mozjs/1002_drop_build_id.patch
parentbbcfbb2837243b567861c0f37961bec1cb3cb17e (diff)
downloadpackages-59aa5ebb76efd757f107e61bb4cceb0a167c727e.tar.gz
packages-59aa5ebb76efd757f107e61bb4cceb0a167c727e.tar.bz2
packages-59aa5ebb76efd757f107e61bb4cceb0a167c727e.tar.xz
packages-59aa5ebb76efd757f107e61bb4cceb0a167c727e.zip
user/mozjs: bump to 60.5.2
Diffstat (limited to 'user/mozjs/1002_drop_build_id.patch')
-rw-r--r--user/mozjs/1002_drop_build_id.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/user/mozjs/1002_drop_build_id.patch b/user/mozjs/1002_drop_build_id.patch
new file mode 100644
index 000000000..9f62abaea
--- /dev/null
+++ b/user/mozjs/1002_drop_build_id.patch
@@ -0,0 +1,33 @@
+From: Jory A. Pratt <anarchy@gentoo.org>
+
+We must drop build id as it causes conflicts when merging
+thunderbird/firefox/seamonkey on same system when using
+splitdebug
+
+diff --git a/js/src/old-configure.in b/js/src/old-configure.in
+--- a/js/src/old-configure.in
++++ b/js/src/old-configure.in
+@@ -478,23 +478,16 @@ if test "$GNU_CC"; then
+
+ AC_MSG_CHECKING([for -z relro option to ld])
+ _SAVE_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
+ AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+ AC_MSG_RESULT([no])
+ LDFLAGS=$_SAVE_LDFLAGS)
+
+- AC_MSG_CHECKING([for --build-id option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+-
+ _DEFINES_CFLAGS="-include $jsconfdefs -DMOZILLA_CLIENT"
+ _USE_CPP_INCLUDE_FLAG=1
+ fi
+
+ if test "$GNU_CXX"; then
+ _DEFINES_CXXFLAGS="-DMOZILLA_CLIENT -include $jsconfdefs"
+ _USE_CPP_INCLUDE_FLAG=1
+ fi