diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-05-29 13:47:08 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-05-29 13:47:08 +0000 |
| commit | 17e78c61e7677341ec4b3787abbe857bb2b6da26 (patch) | |
| tree | bf290580722c0b05fe3f18bd756b42c3554943b2 /vars | |
| parent | b5fc9d083da24deb76435692ba58fa332822dd65 (diff) | |
| download | midipix_build-17e78c61e7677341ec4b3787abbe857bb2b6da26.tar.bz2 midipix_build-17e78c61e7677341ec4b3787abbe857bb2b6da26.tar.xz | |
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().
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/gcc.vars | 7 |
1 files changed, 5 insertions, 2 deletions
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 \ |