| 1 |
commit: f570cd6e3ccfa1b9afae0c875a367a55b75f8f1d |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 10 18:40:17 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 10 18:40:52 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f570cd6e |
| 7 |
|
| 8 |
sys-devel/gettext: Fixed parallel install issue |
| 9 |
|
| 10 |
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 11 |
Closes: https://bugs.gentoo.org/685530 |
| 12 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/gettext-0.20-avoid_eautomake.patch | 22 +++++++++++++ |
| 16 |
.../files/gettext-0.20-parallel_install.patch | 37 ++++++++++++++++++++++ |
| 17 |
sys-devel/gettext/gettext-0.20.ebuild | 2 ++ |
| 18 |
3 files changed, 61 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..16592c8018e |
| 23 |
--- /dev/null |
| 24 |
+++ b/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch |
| 25 |
@@ -0,0 +1,22 @@ |
| 26 |
+--- gettext-0.20/gettext-tools/src/Makefile.in |
| 27 |
++++ gettext-0.20/gettext-tools/src/Makefile.in |
| 28 |
+@@ -3952,9 +3952,16 @@ |
| 29 |
+ |
| 30 |
+ # How to get the include files of libtextstyle. |
| 31 |
+ textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: |
| 32 |
+- here=`pwd`; \ |
| 33 |
+- cd ../../libtextstyle/lib && \ |
| 34 |
+- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here" |
| 35 |
++ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@ |
| 36 |
++ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \ |
| 37 |
++ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \ |
| 38 |
++ else \ |
| 39 |
++ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \ |
| 40 |
++ fi; \ |
| 41 |
++ target_dir="$(abs_builddir)/$@"; \ |
| 42 |
++ target_dir="$${target_dir%/*}"; \ |
| 43 |
++ $(MKDIR_P) "$${target_dir}"; \ |
| 44 |
++ $(INSTALL_HEADER) "$$file" $@ |
| 45 |
+ |
| 46 |
+ # No need to install libgettextsrc.a, except on AIX. |
| 47 |
+ install-exec-hook: install-exec-clean |
| 48 |
|
| 49 |
diff --git a/sys-devel/gettext/files/gettext-0.20-parallel_install.patch b/sys-devel/gettext/files/gettext-0.20-parallel_install.patch |
| 50 |
new file mode 100644 |
| 51 |
index 00000000000..e47beaf9443 |
| 52 |
--- /dev/null |
| 53 |
+++ b/sys-devel/gettext/files/gettext-0.20-parallel_install.patch |
| 54 |
@@ -0,0 +1,37 @@ |
| 55 |
+From 829660df1583c6c3ee1d90291dd910f08e3b777e Mon Sep 17 00:00:00 2001 |
| 56 |
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org> |
| 57 |
+Date: Fri, 10 May 2019 20:08:25 +0200 |
| 58 |
+Subject: [PATCH] Fix parallel install issue |
| 59 |
+ |
| 60 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 61 |
+--- |
| 62 |
+ gettext-tools/src/Makefile.am | 13 ++++++++++--- |
| 63 |
+ 1 file changed, 10 insertions(+), 3 deletions(-) |
| 64 |
+ |
| 65 |
+diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am |
| 66 |
+index 09a3c153d..1ee49cdca 100644 |
| 67 |
+--- a/gettext-tools/src/Makefile.am |
| 68 |
++++ b/gettext-tools/src/Makefile.am |
| 69 |
+@@ -252,9 +252,16 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD) |
| 70 |
+ |
| 71 |
+ # How to get the include files of libtextstyle. |
| 72 |
+ textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: |
| 73 |
+- here=`pwd`; \ |
| 74 |
+- cd ../../libtextstyle/lib && \ |
| 75 |
+- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here" |
| 76 |
++ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@ |
| 77 |
++ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \ |
| 78 |
++ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \ |
| 79 |
++ else \ |
| 80 |
++ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \ |
| 81 |
++ fi; \ |
| 82 |
++ target_dir="$(abs_builddir)/$@"; \ |
| 83 |
++ target_dir="$${target_dir%/*}"; \ |
| 84 |
++ $(MKDIR_P) "$${target_dir}"; \ |
| 85 |
++ $(INSTALL_HEADER) "$$file" $@ |
| 86 |
+ BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h |
| 87 |
+ MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h |
| 88 |
+ |
| 89 |
+-- |
| 90 |
+2.21.0 |
| 91 |
+ |
| 92 |
|
| 93 |
diff --git a/sys-devel/gettext/gettext-0.20.ebuild b/sys-devel/gettext/gettext-0.20.ebuild |
| 94 |
index e4877a91a2a..8f4c83d5321 100644 |
| 95 |
--- a/sys-devel/gettext/gettext-0.20.ebuild |
| 96 |
+++ b/sys-devel/gettext/gettext-0.20.ebuild |
| 97 |
@@ -51,6 +51,8 @@ MULTILIB_WRAPPED_HEADERS=( |
| 98 |
|
| 99 |
PATCHES=( |
| 100 |
"${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 |
| 101 |
+ "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530 |
| 102 |
+ "${FILESDIR}"/${PN}-0.20-avoid_eautomake.patch |
| 103 |
) |
| 104 |
|
| 105 |
pkg_setup() { |
Archives