| 1 |
commit: 358fa544c31daa667725a389bced6d6c8a536fe1 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 3 10:11:24 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 3 10:23:59 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358fa544 |
| 7 |
|
| 8 |
xfce-base/exo: Backport parallel make fix |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/725882 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
xfce-base/exo/exo-4.15.1.ebuild | 4 ++ |
| 14 |
xfce-base/exo/files/exo-4.15.1-parallel-make.patch | 66 ++++++++++++++++++++++ |
| 15 |
2 files changed, 70 insertions(+) |
| 16 |
|
| 17 |
diff --git a/xfce-base/exo/exo-4.15.1.ebuild b/xfce-base/exo/exo-4.15.1.ebuild |
| 18 |
index 5089b190c4c..1f9eb2e523e 100644 |
| 19 |
--- a/xfce-base/exo/exo-4.15.1.ebuild |
| 20 |
+++ b/xfce-base/exo/exo-4.15.1.ebuild |
| 21 |
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND} |
| 22 |
sys-devel/gettext |
| 23 |
virtual/pkgconfig" |
| 24 |
|
| 25 |
+PATCHES=( |
| 26 |
+ "${FILESDIR}"/exo-4.15.1-parallel-make.patch |
| 27 |
+) |
| 28 |
+ |
| 29 |
src_install() { |
| 30 |
default |
| 31 |
find "${D}" -name '*.la' -delete || die |
| 32 |
|
| 33 |
diff --git a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch |
| 34 |
new file mode 100644 |
| 35 |
index 00000000000..f18159442fe |
| 36 |
--- /dev/null |
| 37 |
+++ b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch |
| 38 |
@@ -0,0 +1,66 @@ |
| 39 |
+From d3f3232eb53a052711029d2fafc36e23da971b35 Mon Sep 17 00:00:00 2001 |
| 40 |
+From: Romain Bouvier <skunnyk@××××××××.org> |
| 41 |
+Date: Fri, 29 May 2020 11:11:41 +0200 |
| 42 |
+Subject: [PATCH] exo-29: Fix race condition in make install |
| 43 |
+ |
| 44 |
+- Since the exo drop of gtk2, HEADERS are declared twice, which can lead |
| 45 |
+ to race conditions when using parallel make "make -j4 install" |
| 46 |
+- Simplify Makefile to only have one HEADERS section |
| 47 |
+- This fix #29 |
| 48 |
+--- |
| 49 |
+ exo/Makefile.am | 24 ++++-------------------- |
| 50 |
+ 1 file changed, 4 insertions(+), 20 deletions(-) |
| 51 |
+ |
| 52 |
+diff --git a/exo/Makefile.am b/exo/Makefile.am |
| 53 |
+index fc8845d4..358ae9cb 100644 |
| 54 |
+--- a/exo/Makefile.am |
| 55 |
++++ b/exo/Makefile.am |
| 56 |
+@@ -23,30 +23,14 @@ libexo_headers = \ |
| 57 |
+ exo-tree-view.h \ |
| 58 |
+ exo-utils.h |
| 59 |
+ |
| 60 |
+-libexo_built_public_sources = \ |
| 61 |
+- exo-enum-types.h |
| 62 |
+- |
| 63 |
+-libexo_built_sources = \ |
| 64 |
+- $(libexo_built_public_sources) \ |
| 65 |
++libexo_2_built_sources = \ |
| 66 |
++ exo-enum-types.h \ |
| 67 |
+ exo-alias.h \ |
| 68 |
+ exo-aliasdef.c \ |
| 69 |
+ exo-enum-types.c \ |
| 70 |
+ exo-marshal.c \ |
| 71 |
+ exo-marshal.h |
| 72 |
+ |
| 73 |
+-libexoincludedir = $(includedir)/exo-2/exo |
| 74 |
+- |
| 75 |
+-libexoinclude_HEADERS = \ |
| 76 |
+- $(libexo_built_public_sources) \ |
| 77 |
+- $(libexo_headers) \ |
| 78 |
+- exo.h \ |
| 79 |
+- exo-config.h |
| 80 |
+- |
| 81 |
+- |
| 82 |
+-## |
| 83 |
+-## GTK+ 3 support library |
| 84 |
+-## |
| 85 |
+- |
| 86 |
+ libexo_2_includedir = $(includedir)/exo-2/exo |
| 87 |
+ |
| 88 |
+ lib_LTLIBRARIES = libexo-2.la |
| 89 |
+@@ -141,10 +125,10 @@ CLEANFILES = \ |
| 90 |
+ DISTCLEANFILES = \ |
| 91 |
+ stamp-exo-enum-types.h \ |
| 92 |
+ stamp-exo-marshal.h \ |
| 93 |
+- $(libexo_built_sources) |
| 94 |
++ $(libexo_2_built_sources) |
| 95 |
+ |
| 96 |
+ BUILT_SOURCES = \ |
| 97 |
+- $(libexo_built_sources) |
| 98 |
++ $(libexo_2_built_sources) |
| 99 |
+ |
| 100 |
+ exo-alias.h: make-exo-alias.pl exo.symbols |
| 101 |
+ $(AM_V_GEN) $(PERL) $(srcdir)/make-exo-alias.pl < $(srcdir)/exo.symbols > exo-alias.h |
| 102 |
+-- |
| 103 |
+2.26.2 |
| 104 |
+ |
Archives