summaryrefslogtreecommitdiff
path: root/firefox/0001-Don-t-use-build-id.patch
diff options
context:
space:
mode:
Diffstat (limited to 'firefox/0001-Don-t-use-build-id.patch')
-rw-r--r--firefox/0001-Don-t-use-build-id.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/firefox/0001-Don-t-use-build-id.patch b/firefox/0001-Don-t-use-build-id.patch
new file mode 100644
index 000000000..27c2fc399
--- /dev/null
+++ b/firefox/0001-Don-t-use-build-id.patch
@@ -0,0 +1,54 @@
+From db2794973f8a5e580fbceacbfb1b6469c9f162d7 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Mon, 6 Apr 2020 19:14:26 +0200
+Subject: [PATCH 01/30] Don't use build id
+
+We must drop build id as it causes conflicts when merging
+thunderbird/firefox/seamonkey on same system when using
+splitdebug.
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ js/src/old-configure.in | 7 -------
+ old-configure.in | 7 -------
+ 2 files changed, 14 deletions(-)
+
+diff --git a/js/src/old-configure.in b/js/src/old-configure.in
+index 905494b784..15a7a2a852 100644
+--- a/js/src/old-configure.in
++++ b/js/src/old-configure.in
+@@ -350,13 +350,6 @@ if test "$GNU_CC"; then
+ AC_MSG_RESULT([no])
+ LDFLAGS=$_SAVE_LDFLAGS)
+
+- AC_MSG_CHECKING([for --build-id=sha1 option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id=sha1"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+-
+ _DEFINES_CFLAGS="-include $jsconfdefs -DMOZILLA_CLIENT"
+ fi
+
+diff --git a/old-configure.in b/old-configure.in
+index d1479574d1..f69f5f5456 100644
+--- a/old-configure.in
++++ b/old-configure.in
+@@ -337,13 +337,6 @@ if test "$GNU_CC"; then
+ AC_MSG_RESULT([no])
+ LDFLAGS=$_SAVE_LDFLAGS)
+
+- AC_MSG_CHECKING([for --build-id=sha1 option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id=sha1"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+-
+ AC_MSG_CHECKING([for --ignore-unresolved-symbol option to ld])
+ HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=
+ _SAVE_LDFLAGS=$LDFLAGS
+--
+2.34.1
+

Generated by cgit