| 1 |
commit: ac656fb80987a2a35def9ef131371ccddb5d1fb0 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 21:46:03 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 21:47:02 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac656fb8 |
| 7 |
|
| 8 |
app-office/libreoffice: use emake, not make |
| 9 |
|
| 10 |
If the rationale (and that's a big if) for using make |
| 11 |
and not emake was parallelism, we should be using -j1, |
| 12 |
not 'make' which won't respect ${MAKE} or other ${MAKEOPTS}. |
| 13 |
|
| 14 |
While at it, clean up a stale/misplaced comment in |
| 15 |
src_install too (makes no sense where it is, |
| 16 |
presumably 'make' was previously used in src_install |
| 17 |
or -j1 was forced in the past). |
| 18 |
|
| 19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 20 |
|
| 21 |
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 5 ++--- |
| 22 |
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 5 ++--- |
| 23 |
app-office/libreoffice/libreoffice-9999.ebuild | 5 ++--- |
| 24 |
3 files changed, 6 insertions(+), 9 deletions(-) |
| 25 |
|
| 26 |
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 27 |
index d45c3048f25c..07c41dd1473e 100644 |
| 28 |
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 29 |
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 30 |
@@ -585,12 +585,11 @@ src_compile() { |
| 31 |
} |
| 32 |
|
| 33 |
src_test() { |
| 34 |
- make unitcheck || die |
| 35 |
- make slowcheck || die |
| 36 |
+ emake unitcheck |
| 37 |
+ emake slowcheck |
| 38 |
} |
| 39 |
|
| 40 |
src_install() { |
| 41 |
- # This is not Makefile so no buildserver |
| 42 |
emake DESTDIR="${D}" distro-pack-install -o build -o check |
| 43 |
|
| 44 |
# bug 593514 |
| 45 |
|
| 46 |
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 47 |
index 4969bd6b6a3e..69651435d7d7 100644 |
| 48 |
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 49 |
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 50 |
@@ -585,12 +585,11 @@ src_compile() { |
| 51 |
} |
| 52 |
|
| 53 |
src_test() { |
| 54 |
- make unitcheck || die |
| 55 |
- make slowcheck || die |
| 56 |
+ emake unitcheck |
| 57 |
+ emake slowcheck |
| 58 |
} |
| 59 |
|
| 60 |
src_install() { |
| 61 |
- # This is not Makefile so no buildserver |
| 62 |
emake DESTDIR="${D}" distro-pack-install -o build -o check |
| 63 |
|
| 64 |
# bug 593514 |
| 65 |
|
| 66 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 67 |
index f791cbf01383..f7ff3494a447 100644 |
| 68 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 69 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 70 |
@@ -582,12 +582,11 @@ src_compile() { |
| 71 |
} |
| 72 |
|
| 73 |
src_test() { |
| 74 |
- make unitcheck || die |
| 75 |
- make slowcheck || die |
| 76 |
+ emake unitcheck |
| 77 |
+ emake slowcheck |
| 78 |
} |
| 79 |
|
| 80 |
src_install() { |
| 81 |
- # This is not Makefile so no buildserver |
| 82 |
emake DESTDIR="${D}" distro-pack-install -o build -o check |
| 83 |
|
| 84 |
# bug 593514 |
Archives