sortix-mirror/ports/gcc/gcc.patch

41 lines
2.0 KiB
Diff

diff --no-dereference -Naur -- gcc.normalized/gcc/Makefile.in gcc.srctix/gcc/Makefile.in
--- gcc.normalized/gcc/Makefile.in 2015-11-23 01:29:00.000000000 +0100
+++ gcc.srctix/gcc/Makefile.in 2021-07-19 00:47:48.549925061 +0200
@@ -748,7 +748,10 @@
CC_FOR_BUILD = @CC_FOR_BUILD@
CXX_FOR_BUILD = @CXX_FOR_BUILD@
BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE
-BUILD_CXXFLAGS = @BUILD_CXXFLAGS@ -DGENERATOR_FILE
+# PATCH: genautomata can crash by https://gitlab.com/sortix/sortix/-/issues/740
+# since it uses pthread_create and pulls in operator new via vec.h under
+# some circumstances, so disable exceptions.
+BUILD_CXXFLAGS = @BUILD_CXXFLAGS@ -DGENERATOR_FILE -fno-exceptions
# Native compiler that we use. This may be C++ some day.
COMPILER_FOR_BUILD = $(CXX_FOR_BUILD)
diff --no-dereference -Naur -- gcc.normalized/post-install.sortix gcc.srctix/post-install.sortix
--- gcc.normalized/post-install.sortix 1970-01-01 01:00:00.000000000 +0100
+++ gcc.srctix/post-install.sortix 2019-04-17 23:19:45.665878206 +0200
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+tix-eradicate-libtool-la
+ln "$TIX_INSTALL_DIR$EXEC_PREFIX/bin/gcc" "$TIX_INSTALL_DIR$EXEC_PREFIX/bin/cc"
+ln "$TIX_INSTALL_DIR$EXEC_PREFIX/bin/$TARGET-gcc" "$TIX_INSTALL_DIR$EXEC_PREFIX/bin/$TARGET-cc"
diff --no-dereference -Naur -- gcc.normalized/tixbuildinfo gcc.srctix/tixbuildinfo
--- gcc.normalized/tixbuildinfo 1970-01-01 01:00:00.000000000 +0100
+++ gcc.srctix/tixbuildinfo 2021-07-19 21:58:52.786342665 +0200
@@ -0,0 +1,13 @@
+tix.version=1
+tix.class=srctix
+pkg.name=gcc
+pkg.build-libraries=libstdc++ libiconv? libgmp libmpfr libmpc libz
+pkg.build-system=configure
+pkg.configure.with-sysroot=true
+pkg.configure.with-sysroot-ld-bug=true
+pkg.configure.with-build-sysroot=true
+pkg.configure.args=--enable-languages=c,c++ --with-system-zlib
+pkg.configure.use-build-directory=true
+pkg.make.build-target=all-gcc all-target-libgcc
+pkg.make.install-target=install-gcc install-target-libgcc
+pkg.post-install.cmd=./post-install.sortix