diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-05-30 15:11:17 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-05-30 15:11:17 +0000 |
| commit | 0f5aa2068a595ba20b2c09f092643a4fc4a88c02 (patch) | |
| tree | b8e0e275ea66d43b68070ce41e8d4cd74288372a | |
| parent | 37e9858736cfc816cdba9fceb03cafa0f8abc43d (diff) | |
| download | midipix_build-0f5aa2068a595ba20b2c09f092643a4fc4a88c02.tar.bz2 midipix_build-0f5aa2068a595ba20b2c09f092643a4fc4a88c02.tar.xz | |
patches/gcc.local.patch: removed (merged upstream.)
patches/gcc_stage1_cross_x86_64_w64_mingw32.local.patch: reintroduce patch deleted in <17e78c61e7677341ec4b3787abbe857bb2b6da26>.
vars/gcc.vars: always apply ${PKG_NAME}.local.patch if it exists.
| -rw-r--r-- | patches/gcc.local.patch | 20 | ||||
| -rw-r--r-- | patches/gcc_stage1_cross_x86_64_w64_mingw32.local.patch | 11 | ||||
| -rw-r--r-- | vars/gcc.vars | 4 |
3 files changed, 14 insertions, 21 deletions
diff --git a/patches/gcc.local.patch b/patches/gcc.local.patch deleted file mode 100644 index 00755c22..00000000 --- a/patches/gcc.local.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 new file mode 100644 index 00000000..cad19b20 --- /dev/null +++ b/patches/gcc_stage1_cross_x86_64_w64_mingw32.local.patch @@ -0,0 +1,11 @@ +--- 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/vars/gcc.vars b/vars/gcc.vars index f412c51e..684a64d2 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -101,7 +101,9 @@ pkg_gcc_stage1_all() { 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"; + if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then + patch -b -d "${WORKDIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch"; + fi; set_build_script_done "${PKG_NAME}" patch -configure; fi; pkgp_gcc_setup_env "${PKG_GCC_VERSION}"; |