From 40e8660efe10534e98bbe343845d7470176e6e67 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 23 Dec 2019 00:32:55 +0000 Subject: system/gcc: fix Go on 32-bit machines with 64-bit time_t --- system/gcc/340-gccgo-time64-stat.patch | 19 +++++++++++++++++++ system/gcc/APKBUILD | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 system/gcc/340-gccgo-time64-stat.patch (limited to 'system') diff --git a/system/gcc/340-gccgo-time64-stat.patch b/system/gcc/340-gccgo-time64-stat.patch new file mode 100644 index 000000000..332712a13 --- /dev/null +++ b/system/gcc/340-gccgo-time64-stat.patch @@ -0,0 +1,19 @@ +There are more than one st_{a,m,c}tim fields in struct stat on time64 machines. + +Run the Go-isation on all of them. + +--- gcc-8.3.0/libgo/mksysinfo.sh.old 2018-11-09 15:29:52.000000000 +0000 ++++ gcc-8.3.0/libgo/mksysinfo.sh 2019-12-23 00:18:54.129911814 +0000 +@@ -468,9 +468,9 @@ + -e 's/st_size/Size/' \ + -e 's/st_blksize/Blksize/' \ + -e 's/st_blocks/Blocks/' \ +- -e 's/st_atim/Atim/' \ +- -e 's/st_mtim/Mtim/' \ +- -e 's/st_ctim/Ctim/' \ ++ -e 's/st_atim/Atim/g' \ ++ -e 's/st_mtim/Mtim/g' \ ++ -e 's/st_ctim/Ctim/g' \ + -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1Timeval\2/g' \ + -e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \ + -e 's/\([^a-zA-Z0-9_]\)_st_timespec_t\([^a-zA-Z0-9_]\)/\1StTimespec\2/g' \ diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD index 68771a8aa..5d5758528 100644 --- a/system/gcc/APKBUILD +++ b/system/gcc/APKBUILD @@ -177,6 +177,7 @@ source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz 337-gccgo-signal-sig34.patch 338-gccgo-syscall.patch 339-gccgo-errstr.patch + 340-gccgo-time64-stat.patch add-classic_table-support.patch disable-multiarch-ppc32.patch @@ -571,6 +572,7 @@ de0cc0f9356c9ee5ea7b0f954441b59115f4a8f8f63573d0c17b6537e6f37641cf137531b496fc19 c2916948b028e1e990e1953875b884561c0f8dd105c1ec03073795df9a47ec2c627cbc95ca0ec98ab9177bf2b7c8458bf3fd09f780fa6c301995846f6317e366 337-gccgo-signal-sig34.patch 0bdf592ec8444c6e253f1a7626b4e618b2e18e6d0b5a4548f90903f9de80a7cf3ea536750c2743f436a05faa1e7b65e52a391da9732dce51c4b00e23853e5365 338-gccgo-syscall.patch b32d496a3a04c2357200b75dbf7f667fb57bf5af4f0c68926bc58f6600e4f23caa48aad2eaf073f1408168cacf27e8f11a6062c65bf5bb67458eedef698871d4 339-gccgo-errstr.patch +4db4a00dff1d3cb3ecbc713659316782ac839478ff1fd7166cfa64a2c7cee0ba2a0d3fa23cb858af7d8f59a6ac2bdf40e63a45c307b89eefe2a4e888707f615b 340-gccgo-time64-stat.patch 1860593584f629d24d5b6db14b0a3412e9f93449b663aaa4981301a0923db0159314905e694f27366fbfef72dce06636ab6df86862b7e9e9564847e03bee82c1 add-classic_table-support.patch db8c4ab3eae7c01943a61e9e3e20af45d4f6d196184eee5b94068b212900ccdeecaf4fb4145983226954f64e7c989fcd13e0b506176d2b3e781c2e9dc8b5a5a8 disable-multiarch-ppc32.patch 67a75a94fdba69de96b98dbc2978a50cb197857c464b81f7c956176da7066b3be937e40cb15e0870fc1e7382d662c5101bcd18cf457fc4112de41802042b51c4 gcc-5.4.0-locale.patch -- cgit v1.2.3-60-g2f50