diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-11-24 13:58:57 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-11-24 13:58:58 -0300 |
| commit | f75210b4f485fed4d210fb7d2744448561b83bdd (patch) | |
| tree | 16266714f72646eaff2cec6a3d181f4ffa501501 | |
| parent | fd99f143e50e6412f8bdd889c89813f12f0f0ec5 (diff) | |
| download | aports-f75210b4f485fed4d210fb7d2744448561b83bdd.tar.gz aports-f75210b4f485fed4d210fb7d2744448561b83bdd.tar.bz2 aports-f75210b4f485fed4d210fb7d2744448561b83bdd.tar.xz | |
main/distcc: fix build under gcc-10
| -rw-r--r-- | main/distcc/APKBUILD | 2 | ||||
| -rw-r--r-- | main/distcc/gcc-10.patch | 29 |
2 files changed, 31 insertions, 0 deletions
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD index 1c9e4515c1..54698dde1a 100644 --- a/main/distcc/APKBUILD +++ b/main/distcc/APKBUILD @@ -14,6 +14,7 @@ install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-pump" source="https://github.com/distcc/distcc/releases/download/v$pkgver/distcc-$pkgver.tar.gz distcc-hardened.patch + gcc-10.patch distccd.initd distccd.confd " @@ -65,5 +66,6 @@ pump() { sha512sums="d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135 distcc-3.3.3.tar.gz d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057 distcc-hardened.patch +9c3c16ddcda8430a76050f6d91d09e0086452b07cf07457c39e30e258d77d86f08034014e49fc6c7cb33a353200af83d651d5d9ba45f67166591a6a38c3ed243 gcc-10.patch 3c58be08242de09f76876b20a0c6643a3a76a088c356484cb091253b7e4dddb20008d071d8e5d1a66acbc5bfe4d8a59284a6d7f225ca2006e8a8b3c698e71026 distccd.initd fbb12522e489243475c735e055a72a19b176f1ad736dc810e1f085d8d9d79460ac7590a92bb9563f8b316437f67f6ca729330253f007d06011144a66fede5465 distccd.confd" diff --git a/main/distcc/gcc-10.patch b/main/distcc/gcc-10.patch new file mode 100644 index 0000000000..60f1f24c25 --- /dev/null +++ b/main/distcc/gcc-10.patch @@ -0,0 +1,29 @@ +Upstream: Should be +Reason: Fixes compilation under gcc-10 which has -fno-common + +diff --git a/src/stats.c b/src/stats.c +index 35dbf7d..76bfbee 100644 +--- a/src/stats.c ++++ b/src/stats.c +@@ -82,7 +82,7 @@ struct statsdata { + char compiler[MAX_FILENAME_LEN]; + }; + +-const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD", ++extern const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD", + "COMPILE_OK", "COMPILE_ERROR", "COMPILE_TIMEOUT", "CLI_DISCONN", + "OTHER" }; + +diff --git a/src/stats.h b/src/stats.h +index 9bde285..74d4690 100644 +--- a/src/stats.h ++++ b/src/stats.h +@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD, + STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT, + STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX }; + +-const char *stats_text[20]; ++extern const char *stats_text[20]; + + int dcc_stats_init(void); + void dcc_stats_init_kid(void); |