summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--patches/gcc.local.patch20
-rw-r--r--patches/gcc_stage1_cross_x86_64_w64_mingw32.local.patch11
l---------patches/gcc_stage1_native_x86_64_w64_mingw32.local.patch1
-rw-r--r--vars/gcc.vars7
4 files changed, 25 insertions, 14 deletions
diff --git a/patches/gcc.local.patch b/patches/gcc.local.patch
new file mode 100644
index 00000000..00755c22
--- /dev/null
+++ b/patches/gcc.local.patch
@@ -0,0 +1,20 @@
+--- cbb-gcc-4.6.4/gcc/doc/gcc.texi.orig 2017-03-10 14:12:11.046714683 +0000
++++ cbb-gcc-4.6.4/gcc/doc/gcc.texi 2017-05-29 13:33:34.011012575 +0000
+@@ -86,9 +86,15 @@
+ @item GNU Press
+ @tab Website: www.gnupress.org
+ @item a division of the
+-@tab General: @tex press@@gnu.org @end tex
++@tab General:
++@tex
++press@@gnu.org
++@end tex
+ @item Free Software Foundation
+-@tab Orders: @tex sales@@gnu.org @end tex
++@tab Orders:
++@tex
++sales@@gnu.org
++@end tex
+ @item 51 Franklin Street, Fifth Floor
+ @tab Tel 617-542-5942
+ @item Boston, MA 02110-1301 USA
diff --git a/patches/gcc_stage1_cross_x86_64_w64_mingw32.local.patch b/patches/gcc_stage1_cross_x86_64_w64_mingw32.local.patch
deleted file mode 100644
index ac886cf2..00000000
--- a/patches/gcc_stage1_cross_x86_64_w64_mingw32.local.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cbb-gcc-4.6.4/libiberty/configure.ac.orig 2016-12-19 18:27:51.909364800 +0100
-+++ cbb-gcc-4.6.4/libiberty/configure.ac 2017-01-30 03:55:45.271150700 +0100
-@@ -683,7 +683,7 @@
-
- # Figure out which version of pexecute to use.
- case "${host}" in
-- *-*-mingw* | *-*-winnt*) pexecute=pex-win32 ;;
-+ *-*-winnt*) pexecute=pex-win32 ;;
- *-*-msdosdjgpp*) pexecute=pex-djgpp ;;
- *-*-msdos*) pexecute=pex-msdos ;;
- *) pexecute=pex-unix ;;
diff --git a/patches/gcc_stage1_native_x86_64_w64_mingw32.local.patch b/patches/gcc_stage1_native_x86_64_w64_mingw32.local.patch
deleted file mode 120000
index 2d07a41c..00000000
--- a/patches/gcc_stage1_native_x86_64_w64_mingw32.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-gcc_stage1_cross_x86_64_w64_mingw32.local.patch \ No newline at end of file
diff --git a/vars/gcc.vars b/vars/gcc.vars
index 1660334e..f412c51e 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -98,7 +98,11 @@ pkg_gcc_stage1_all() {
# GCC, stage1.
if ! is_build_script_done "${PKG_NAME}" fetch "${_restart_at}"; then
pkg_fetch -git "cbb-gcc-${PKG_GCC_VERSION}=${GITROOT}/cbb/cbb-gcc-${PKG_GCC_VERSION}";
- set_build_script_done "${PKG_NAME}" fetch -configure;
+ set_build_script_done "${PKG_NAME}" fetch -patch;
+ fi;
+ if ! is_build_script_done "${PKG_NAME}" patch "${_restart_at}"; then
+ patch -b -d "${WORKDIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/gcc.local.patch";
+ set_build_script_done "${PKG_NAME}" patch -configure;
fi;
pkgp_gcc_setup_env "${PKG_GCC_VERSION}";
if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then
@@ -118,7 +122,6 @@ pkg_gcc_stage1_all() {
--with-sysroot="${PREFIX}/${PKG_TARGET}"\
--without-headers; ;;
gcc_stage1_native_x86_64_w64_mingw32)
- patch -b -d "${WORKDIR}/cbb-gcc-4.6.4" -p1 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch";
pkgp_gcc_configure \
--build=x86_64-unknown-linux-gnu \
--enable-sjlj-exceptions \