1 |
commit: ef8b7a9110e6842c9533b1d8e074ae1a88e976ce |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 14 09:59:51 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 14 09:59:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8b7a91 |
7 |
|
8 |
net-wireless/dump1090: backport x86 patch to 5.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/818130 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
net-wireless/dump1090/dump1090-5.0.ebuild | 1 + |
14 |
.../files/dump1090-5.0-further-32bit-fix.patch | 52 ++++++++++++++++++++++ |
15 |
2 files changed, 53 insertions(+) |
16 |
|
17 |
diff --git a/net-wireless/dump1090/dump1090-5.0.ebuild b/net-wireless/dump1090/dump1090-5.0.ebuild |
18 |
index 93b19b8ac79..0f692187b67 100644 |
19 |
--- a/net-wireless/dump1090/dump1090-5.0.ebuild |
20 |
+++ b/net-wireless/dump1090/dump1090-5.0.ebuild |
21 |
@@ -30,6 +30,7 @@ BDEPEND="virtual/pkgconfig" |
22 |
|
23 |
PATCHES=( |
24 |
"${FILESDIR}/${P}-32bit-fix.patch" |
25 |
+ "${FILESDIR}/${P}-further-32bit-fix.patch" |
26 |
) |
27 |
|
28 |
src_prepare() { |
29 |
|
30 |
diff --git a/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..bfcea2e4f88 |
33 |
--- /dev/null |
34 |
+++ b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch |
35 |
@@ -0,0 +1,52 @@ |
36 |
+https://github.com/flightaware/dump1090/commit/462dee56f3a339bc4d83fea264fe89a1ced5bd22.patch |
37 |
+https://github.com/flightaware/dump1090/commit/455896e86db84d10a197f5a3f88d13c0539ad470.patch |
38 |
+https://bugs.gentoo.org/818130 |
39 |
+ |
40 |
+From 462dee56f3a339bc4d83fea264fe89a1ced5bd22 Mon Sep 17 00:00:00 2001 |
41 |
+From: Oliver Jowett <oliver.jowett@×××××××××××.com> |
42 |
+Date: Sat, 13 Mar 2021 12:49:40 +0800 |
43 |
+Subject: [PATCH] Fix builds on 32-bit x86 |
44 |
+ |
45 |
+--- |
46 |
+ Makefile.cpufeatures | 6 +++++- |
47 |
+ 1 file changed, 5 insertions(+), 1 deletion(-) |
48 |
+ |
49 |
+diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures |
50 |
+index 099714e08..12377ad81 100644 |
51 |
+--- a/Makefile.cpufeatures |
52 |
++++ b/Makefile.cpufeatures |
53 |
+@@ -17,7 +17,11 @@ ifeq ($(CPUFEATURES_UNAME),Darwin) |
54 |
+ CPUFEATURES_CFLAGS += -DHAVE_SYSCTLBYNAME |
55 |
+ endif |
56 |
+ |
57 |
+-ifeq ($(CPUFEATURES_ARCH), x86_64) |
58 |
++ifeq ($(CPUFEATURES_ARCH),x86_64) |
59 |
++ CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o |
60 |
++endif |
61 |
++ |
62 |
++ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),) |
63 |
+ CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o |
64 |
+ endif |
65 |
+ |
66 |
+From 455896e86db84d10a197f5a3f88d13c0539ad470 Mon Sep 17 00:00:00 2001 |
67 |
+From: Oliver Jowett <oliver.jowett@×××××××××××.com> |
68 |
+Date: Wed, 17 Mar 2021 02:21:18 +0800 |
69 |
+Subject: [PATCH] Fix broken 32-bit x86 test that broke builds on non-x86 |
70 |
+ |
71 |
+--- |
72 |
+ Makefile.cpufeatures | 2 +- |
73 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
74 |
+ |
75 |
+diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures |
76 |
+index 12377ad81..8c3b8418d 100644 |
77 |
+--- a/Makefile.cpufeatures |
78 |
++++ b/Makefile.cpufeatures |
79 |
+@@ -21,7 +21,7 @@ ifeq ($(CPUFEATURES_ARCH),x86_64) |
80 |
+ CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o |
81 |
+ endif |
82 |
+ |
83 |
+-ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),) |
84 |
++ifneq (,$(filter i%86,$(CPUFEATURES_ARCH))) |
85 |
+ CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o |
86 |
+ endif |
87 |
+ |