Skip to content

Commit

Permalink
Add Nick Clifton's binutils patch for 2.34 regression and move back t…
Browse files Browse the repository at this point in the history
…o binutils 2.34 by default - https://sourceware.org/bugzilla/show_bug.cgi?id=25993#c4

Thanks to William Pierce for bisecting.

Fixes https://github.com/Tk-Glitch/PKGBUILDS/issues/501 with mostlyportable when using binutils 2.34
  • Loading branch information
Tk-Glitch committed May 16, 2020
1 parent d70de91 commit 54890d1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mostlyportable-gcc.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ _gmp=6.2.0
_mpfr=4.0.2
_mpc=1.1.0
_isl=0.22.1
_binutils=2.33.1
_binutils=2.34

# Optionally enable libelf (requires libmicrohttpd)
_enable_libelf="false"
Expand Down
10 changes: 10 additions & 0 deletions mostlyportable-gcc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,16 @@ _nowhere="$PWD"
echo -e "# Proton binutils patches applied" >> "$_nowhere"/last_build_config.log
fi

# binutils 2.34 fix - https://sourceware.org/bugzilla/show_bug.cgi?id=25993#c4
if [[ "$_binutils" = 2.34* ]]; then
if [ ! -e "${_nowhere}/build/binutils234.binutilspatch" ]; then
cd "${_nowhere}"/build && wget -c -O binutils234.binutilspatch https://sourceware.org/bugzilla/attachment.cgi?id=12545
fi
cd "${_nowhere}"/build/binutils-"${_binutils}"
patch -Np1 < "${_nowhere}"/build/binutils234.binutilspatch
echo -e "# Binutils 2.34 fix applied" >> "$_nowhere"/last_build_config.log
fi

}

_makeandinstall() {
Expand Down
2 changes: 1 addition & 1 deletion mostlyportable-mingw.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ _mpc=1.1.0
_osl=0.9.2
_isl=0.22
_cloog=0.20.0
_binutils=2.33.1
_binutils=2.34

# Optionally enable libelf (requires libmicrohttpd)
_enable_libelf="false"
Expand Down

0 comments on commit 54890d1

Please sign in to comment.