Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
guyutongxue committed May 9, 2024
1 parent 41cddd6 commit 4774376
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 16 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ At the moment, successfully building the following versions:
gcc-12.3.0
gcc-13.1.0
gcc-13.2.0
gcc-14.1.0
gcc-4.6-branch (currently 4.6.5 prerelease)
gcc-4.7-branch (currently 4.7.5 prerelease)
gcc-4.8-branch (currently 4.8.6 prerelease)
Expand All @@ -149,7 +150,8 @@ At the moment, successfully building the following versions:
gcc-11-branch (currently 11.4.1-prerelease)
gcc-12-branch (currently 12.3.1-prerelease)
gcc-13-branch (currently 13.2.1-prerelease)
gcc-trunk (currently 14.0.0 snapshot)
gcc-14-branch (currently 14.1.1-prerelease)
gcc-trunk (currently 15.0.0 snapshot)
```

Builds also contains patches for building Python 2.7.9 and 3.4.3 versions for support gdb pretty printers.
Expand Down
20 changes: 11 additions & 9 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@ readonly RUN_ARGS="$@"
echo " gcc-13.1.0 (13.1.0 release)"
echo " gcc-13.2.0 (13.2.0 release)"
echo " gcc-13-branch (currently 13.2.1-prerelease)"
echo " gcc-trunk (currently 14.0.0-snapshot)"
echo " gcc-14.1.0 (14.1.0 release)"
echo " gcc-14-branch (currently 14.1.1-prerelease)"
echo " gcc-trunk (currently 15.0.0-snapshot)"

exit 0
}
Expand Down Expand Up @@ -310,14 +312,14 @@ while [[ $# > 0 ]]; do
RUNTIME_VERSION=v9
RUNTIME_BRANCH="v9.x"
;;
v10)
RUNTIME_VERSION=v10
RUNTIME_BRANCH="v10.x"
;;
v11)
RUNTIME_VERSION=v11
RUNTIME_BRANCH="v11.x"
;;
v10)
RUNTIME_VERSION=v10
RUNTIME_BRANCH="v10.x"
;;
v11)
RUNTIME_VERSION=v11
RUNTIME_BRANCH="v11.x"
;;
trunk)
RUNTIME_VERSION=v12
RUNTIME_BRANCH="master"
Expand Down
14 changes: 14 additions & 0 deletions patches/Python3/0200-launcher-permissive-c-error-on-gcc14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/PC/launcher.c b/PC/launcher.c
index 09ac7d902c..f97648cbf7 100644
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -1,3 +1,9 @@
+#if defined __GNUC__ && __GNUC__ >= 14
+#pragma GCC diagnostic warning "-Wimplicit-function-declaration"
+#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
+#pragma GCC diagnostic warning "-Wint-conversion"
+#pragma GCC diagnostic warning "-Wreturn-mismatch"
+#endif
/*
* Copyright (C) 2011-2013 Vinay Sajip.
* Licensed to PSF under a contributor agreement.
13 changes: 13 additions & 0 deletions patches/termcap/01-makefile-no-cflags-set.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/Makefile.in b/Makefile.2.in
index 66e5d02..dd26354 100644
--- a/Makefile.in
+++ b/Makefile.2.in
@@ -31,7 +31,7 @@ MAKEINFO = makeinfo

DEFS = @DEFS@ -DTERMCAP_FILE=\"$(termcapfile)\"

-CFLAGS = -g
+CFLAGS = @CFLAGS@

prefix = @prefix@
exec_prefix = @exec_prefix@
3 changes: 2 additions & 1 deletion scripts/python-3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ PKG_EXECUTE_AFTER_UNCOMPRESS=(

PKG_PATCHES=(
Python3/python-3.11-remove-WASM_STDLIB-target.patch
Python3/0200-launcher-permissive-c-error-on-gcc14.patch
)

#
Expand Down Expand Up @@ -103,7 +104,7 @@ PKG_CONFIGURE_FLAGS=(
#
LIBFFI_INCLUDEDIR="$LIBSW_DIR/include"
PKG_CONFIG_PATH="$PREREQ_DIR/$BUILD_ARCHITECTURE-zlib-$LINK_TYPE_SUFFIX/lib/pkgconfig:$LIBS_DIR/lib/pkgconfig"
CFLAGS="$COMMON_CFLAGS $MY_CPPFLAGS -D__USE_MINGW_ANSI_STDIO=1 -DNCURSES_STATIC"
CFLAGS="$COMMON_CFLAGS $MY_CPPFLAGS -D__USE_MINGW_ANSI_STDIO=1 -DNCURSES_STATIC -fpermissive"
CPPFLAGS="$COMMON_CPPFLAGS $MY_CPPFLAGS -D__USE_MINGW_ANSI_STDIO=1 -DNCURSES_STATIC"
LDFLAGS="$COMMON_LDFLAGS -L$PREREQW_DIR/$BUILD_ARCHITECTURE-zlib-$LINK_TYPE_SUFFIX/lib -L$LIBSW_DIR/lib"
LIBS="\"-lffi -ltcl -ltk -lole32 -loleaut32 -luuid\""
Expand Down
12 changes: 7 additions & 5 deletions scripts/termcap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ PKG_PRIORITY=extra

#

PKG_PATCHES=()
PKG_PATCHES=(
termcap/01-makefile-no-cflags-set.patch
)

#

Expand All @@ -58,10 +60,10 @@ PKG_CONFIGURE_FLAGS=(
#
--prefix=$LIBS_DIR
#
# CFLAGS="\"$COMMON_CFLAGS -D__USE_MINGW_ANSI_STDIO=1\""
# CXXFLAGS="\"$COMMON_CXXFLAGS\""
# CPPFLAGS="\"$COMMON_CPPFLAGS\""
# LDFLAGS="\"$COMMON_LDFLAGS\""
CFLAGS="$COMMON_CFLAGS -Wno-error=implicit-function-declaration"
CXXFLAGS="$COMMON_CXXFLAGS"
CPPFLAGS="$COMMON_CPPFLAGS"
LDFLAGS="$COMMON_LDFLAGS"
)

#
Expand Down
1 change: 1 addition & 0 deletions tests/time_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <time.h>
#include <errno.h>
#include <windows.h>
#include <process.h>

#define POW10_3 1000
#define POW10_6 1000000
Expand Down

0 comments on commit 4774376

Please sign in to comment.