aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Larsson <who+github@cnackers.org>2020-08-30 10:22:19 +0200
committerRasmus Thomsen <oss@cogitri.dev>2020-09-01 21:32:52 +0000
commitf7b3d011daed544db4dd75cc9285c7d0d9f3a03a (patch)
treee092caa5dc47afa8a6c69d8b6b619abd430f4392
parent12bc00ea1cf4dd762746c1342dd4288580f5bff8 (diff)
downloadaports-f7b3d011daed544db4dd75cc9285c7d0d9f3a03a.tar.gz
aports-f7b3d011daed544db4dd75cc9285c7d0d9f3a03a.tar.bz2
aports-f7b3d011daed544db4dd75cc9285c7d0d9f3a03a.tar.xz
testing/bird: backport fix for gcc 10
upstream commit: https://gitlab.nic.cz/labs/bird/-/commit/4bbc10614f3431c37e6352f5a6ea5c693c31021e
-rw-r--r--testing/bird/APKBUILD4
-rw-r--r--testing/bird/bird-gcc10-fix.patch15
2 files changed, 18 insertions, 1 deletions
diff --git a/testing/bird/APKBUILD b/testing/bird/APKBUILD
index 8d9712f3f2..d84546647d 100644
--- a/testing/bird/APKBUILD
+++ b/testing/bird/APKBUILD
@@ -16,6 +16,7 @@ source="
bird-make-test-bsprintf.patch
bird.initd
bird.confd
+ bird-gcc10-fix.patch
"
# flawed test on big-endian
@@ -44,4 +45,5 @@ package() {
sha512sums="48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35 bird-2.0.7.tar.gz
e0a9bab1bb84ab4efbf51c4c015bf35196d146560f737979d3a17c44dc2397d9578e61a3bba0c58f3cdbb108074f17288bf536db5d8d4dce87c91f1be3dc6282 bird-make-test-bsprintf.patch
8d2f6c95d9ce218dd1e3cbc847b8c39584cdb336b2ba1484294e1f3894e5b03b0966a098b5820c2980ef486c04460cbdc71fefe915dc458c459dbd8e8e6a618f bird.initd
-22e9ce0a5b5aedd1fe7f9aeb2c5c327ff6df8fe8a42b7bc21194bab8ec16f68d99480507b97b74ea549b4cac4f51fedf7d488ccb4defa44dd90d7f3a63d667cf bird.confd"
+22e9ce0a5b5aedd1fe7f9aeb2c5c327ff6df8fe8a42b7bc21194bab8ec16f68d99480507b97b74ea549b4cac4f51fedf7d488ccb4defa44dd90d7f3a63d667cf bird.confd
+b43d6bc0e25810aa30c7eacd647996ae6b324fba7dc70bc48eb4dcd7c3d661dae192720a988cad65e01a99f143ea0bba06adef8e87ade265e19e87a9381a53f1 bird-gcc10-fix.patch"
diff --git a/testing/bird/bird-gcc10-fix.patch b/testing/bird/bird-gcc10-fix.patch
new file mode 100644
index 0000000000..313a437496
--- /dev/null
+++ b/testing/bird/bird-gcc10-fix.patch
@@ -0,0 +1,15 @@
+upstream commit: https://gitlab.nic.cz/labs/bird/-/commit/4bbc10614f3431c37e6352f5a6ea5c693c31021e
+
+diff --git a/nest/route.h b/nest/route.h
+index d2a07f09741bf0e1714e8c02f49df6ffbbf03135..b927db5f634ecfa8120b54529b54782000b01c3d 100644
+--- a/nest/route.h
++++ b/nest/route.h
+@@ -458,7 +458,7 @@ typedef struct rta {
+ protocol-specific metric is availabe */
+
+
+-const char * rta_dest_names[RTD_MAX];
++extern const char * rta_dest_names[RTD_MAX];
+
+ static inline const char *rta_dest_name(uint n)
+ { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; }