summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Jäger <pascal.jaeger@leimstift.de>2022-11-11 22:59:27 +0100
committerSam James <sam@gentoo.org>2022-11-15 02:10:56 +0000
commit1b00803e385f59726a20018c9911566af6646951 (patch)
tree586a26125566c62f9b1448512af18707e75e308c
parentapp-editors/xvile: fix build for clang16 (diff)
downloadgentoo-1b00803e385f59726a20018c9911566af6646951.tar.gz
gentoo-1b00803e385f59726a20018c9911566af6646951.tar.bz2
gentoo-1b00803e385f59726a20018c9911566af6646951.zip
app-misc/bb: revbump, fix build for clang16 and lto
Closes: https://bugs.gentoo.org/880385 Closes: https://bugs.gentoo.org/854720 Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> Closes: https://github.com/gentoo/gentoo/pull/28233 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch23
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch18
2 files changed, 41 insertions, 0 deletions
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch
new file mode 100644
index 000000000000..77b06874760b
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch
@@ -0,0 +1,23 @@
+The two functions that are assigned to the formulas structs secnod field
+`int (*calculate)(number_t number_t number_t number_t)`
+(without the REGISTERS(3) which is just a macro to GCC regparm)
+
+However, clang16 has -Wincompatible-function-pointer-types by default, and it
+does not like that and complains, that assigning these functions into the
+structs fields is a problem due to incompatible types.
+
+Bug: https://bugs.gentoo.org/880385
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/formulas.h
++++ b/formulas.h
+@@ -50,7 +50,7 @@ struct symetryinfo {
+ #define FORMULAMAGIC 1121
+ struct formula {
+ int magic;
+- int (*calculate) (number_t, number_t, number_t, number_t) REGISTERS(3);
++ int (*calculate) (number_t, number_t, number_t, number_t);
+ char *name[2];
+ vinfo v;
+ int mandelbrot;
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch
new file mode 100644
index 000000000000..6442a9c9fd29
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch
@@ -0,0 +1,18 @@
+In tex.c these variables are initialized as unsigned longs, so they should
+be declared as unsigned longs. I have scanned the code base for any usage
+of them in the negatives - nothing.
+
+Bug: https://bugs.gentoo.org/854720
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/tex.h
++++ b/tex.h
+@@ -28,5 +28,6 @@ extern void disp3d(void);
+ extern void set_zbuff(void);
+ extern void unset_zbuff(void);
+
+-extern int alfa,beta,gama,centerx,centery,centerz;
++extern unsigned long alfa,beta,gama;
++extern int centerx,centery,centerz;
+ extern float zoom;