aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-12-21 09:09:22 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-12-21 09:09:42 -0300
commite4215ca427e54b08889bd7249a0df87d8edcaef2 (patch)
treefdef3f1047d557a7ad09624883e6bc6012fb2ea1
parentddd2c26e643f702562808634e5ede132542220f0 (diff)
community/fbida: fix build with -fno-common
-rw-r--r--community/fbida/APKBUILD4
-rw-r--r--community/fbida/gcc-10.patch55
2 files changed, 58 insertions, 1 deletions
diff --git a/community/fbida/APKBUILD b/community/fbida/APKBUILD
index a6346110764..d71053fdc0a 100644
--- a/community/fbida/APKBUILD
+++ b/community/fbida/APKBUILD
@@ -20,6 +20,7 @@ subpackages="
source="https://www.kraxel.org/releases/fbida/fbida-$pkgver.tar.gz
no-pdf.patch
ida-desktop.patch
+ gcc-10.patch
"
prepare() {
@@ -60,4 +61,5 @@ _tool() {
sha512sums="8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec fbida-2.14.tar.gz
972b55541755b4b2abfe9ef3fd50e2003851b4b1798c9dafbd98d9e5b02f0508f9326b3a87c23a600d759cd3dcd4c6826844d3017f39efe1187bb741a2dcc7b9 no-pdf.patch
-cd5276b558a15f34353ebc5a51bd092142c1f5194e98d11c2ed22f4731200899fb31b95f52f884bc06a9e1fc5f9762c124e0870415a4a7e787548f19d12915e5 ida-desktop.patch"
+cd5276b558a15f34353ebc5a51bd092142c1f5194e98d11c2ed22f4731200899fb31b95f52f884bc06a9e1fc5f9762c124e0870415a4a7e787548f19d12915e5 ida-desktop.patch
+eb4f649e50fe5da682729d7aefa10c471145a5df9290251f973b21b8636f8d88bb2b97dbf913c8e7089edd8617326e50f822e160566f63b1e2baf8ee2ac6e64a gcc-10.patch"
diff --git a/community/fbida/gcc-10.patch b/community/fbida/gcc-10.patch
new file mode 100644
index 00000000000..1ae7192d245
--- /dev/null
+++ b/community/fbida/gcc-10.patch
@@ -0,0 +1,55 @@
+Taken from Gentoo
+
+--- a/fbi.c
++++ b/fbi.c
+@@ -86,7 +86,6 @@ static int img_mem, max_mem_mb;
+
+ /* graphics interface */
+ gfxstate *gfx;
+-int debug;
+
+ /* framebuffer */
+ char *fbdev = NULL;
+--- a/filter.c
++++ b/filter.c
+@@ -6,8 +6,6 @@
+ #include "readers.h"
+ #include "filter.h"
+
+-int debug = 0;
+-
+ /* ----------------------------------------------------------------------- */
+
+ static void
+--- a/idaconfig.h
++++ b/idaconfig.h
+@@ -17,7 +17,7 @@
+
+ /* -------------------------------------------------------------------------- */
+
+-char *ida_lists;
++extern char *ida_lists;
+
+ void ida_init_config(void);
+ void ida_read_config(void);
+--- a/readers.c
++++ b/readers.c
+@@ -7,6 +7,8 @@
+ #include "readers.h"
+ #include "byteorder.h"
+
++int debug=0;
++
+ /* ----------------------------------------------------------------------- */
+
+ void load_bits_lsb(unsigned char *dst, unsigned char *src, int width,
+--- a/viewer.c
++++ b/viewer.c
+@@ -38,7 +38,6 @@
+
+ #define PROCESS_LINES 16
+
+-int debug;
+ Cursor ptrs[POINTER_COUNT];
+
+ /* ----------------------------------------------------------------------- */