diff options
author | Nils Wallménius <nils@rockbox.org> | 2013-05-14 21:32:20 +0200 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2013-06-15 21:01:26 +0200 |
commit | 084c75e5f9c5d7de14c20e4bb6330745fbd02a46 (patch) | |
tree | b1b0a2ccaa19d370a636a0b15ae8b75c2eb67267 | |
parent | ab56afefc13ccdce382183b122a6be7afe0e4fa0 (diff) | |
download | rockbox-084c75e5f9c5d7de14c20e4bb6330745fbd02a46.tar.gz rockbox-084c75e5f9c5d7de14c20e4bb6330745fbd02a46.zip |
Fix building of sh, arm and m68k toolchains with new texinfo
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>
-rwxr-xr-x | tools/rockboxdev.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index 996aa86aea..7a43be0a96 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -140,11 +140,11 @@ build() { | |||
140 | fi | 140 | fi |
141 | 141 | ||
142 | # download patch | 142 | # download patch |
143 | if test -n "$patch"; then | 143 | for p in $patch; do |
144 | if test ! -f "$dlwhere/$patch"; then | 144 | if test ! -f "$dlwhere/$p"; then |
145 | getfile "$patch" "$patch_url" | 145 | getfile "$p" "$patch_url" |
146 | fi | 146 | fi |
147 | fi | 147 | done |
148 | 148 | ||
149 | cd $builddir | 149 | cd $builddir |
150 | 150 | ||
@@ -152,18 +152,18 @@ build() { | |||
152 | tar xjf $dlwhere/$file | 152 | tar xjf $dlwhere/$file |
153 | 153 | ||
154 | # do we have a patch? | 154 | # do we have a patch? |
155 | if test -n "$patch"; then | 155 | for p in $patch; do |
156 | echo "ROCKBOXDEV: applying patch $patch" | 156 | echo "ROCKBOXDEV: applying patch $p" |
157 | 157 | ||
158 | # apply the patch | 158 | # apply the patch |
159 | (cd $builddir/$toolname-$version && patch -p1 < "$dlwhere/$patch") | 159 | (cd $builddir/$toolname-$version && patch -p1 < "$dlwhere/$p") |
160 | 160 | ||
161 | # check if the patch applied cleanly | 161 | # check if the patch applied cleanly |
162 | if [ $? -gt 0 ]; then | 162 | if [ $? -gt 0 ]; then |
163 | echo "ROCKBOXDEV: failed to apply patch $patch" | 163 | echo "ROCKBOXDEV: failed to apply patch $p" |
164 | exit | 164 | exit |
165 | fi | 165 | fi |
166 | fi | 166 | done |
167 | 167 | ||
168 | # kludge to avoid having to install GMP, MPFR and MPC, for new gcc | 168 | # kludge to avoid having to install GMP, MPFR and MPC, for new gcc |
169 | if test -n "$needs_libs"; then | 169 | if test -n "$needs_libs"; then |
@@ -361,7 +361,7 @@ do | |||
361 | # default rule for Objective C. Disable the builtin make rules. See | 361 | # default rule for Objective C. Disable the builtin make rules. See |
362 | # http://sourceware.org/ml/binutils/2005-12/msg00259.html | 362 | # http://sourceware.org/ml/binutils/2005-12/msg00259.html |
363 | export MAKEFLAGS="-r $MAKEFLAGS" | 363 | export MAKEFLAGS="-r $MAKEFLAGS" |
364 | build "binutils" "sh-elf" "2.16.1" "" "--disable-werror" | 364 | build "binutils" "sh-elf" "2.16.1" "binutils-2.16.1-texinfo-fix.diff" "--disable-werror" |
365 | build "gcc" "sh-elf" "4.0.3" "gcc-4.0.3-rockbox-1.diff" | 365 | build "gcc" "sh-elf" "4.0.3" "gcc-4.0.3-rockbox-1.diff" |
366 | ;; | 366 | ;; |
367 | 367 | ||
@@ -375,8 +375,8 @@ do | |||
375 | ;; | 375 | ;; |
376 | 376 | ||
377 | [Mm]) | 377 | [Mm]) |
378 | build "binutils" "m68k-elf" "2.20.1" "" "--disable-werror" | 378 | build "binutils" "m68k-elf" "2.20.1" "binutils-2.20.1-texinfo-fix.diff" "--disable-werror" |
379 | build "gcc" "m68k-elf" "4.5.2" "" "--with-arch=cf" "gmp mpfr mpc" | 379 | build "gcc" "m68k-elf" "4.5.2" "" "--with-arch=cf MAKEINFO=missing" "gmp mpfr mpc" |
380 | ;; | 380 | ;; |
381 | 381 | ||
382 | [Aa]) | 382 | [Aa]) |
@@ -388,8 +388,8 @@ do | |||
388 | gccopts="--disable-nls" | 388 | gccopts="--disable-nls" |
389 | ;; | 389 | ;; |
390 | esac | 390 | esac |
391 | build "binutils" "arm-elf-eabi" "2.20.1" "binutils-2.20.1-ld-thumb-interwork-long-call.diff" "$binopts --disable-werror" | 391 | 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" |
392 | build "gcc" "arm-elf-eabi" "4.4.4" "rockbox-multilibs-noexceptions-arm-elf-eabi-gcc-4.4.2_1.diff" "$gccopts" "gmp mpfr" | 392 | 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" |
393 | ;; | 393 | ;; |
394 | [Rr]) | 394 | [Rr]) |
395 | build_ctng "ypr0" "alsalib.tar.gz" "arm" "linux-gnueabi" | 395 | build_ctng "ypr0" "alsalib.tar.gz" "arm" "linux-gnueabi" |