From 17e78c61e7677341ec4b3787abbe857bb2b6da26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Mon, 29 May 2017 13:47:08 +0000 Subject: patches/gcc.local.patch: fix cbb-gcc-4.6.4/gcc/doc/gcc.texi when building w/ GNU texinfo v6.3+ (via Redfoxmoon & rqou.) patches/gcc_stage1_{cross,native}_x86_64_w64_mingw32.local.patch: removes obsolete patch. vars/gcc.vars: apply patches/gcc.local.patch during pkg_gcc_stage1_all(). --- vars/gcc.vars | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'vars/gcc.vars') 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 \ -- cgit v1.2.3