| 1 |
commit: 4b97045030783a1d91f050b2f4df2f66cdbdccf4 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 28 01:44:15 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 28 01:54:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b970450 |
| 7 |
|
| 8 |
sys-apps/opal-utils: replace sed with patch |
| 9 |
|
| 10 |
Also filter out -Werror in opal-prd Makefile |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/744634 |
| 13 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-apps/opal-utils/files/flags.patch | 35 +++++++++++++++++++++++++++++ |
| 17 |
sys-apps/opal-utils/opal-utils-6.5.2.ebuild | 7 ++---- |
| 18 |
sys-apps/opal-utils/opal-utils-6.6.2.ebuild | 8 ++----- |
| 19 |
sys-apps/opal-utils/opal-utils-6.6.3.ebuild | 8 ++----- |
| 20 |
4 files changed, 41 insertions(+), 17 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sys-apps/opal-utils/files/flags.patch b/sys-apps/opal-utils/files/flags.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..5aa045ed1ca |
| 25 |
--- /dev/null |
| 26 |
+++ b/sys-apps/opal-utils/files/flags.patch |
| 27 |
@@ -0,0 +1,35 @@ |
| 28 |
+From 828c1c28c314c62cf90b9b989f92af7ea96c100d Mon Sep 17 00:00:00 2001 |
| 29 |
+From: Georgy Yakovlev <gyakovlev@g.o> |
| 30 |
+Date: Sun, 27 Sep 2020 18:48:38 -0700 |
| 31 |
+Subject: [PATCH] respect user flags |
| 32 |
+ |
| 33 |
+--- |
| 34 |
+ external/ffspart/rules.mk | 2 +- |
| 35 |
+ external/opal-prd/Makefile | 2 +- |
| 36 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/external/ffspart/rules.mk b/external/ffspart/rules.mk |
| 39 |
+index 40972c6..09a025f 100644 |
| 40 |
+--- a/external/ffspart/rules.mk |
| 41 |
++++ b/external/ffspart/rules.mk |
| 42 |
+@@ -30,5 +30,5 @@ $(LIBFLASH_OBJS): libflash-%.o : libflash/%.c |
| 43 |
+ $(Q_CC)$(CC) $(CFLAGS) -c $< -o $@ |
| 44 |
+ |
| 45 |
+ $(EXE): $(OBJS) |
| 46 |
+- $(Q_CC)$(CC) $(CFLAGS) $^ -lrt -o $@ |
| 47 |
++ $(Q_CC)$(CC) $(CFLAGS) $^ -lrt $(LDFLAGS) -o $@ |
| 48 |
+ |
| 49 |
+diff --git a/external/opal-prd/Makefile b/external/opal-prd/Makefile |
| 50 |
+index fb9402f..52f10d9 100644 |
| 51 |
+--- a/external/opal-prd/Makefile |
| 52 |
++++ b/external/opal-prd/Makefile |
| 53 |
+@@ -1,5 +1,5 @@ |
| 54 |
+ # SPDX-License-Identifier: Apache-2.0 |
| 55 |
+-CFLAGS += -m64 -Werror -Wall -g2 -ggdb |
| 56 |
++CFLAGS += -m64 -Wall |
| 57 |
+ LDFLAGS += -m64 |
| 58 |
+ ASFLAGS = -m64 |
| 59 |
+ CPPFLAGS += -I. -I../../include -I../../ |
| 60 |
+-- |
| 61 |
+2.28.0 |
| 62 |
+ |
| 63 |
|
| 64 |
diff --git a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild |
| 65 |
index 9e12d9fc8b8..9479de387f7 100644 |
| 66 |
--- a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild |
| 67 |
+++ b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild |
| 68 |
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils" |
| 69 |
|
| 70 |
S="${WORKDIR}/skiboot-${PV}" |
| 71 |
|
| 72 |
+PATCHES=( "${FILESDIR}/flags.patch" ) |
| 73 |
+ |
| 74 |
python_check_deps() { |
| 75 |
has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && |
| 76 |
has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 77 |
@@ -42,11 +44,6 @@ pkg_setup() { |
| 78 |
use doc && python-any-r1_pkg_setup |
| 79 |
} |
| 80 |
|
| 81 |
-src_prepare() { |
| 82 |
- default |
| 83 |
- sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die |
| 84 |
-} |
| 85 |
- |
| 86 |
src_configure() { |
| 87 |
tc-export CC LD |
| 88 |
export OPAL_PRD_VERSION="${PV}" |
| 89 |
|
| 90 |
diff --git a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild |
| 91 |
index 867857095da..22d57ef7a34 100644 |
| 92 |
--- a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild |
| 93 |
+++ b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild |
| 94 |
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils" |
| 95 |
|
| 96 |
S="${WORKDIR}/skiboot-${PV}" |
| 97 |
|
| 98 |
+PATCHES=( "${FILESDIR}/flags.patch" ) |
| 99 |
+ |
| 100 |
python_check_deps() { |
| 101 |
has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && |
| 102 |
has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 103 |
@@ -42,12 +44,6 @@ pkg_setup() { |
| 104 |
use doc && python-any-r1_pkg_setup |
| 105 |
} |
| 106 |
|
| 107 |
-src_prepare() { |
| 108 |
- default |
| 109 |
- sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die |
| 110 |
- sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die |
| 111 |
-} |
| 112 |
- |
| 113 |
src_configure() { |
| 114 |
tc-export CC LD |
| 115 |
export OPAL_PRD_VERSION="${PV}" |
| 116 |
|
| 117 |
diff --git a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild |
| 118 |
index 6f824f28e38..823783f6fa3 100644 |
| 119 |
--- a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild |
| 120 |
+++ b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild |
| 121 |
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils" |
| 122 |
|
| 123 |
S="${WORKDIR}/skiboot-${PV}" |
| 124 |
|
| 125 |
+PATCHES=( "${FILESDIR}/flags.patch" ) |
| 126 |
+ |
| 127 |
python_check_deps() { |
| 128 |
has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && |
| 129 |
has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 130 |
@@ -42,12 +44,6 @@ pkg_setup() { |
| 131 |
use doc && python-any-r1_pkg_setup |
| 132 |
} |
| 133 |
|
| 134 |
-src_prepare() { |
| 135 |
- default |
| 136 |
- sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die |
| 137 |
- sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die |
| 138 |
-} |
| 139 |
- |
| 140 |
src_configure() { |
| 141 |
tc-export CC LD |
| 142 |
export OPAL_PRD_VERSION="${PV}" |
Archives