summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/rockboxdev.sh77
-rw-r--r--tools/toolchain-patches/crosstool-ng-1.13.2.diff13
2 files changed, 1 insertions, 89 deletions
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index 8ff5d1734c..f5283f9c90 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -189,10 +189,6 @@ gettool() {
189 url="$GNU_MIRROR/glibc" 189 url="$GNU_MIRROR/glibc"
190 ;; 190 ;;
191 191
192 crosstool-ng)
193 url="http://crosstool-ng.org/download/crosstool-ng"
194 ;;
195
196 alsa-lib) 192 alsa-lib)
197 url="ftp://ftp.alsa-project.org/pub/lib" 193 url="ftp://ftp.alsa-project.org/pub/lib"
198 ;; 194 ;;
@@ -474,16 +470,7 @@ build() {
474 cd build-$toolname 470 cd build-$toolname
475 471
476 echo "ROCKBOXDEV: $toolname/configure" 472 echo "ROCKBOXDEV: $toolname/configure"
477 case $toolname in 473 CFLAGS='-U_FORTIFY_SOURCE -fgnu89-inline -fcommon' CXXFLAGS='-std=gnu++03' ../$toolname-$version/configure --target=$target --prefix=$prefix --enable-languages=c --disable-libssp --disable-docs $configure_params
478 crosstool-ng) # ct-ng doesnt support out-of-tree build and the src folder is named differently
479 toolname="crosstool-ng"
480 cp -r ../$toolname-$version/* ../$toolname-$version/.version .
481 ./configure --prefix=$prefix $configure_params
482 ;;
483 *)
484 CFLAGS='-U_FORTIFY_SOURCE -fgnu89-inline -fcommon' CXXFLAGS='-std=gnu++03' ../$toolname-$version/configure --target=$target --prefix=$prefix --enable-languages=c --disable-libssp --disable-docs $configure_params
485 ;;
486 esac
487 474
488 echo "ROCKBOXDEV: $toolname/make" 475 echo "ROCKBOXDEV: $toolname/make"
489 $make $make_parallel 476 $make $make_parallel
@@ -496,68 +483,6 @@ build() {
496 rm -rf build-$toolname $toolname-$version 483 rm -rf build-$toolname $toolname-$version
497} 484}
498 485
499make_ctng() {
500 if test -f "`which ct-ng 2>/dev/null`"; then
501 ctng="ct-ng"
502 else
503 ctng=""
504 fi
505
506 if test ! -n "$ctng"; then
507 if test ! -f "$prefix/bin/ct-ng"; then # look if we build it already
508 build "crosstool-ng" "" "1.13.2" "crosstool-ng-1.13.2.diff"
509 fi
510 fi
511 ctng=`PATH=$prefix/bin:$PATH which ct-ng`
512}
513
514build_ctng() {
515 ctng_target="$1"
516 extra="$2"
517 tc_arch="$3"
518 tc_host="$4"
519
520 make_ctng
521
522 dlurl="http://www.rockbox.org/gcc/$ctng_target"
523
524 # download
525 getfile "ct-ng-config" "$dlurl"
526
527 test -n "$extra" && getfile "$extra" "$dlurl"
528
529 # create build directory
530 if test -d $builddir; then
531 if test ! -w $builddir; then
532 echo "ROCKBOXDEV: No write permission for $builddir"
533 exit
534 fi
535 else
536 mkdir -p $builddir
537 fi
538
539 # copy config and cd to $builddir
540 mkdir $builddir/build-$ctng_target
541 ctng_config="$builddir/build-$ctng_target/.config"
542 cat "$dlwhere/ct-ng-config" | sed -e "s,\(CT_PREFIX_DIR=\).*,\1$prefix," > $ctng_config
543 cd $builddir/build-$ctng_target
544
545 $ctng "build"
546
547 # install extras
548 if test -e "$dlwhere/$extra"; then
549 # verify the toolchain has sysroot support
550 if test -n `cat $ctng_config | grep CT_USE_SYSROOT\=y`; then
551 sysroot=`cat $ctng_config | grep CT_SYSROOT_NAME | sed -e 's,CT_SYSROOT_NAME\=\"\([a-zA-Z0-9]*\)\",\1,'`
552 tar xf "$dlwhere/$extra" -C "$prefix/$tc_arch-$ctng_target-$tc_host/$sysroot"
553 fi
554 fi
555
556 # cleanup
557 cd $builddir
558 rm -rf $builddir/build-$ctng_target
559}
560
561# build a cross compiler toolchain for linux 486# build a cross compiler toolchain for linux
562# $1=target 487# $1=target
563# $2=binutils version 488# $2=binutils version
diff --git a/tools/toolchain-patches/crosstool-ng-1.13.2.diff b/tools/toolchain-patches/crosstool-ng-1.13.2.diff
deleted file mode 100644
index f8b13a2794..0000000000
--- a/tools/toolchain-patches/crosstool-ng-1.13.2.diff
+++ /dev/null
@@ -1,13 +0,0 @@
1--- a/Makefile.in 2014-07-30 14:16:57.989859205 +0200
2+++ b/Makefile.in 2014-07-30 14:16:52.133836316 +0200
3@@ -26,7 +26,11 @@
4 # '-Rr' to MAKEFLAGS adds it literaly ( and does not add 'Rr' )
5 ifeq ($(filter Rr,$(MAKEFLAGS)),)
6 ifeq ($(filter -Rr,$(MAKEFLAGS)),)
7+ifeq ($(filter -rR,$(MAKEFLAGS)),)
8+ifeq ($(filter rR,$(MAKEFLAGS)),)
9 CT_MAKEFLAGS += -Rr
10+endif # No rR
11+endif # No -rR
12 endif # No -Rr
13 endif # No Rr