Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix building of sh, arm and m68k toolchains with new texinfo

Browse source 
Recent versions of texinfo breaks various binutils and GCC
builds. For GCC setting MAKEINFO=missing at configure time works
but not for binutils where patches are used to fix parsing errors.
This also makes rockboxdev.sh handle applying multiple patches.

Change-Id: Ia8e6dc7662ab725490e4b4428676d235f0bd38bb
Reviewed-on: http://gerrit.rockbox.org/471
Reviewed-by: Nils Wallménius <nils@rockbox.org>
This commit is contained in:
Nils Wallménius 2013-05-14 21:32:20 +02:00
parent ab56afefc1
commit 084c75e5f9
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/rockboxdev.sh
View file

@ -140,11 +140,11 @@ build() {
fi fi
# download patch # download patch
if test -n "$patch"; then for p in $patch; do
if test ! -f "$dlwhere/$patch"; then if test ! -f "$dlwhere/$p"; then
getfile "$patch" "$patch_url" getfile "$p" "$patch_url"
fi fi
fi done
cd $builddir cd $builddir
@ -152,18 +152,18 @@ build() {
tar xjf $dlwhere/$file tar xjf $dlwhere/$file
# do we have a patch? # do we have a patch?
if test -n "$patch"; then for p in $patch; do
echo "ROCKBOXDEV: applying patch $patch" echo "ROCKBOXDEV: applying patch $p"
# apply the patch # apply the patch
(cd $builddir/$toolname-$version && patch -p1 < "$dlwhere/$patch") (cd $builddir/$toolname-$version && patch -p1 < "$dlwhere/$p")
# check if the patch applied cleanly # check if the patch applied cleanly
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
echo "ROCKBOXDEV: failed to apply patch $patch" echo "ROCKBOXDEV: failed to apply patch $p"
exit exit
fi fi
fi done
# kludge to avoid having to install GMP, MPFR and MPC, for new gcc # kludge to avoid having to install GMP, MPFR and MPC, for new gcc
if test -n "$needs_libs"; then if test -n "$needs_libs"; then
@ -361,7 +361,7 @@ do
# default rule for Objective C. Disable the builtin make rules. See # default rule for Objective C. Disable the builtin make rules. See
# http://sourceware.org/ml/binutils/2005-12/msg00259.html # http://sourceware.org/ml/binutils/2005-12/msg00259.html
export MAKEFLAGS="-r $MAKEFLAGS" export MAKEFLAGS="-r $MAKEFLAGS"
build "binutils" "sh-elf" "2.16.1" "" "--disable-werror" build "binutils" "sh-elf" "2.16.1" "binutils-2.16.1-texinfo-fix.diff" "--disable-werror"
build "gcc" "sh-elf" "4.0.3" "gcc-4.0.3-rockbox-1.diff" build "gcc" "sh-elf" "4.0.3" "gcc-4.0.3-rockbox-1.diff"
;; ;;
@ -375,8 +375,8 @@ do
;; ;;
[Mm]) [Mm])
build "binutils" "m68k-elf" "2.20.1" "" "--disable-werror" build "binutils" "m68k-elf" "2.20.1" "binutils-2.20.1-texinfo-fix.diff" "--disable-werror"
build "gcc" "m68k-elf" "4.5.2" "" "--with-arch=cf" "gmp mpfr mpc" build "gcc" "m68k-elf" "4.5.2" "" "--with-arch=cf MAKEINFO=missing" "gmp mpfr mpc"
;; ;;
[Aa]) [Aa])
@ -388,8 +388,8 @@ do
gccopts="--disable-nls" gccopts="--disable-nls"
;; ;;
esac esac
build "binutils" "arm-elf-eabi" "2.20.1" "binutils-2.20.1-ld-thumb-interwork-long-call.diff" "$binopts --disable-werror" build "binutils" "arm-elf-eabi" "2.20.1" "binutils-2.20.1-ld-thumb-interwork-long-call.diff binutils-2.20.1-texinfo-fix.diff" "$binopts --disable-werror"
build "gcc" "arm-elf-eabi" "4.4.4" "rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.4.2_1.diff" "$gccopts" "gmp mpfr" build "gcc" "arm-elf-eabi" "4.4.4" "rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.4.2_1.diff" "$gccopts MAKEINFO=missing" "gmp mpfr"
;; ;;
[Rr]) [Rr])
build_ctng "ypr0" "alsalib.tar.gz" "arm" "linux-gnueabi" build_ctng "ypr0" "alsalib.tar.gz" "arm" "linux-gnueabi"