Skip to content

Commit 76490c0

Browse files
MaxythonMaxython
authored
cgct/cgt: bump to 14.2.1 (#310)
1 parent ad114af commit 76490c0

File tree

5 files changed

+54
-50
lines changed

5 files changed

+54
-50
lines changed

‎cgct/cgt/PKGBUILD

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
pkgname=cgt
2-
pkgver=14.2.0
2+
pkgver=14.2.1
33
pkgrel=0
44
pkgdesc='Cross GCCs for Termux (only for Linux)'
55
arch=(x86_64)
66
url='https://gcc.gnu.org/'
77
license=(GPL LGPL FDL)
8-
source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz
8+
_commit=694613a7f9adfa9c87e733adc63839c8801f2b5c
9+
source=(git+https://sourceware.org/git/gcc.git#commit=${_commit}
910
gcc-configure.patch
1011
config.sub.patch
1112
configure.patch
1213
set_dynamic_path.patch
1314
cgct-app-prefix.cc
1415
cgct-app-prefix.h)
15-
sha256sums=('a7b39bc69cbf9e25826c5a60ab26477001f7c08d85cec04bc0e29cabed6f3cc9'
16-
'f4962b9ab48271994fefbd7c654fd2d60356a39abecc3510cfe45d1be7f50483'
17-
'805fa7799fe23f2e4b1d5f9d10fadf46a45f446c6462f32f3b7633b8941003f3'
18-
'ba65de3512c3d02030c5e3bcd70b69a7922eec6bdc24763bf4a6045447dc1d84'
19-
'e402f2bc3288158e8edbef27b511015d87f37ba70ddbd84c2b925fe075822f95'
16+
sha256sums=('085eba5de615f6f74729f96e8c301808159b72382ad331ebec9c79c2bd08e20d'
17+
'b0d2153d28248189ad1f000194c9b12aa7cea04c09c9f36a2e78b2c25b771392'
18+
'a688899b982608089ee76a97e18c019f596ccb5cad055916a6ad6d387568b3dc'
19+
'8ad880e14a32a3b5f3ab8039df89b22479c4a92bfbe6b3f758409264ddef5479'
20+
'aa87377b2a73e303c45d9a86496b94193799083324a442572768bd1b704a71e8'
2021
'732e15a76056348911f60825c377c0378f6dad57b29eb86fcc7447cf8172f171'
2122
'9fb91df134d096bf493844812617b5aed9ce5d6ccd564f8a3a11c8d9812be744')
2223
depends=('cbt')
@@ -26,13 +27,14 @@ targets=(aarch64-linux-gnu arm-linux-gnueabihf x86_64-linux-gnu i686-linux-gnu)
2627
options=(libtool staticlibs !emptydirs)
2728

2829
prepare() {
30+
[ ! -d gcc ] && ln -s gcc-${pkgver} gcc
2931
for i in *.patch; do
3032
patch -Np1 -i ${srcdir}/$i
3133
done
3234

33-
cp ./cgct-app-prefix.{cc,h} ./gcc-${pkgver}/gcc/
35+
cp ./cgct-app-prefix.{cc,h} ./gcc/gcc/
3436

35-
cd gcc-${pkgver}
37+
cd gcc
3638
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
3739
sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
3840
sed -i '/lp64=/s/lib64/lib/' gcc/config/aarch64/t-aarch64-linux
@@ -42,6 +44,8 @@ prepare() {
4244
'${prefix}/${target_alias}'; do
4345
sed -i "s|${i}|${i%%/*}|" $(grep -s -r -l "${i}")
4446
done
47+
echo "${pkgver}" > gcc/BASE-VER
48+
echo "${_commit}" > gcc/DEV-PHASE
4549
}
4650

4751
build() {
@@ -70,7 +74,7 @@ build() {
7074
"i686") CONFIGFLAG="--with-arch=i686";;
7175
esac
7276

73-
"$srcdir"/gcc-${pkgver}/configure \
77+
"$srcdir"/gcc/configure \
7478
--host=cgct \
7579
--build=${CHOST} \
7680
--target=${target} \

‎cgct/cgt/config.sub.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- src/gcc-14.2.0/config.sub 2024-04-17 12:59:33.770464867 +0300
2-
+++ src/gcc-14.2.0/config.sub.patch 2024-04-17 13:10:53.190464608 +0300
1+
--- src/gcc/config.sub 2024-04-17 12:59:33.770464867 +0300
2+
+++ src/gcc/config.sub.patch 2024-04-17 13:10:53.190464608 +0300
33
@@ -647,6 +647,10 @@
44
basic_machine=ymp-cray
55
basic_os=unicos

‎cgct/cgt/configure.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- src/gcc-14.2.0/configure 2023-07-27 11:13:03.000000000 +0300
2-
+++ src/gcc-14.2.0/configure.patch 2024-04-17 19:47:43.249004152 +0300
1+
--- src/gcc/configure 2023-07-27 11:13:03.000000000 +0300
2+
+++ src/gcc/configure.patch 2024-04-17 19:47:43.249004152 +0300
33
@@ -17498,7 +17498,7 @@
44

55
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ar" >&5

‎cgct/cgt/gcc-configure.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- src/gcc-14.2.0/gcc/configure 2024-05-20 09:02:31.592159861 +0300
2-
+++ src/gcc-14.2.0/gcc/configure.patch 2024-05-20 09:04:22.992159819 +0300
1+
--- src/gcc/gcc/configure 2024-05-20 09:02:31.592159861 +0300
2+
+++ src/gcc/gcc/configure.patch 2024-05-20 09:04:22.992159819 +0300
33
@@ -3784,9 +3784,6 @@
44
gcc_gxx_include_dir='${libsubdir}/include/c++'
55
else

‎cgct/cgt/set_dynamic_path.patch

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- src/gcc-14.2.0/gcc/Makefile.in
2-
+++ src/gcc-14.2.0/gcc/Makefile.in
1+
--- src/gcc/gcc/Makefile.in
2+
+++ src/gcc/gcc/Makefile.in
33
@@ -559,13 +559,9 @@ FNMATCH_H = $(srcdir)/../include/fnmatch.h
44
LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h
55

@@ -72,8 +72,8 @@
7272
$(mkinstalldirs) $${include_dir}; \
7373
chmod a+rx $${include_dir} || true; \
7474
$(SHELL) $(srcdir)/../move-if-change \
75-
--- src/gcc-14.2.0/gcc/collect2.cc
76-
+++ src/gcc-14.2.0/gcc/collect2.cc
75+
--- src/gcc/gcc/collect2.cc
76+
+++ src/gcc/gcc/collect2.cc
7777
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3. If not see
7878
#include "file-find.h"
7979
#include "simple-object.h"
@@ -130,8 +130,8 @@
130130
NULL
131131
};
132132

133-
--- src/gcc-14.2.0/gcc/config/aarch64/aarch64-linux.h
134-
+++ src/gcc-14.2.0/gcc/config/aarch64/aarch64-linux.h
133+
--- src/gcc/gcc/config/aarch64/aarch64-linux.h
134+
+++ src/gcc/gcc/config/aarch64/aarch64-linux.h
135135
@@ -21,7 +21,9 @@
136136
#ifndef GCC_AARCH64_LINUX_H
137137
#define GCC_AARCH64_LINUX_H
@@ -168,8 +168,8 @@
168168

169169
#define GNU_USER_TARGET_MATHFILE_SPEC \
170170
"%{Ofast|ffast-math|funsafe-math-optimizations:%{!shared:crtfastmath.o%s}}"
171-
--- src/gcc-14.2.0/gcc/config/arm/linux-eabi.h
172-
+++ src/gcc-14.2.0/gcc/config/arm/linux-eabi.h
171+
--- src/gcc/gcc/config/arm/linux-eabi.h
172+
+++ src/gcc/gcc/config/arm/linux-eabi.h
173173
@@ -18,6 +18,8 @@
174174
along with GCC; see the file COPYING3. If not see
175175
<http://www.gnu.org/licenses/>. */
@@ -223,8 +223,8 @@
223223

224224
/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
225225
do not use -lfloat. */
226-
--- src/gcc-14.2.0/gcc/config/arm/linux-elf.h
227-
+++ src/gcc-14.2.0/gcc/config/arm/linux-elf.h
226+
--- src/gcc/gcc/config/arm/linux-elf.h
227+
+++ src/gcc/gcc/config/arm/linux-elf.h
228228
@@ -62,16 +62,16 @@
229229

230230
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
@@ -246,8 +246,8 @@
246246

247247
#undef LINK_SPEC
248248
#define LINK_SPEC LINUX_TARGET_LINK_SPEC
249-
--- src/gcc-14.2.0/gcc/config/i386/gnu-user64.h
250-
+++ src/gcc-14.2.0/gcc/config/i386/gnu-user64.h
249+
--- src/gcc/gcc/config/i386/gnu-user64.h
250+
+++ src/gcc/gcc/config/i386/gnu-user64.h
251251
@@ -52,19 +52,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
252252
%{" SPEC_X32 ":--x32} \
253253
%{msse2avx:%{!mavx:-msse2avx}}"
@@ -276,8 +276,8 @@
276276

277277
#undef LINK_SPEC
278278
#define LINK_SPEC GNU_USER_TARGET_LINK_SPEC
279-
--- src/gcc-14.2.0/gcc/config/i386/linux-common.h
280-
+++ src/gcc-14.2.0/gcc/config/i386/linux-common.h
279+
--- src/gcc/gcc/config/i386/linux-common.h
280+
+++ src/gcc/gcc/config/i386/linux-common.h
281281
@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3. If not see
282282
#undef LINK_SPEC
283283
#define LINK_SPEC \
@@ -287,8 +287,8 @@
287287

288288
#undef LIB_SPEC
289289
#define LIB_SPEC \
290-
--- src/gcc-14.2.0/gcc/config/i386/linux.h
291-
+++ src/gcc-14.2.0/gcc/config/i386/linux.h
290+
--- src/gcc/gcc/config/i386/linux.h
291+
+++ src/gcc/gcc/config/i386/linux.h
292292
@@ -19,8 +19,11 @@ You should have received a copy of the GNU General Public License
293293
along with GCC; see the file COPYING3. If not see
294294
<http://www.gnu.org/licenses/>. */
@@ -302,8 +302,8 @@
302302

303303
#undef MUSL_DYNAMIC_LINKER
304304
#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
305-
--- src/gcc-14.2.0/gcc/config/i386/linux64.h
306-
+++ src/gcc-14.2.0/gcc/config/i386/linux64.h
305+
--- src/gcc/gcc/config/i386/linux64.h
306+
+++ src/gcc/gcc/config/i386/linux64.h
307307
@@ -23,13 +23,15 @@ a copy of the GCC Runtime Library Exception along with this program;
308308
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
309309
<http://www.gnu.org/licenses/>. */
@@ -323,8 +323,8 @@
323323

324324
#undef MUSL_DYNAMIC_LINKER32
325325
#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
326-
--- src/gcc-14.2.0/gcc/config/linux-android.h
327-
+++ src/gcc-14.2.0/gcc/config/linux-android.h
326+
--- src/gcc/gcc/config/linux-android.h
327+
+++ src/gcc/gcc/config/linux-android.h
328328
@@ -35,7 +35,7 @@
329329
"%{" NOANDROID "|tno-android-cc:" LINUX_SPEC ";:" ANDROID_SPEC "}"
330330

@@ -334,8 +334,8 @@
334334

335335
#define ANDROID_LINK_SPEC \
336336
"%{shared: -Bsymbolic}"
337-
--- src/gcc-14.2.0/gcc/config/linux.h
338-
+++ src/gcc-14.2.0/gcc/config/linux.h
337+
--- src/gcc/gcc/config/linux.h
338+
+++ src/gcc/gcc/config/linux.h
339339
@@ -27,6 +27,8 @@ a copy of the GCC Runtime Library Exception along with this program;
340340
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
341341
<http://www.gnu.org/licenses/>. */
@@ -385,8 +385,8 @@
385385
# undef INCLUDE_DEFAULTS_MUSL_CROSS
386386
# define INCLUDE_DEFAULTS_MUSL_CROSS
387387
#endif
388-
--- src/gcc-14.2.0/gcc/cppdefault.cc
389-
+++ src/gcc-14.2.0/gcc/cppdefault.cc
388+
--- src/gcc/gcc/cppdefault.cc
389+
+++ src/gcc/gcc/cppdefault.cc
390390
@@ -23,15 +23,13 @@
391391
#include "coretypes.h"
392392
#include "tm.h"
@@ -425,17 +425,17 @@
425425
#endif
426426
{ 0, 0, 0, 0, 0, 0 }
427427
};
428-
--- src/gcc-14.2.0/gcc/gcc.cc
429-
+++ src/gcc-14.2.0/gcc/gcc.cc
430-
@@ -47,6 +47,7 @@ compilation is specified by a string called a "spec". */
431-
#include "opts-jobserver.h"
428+
--- src/gcc/gcc/gcc.cc 2024-11-22 23:52:07.605751246 +0300
429+
+++ src/gcc/gcc/gcc.cc.patch 2024-11-23 00:09:51.505136358 +0300
430+
@@ -51,6 +51,7 @@ compilation is specified by a string cal
432431
#include "common/common-target.h"
433432
#include "gcc-urlifier.h"
433+
#include "opts-diagnostic.h"
434434
+#include "cgct-app-prefix.h"
435435

436436
#ifndef MATH_LIBRARY
437437
#define MATH_LIBRARY "m"
438-
@@ -1603,11 +1604,10 @@ static const char *gcc_libexec_prefix;
438+
@@ -1607,11 +1608,10 @@ static const char *gcc_libexec_prefix;
439439

440440
/* Default prefixes to attach to command names. */
441441

@@ -451,7 +451,7 @@
451451
#endif
452452

453453
#ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */
454-
@@ -1644,10 +1644,10 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
454+
@@ -1648,10 +1648,10 @@ static const char *const standard_startf
455455
static const char *md_exec_prefix = MD_EXEC_PREFIX;
456456
static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
457457
static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
@@ -466,7 +466,7 @@
466466

467467
/* A relative path to be used in finding the location of tools
468468
relative to the driver. */
469-
@@ -4849,6 +4849,8 @@ process_command (unsigned int decoded_options_count,
469+
@@ -4876,6 +4876,8 @@ process_command (unsigned int decoded_op
470470
that are lists of directory names with colons. */
471471

472472
temp = env.get ("COMPILER_PATH");
@@ -475,7 +475,7 @@
475475
if (temp)
476476
{
477477
const char *startp, *endp;
478-
@@ -8554,7 +8556,7 @@ driver::set_up_specs () const
478+
@@ -8569,7 +8571,7 @@ driver::set_up_specs () const
479479
}
480480
/* We should eventually get rid of all these and stick to
481481
startfile_prefix_spec exclusively. */
@@ -484,7 +484,7 @@
484484
{
485485
if (*md_startfile_prefix)
486486
add_sysrooted_prefix (&startfile_prefixes, md_startfile_prefix,
487-
@@ -8575,7 +8577,7 @@ driver::set_up_specs () const
487+
@@ -8590,7 +8592,7 @@ driver::set_up_specs () const
488488
add_sysrooted_prefix (&startfile_prefixes,
489489
standard_startfile_prefix, "BINUTILS",
490490
PREFIX_PRIORITY_LAST, 0, 1);
@@ -493,7 +493,7 @@
493493
{
494494
add_prefix (&startfile_prefixes,
495495
concat (gcc_exec_prefix
496-
@@ -8587,13 +8589,15 @@ driver::set_up_specs () const
496+
@@ -8602,13 +8604,15 @@ driver::set_up_specs () const
497497

498498
/* Sysrooted prefixes are relocated because target_system_root is
499499
also relocated by gcc_exec_prefix. */

0 commit comments

Comments
 (0)