1 |
commit: 0192361a29a7d434501dc046c572b4d868744069 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 3 02:20:02 2022 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 3 02:21:39 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0192361a |
7 |
|
8 |
sys-apps/systemd: simplify PATCHES code |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
sys-apps/systemd/systemd-251.3.ebuild | 8 +------- |
13 |
sys-apps/systemd/systemd-9999.ebuild | 8 +------- |
14 |
2 files changed, 2 insertions(+), 14 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/systemd/systemd-251.3.ebuild b/sys-apps/systemd/systemd-251.3.ebuild |
17 |
index 6e5bdcbd47f9..e70496cd957b 100644 |
18 |
--- a/sys-apps/systemd/systemd-251.3.ebuild |
19 |
+++ b/sys-apps/systemd/systemd-251.3.ebuild |
20 |
@@ -234,13 +234,7 @@ src_unpack() { |
21 |
} |
22 |
|
23 |
src_prepare() { |
24 |
- # Do NOT add patches here |
25 |
- local PATCHES=() |
26 |
- |
27 |
- [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) |
28 |
- |
29 |
- # Add local patches here |
30 |
- PATCHES+=( |
31 |
+ local PATCHES=( |
32 |
# Breaks Clang. Revert the commit for now and force off F_S=3. |
33 |
# bug #841770. |
34 |
"${FILESDIR}/251-revert-fortify-source-3-fix.patch" |
35 |
|
36 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
37 |
index b3bc091078ab..1a8b1c931c45 100644 |
38 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
39 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
40 |
@@ -234,13 +234,7 @@ src_unpack() { |
41 |
} |
42 |
|
43 |
src_prepare() { |
44 |
- # Do NOT add patches here |
45 |
- local PATCHES=() |
46 |
- |
47 |
- [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) |
48 |
- |
49 |
- # Add local patches here |
50 |
- PATCHES+=( |
51 |
+ local PATCHES=( |
52 |
) |
53 |
|
54 |
if ! use vanilla; then |