commit:     c09f56693f0b6e739ac3d4d28933219600d1dd72
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Thu Apr 13 20:38:24 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 06:54:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c09f5669

net-libs/xdp-tools: reinstate -Werror for configure

The patch to remove -Werror from the build was a little bit too thorough
and removed -Werror from the configure script, where it is required.

Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/30586
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/xdp-tools/files/1.3.1-no-Werror.patch     | 22 ----------------------
 ...s-1.3.1-r2.ebuild => xdp-tools-1.3.1-r3.ebuild} |  0
 2 files changed, 22 deletions(-)

diff --git a/net-libs/xdp-tools/files/1.3.1-no-Werror.patch 
b/net-libs/xdp-tools/files/1.3.1-no-Werror.patch
index 7545c49b1c2e..fb086f5122b9 100644
--- a/net-libs/xdp-tools/files/1.3.1-no-Werror.patch
+++ b/net-libs/xdp-tools/files/1.3.1-no-Werror.patch
@@ -1,28 +1,6 @@
 
 Bug: https://bugs.gentoo.org/899744
 
-diff --git a/configure b/configure
-index 62c2f88..230637f 100755
---- a/configure
-+++ b/configure
-@@ -249,7 +249,7 @@ int main(int argc, char **argv) {
-     return 0;
- }
- EOF
--    compile_cmd="$CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror 
$LIBBPF_CFLAGS $LIBBPF_LDLIBS"
-+    compile_cmd="$CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c 
$LIBBPF_CFLAGS $LIBBPF_LDLIBS"
-     libbpf_err=$($compile_cmd 2>&1)
-     if [ "$?" -eq "0" ]; then
-         echo "HAVE_FEATURES+=${config_var}" >>"$CONFIG"
-@@ -323,7 +323,7 @@ int main(int argc, char **argv) {
- }
- EOF
- 
--        libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror 
$LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
-+        libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c 
$LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
-         if [ "$?" -eq "0" ]; then
-             echo "SYSTEM_LIBBPF:=y" >>$CONFIG
-             echo "LIBBPF_VERSION=$LIBBPF_VERSION" >>$CONFIG
 diff --git a/lib/Makefile b/lib/Makefile
 index 5ee035d..5342ab3 100644
 --- a/lib/Makefile

diff --git a/net-libs/xdp-tools/xdp-tools-1.3.1-r2.ebuild 
b/net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild
similarity index 100%
rename from net-libs/xdp-tools/xdp-tools-1.3.1-r2.ebuild
rename to net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild

Reply via email to