File tree Expand file tree Collapse file tree 5 files changed +28
-7
lines changed Expand file tree Collapse file tree 5 files changed +28
-7
lines changed Original file line number Diff line number Diff line change
1
+ --- /automake.in 2017-12-18 12:26:59.455263520 +0100
2
+ +++ /automake.in 2017-12-18 12:27:21.228596603 +0100
3
+ @@ -4110,7 +4110,7 @@
4
+ sub substitute_ac_subst_variables ($)
5
+ {
6
+ my ($text) = @_;
7
+ - $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
8
+ + $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
9
+ return $text;
10
+ }
11
+
Original file line number Diff line number Diff line change 23
23
exit 1
24
24
fi
25
25
26
+ if [[ $CROSS_COMPILE == " mingw" ]] ; then
27
+ EXTRA_CONFARGS=" --host=i686-w64-mingw32"
28
+ fi
29
+
26
30
cd toolsdir/bin
27
31
TOOLS_BIN_PATH=` pwd`
28
32
cd -
@@ -63,7 +67,7 @@ CONFARGS=" \
63
67
--with-pic \
64
68
--target=avr"
65
69
66
- CFLAGS=" -w -O2 -g0 $CFLAGS " CXXFLAGS=" -w -O2 -g0 $CXXFLAGS " LDFLAGS=" -s $LDFLAGS " ../binutils/configure $CONFARGS
70
+ CFLAGS=" -w -O2 -g0 $CFLAGS " CXXFLAGS=" -w -O2 -g0 $CXXFLAGS " LDFLAGS=" -s $LDFLAGS " ../binutils/configure $CONFARGS $EXTRA_CONFARGS
67
71
68
72
if [ -z " $MAKE_JOBS " ]; then
69
73
MAKE_JOBS=" 2"
Original file line number Diff line number Diff line change @@ -63,11 +63,11 @@ pushd gcc
63
63
# cat avr-mcus.def | awk -f genmultilib.awk FORMAT="Makefile" > t-multilib
64
64
# popd
65
65
pushd gcc
66
- # for p in ../../avr-gcc-patches/*.patch
67
- # do
68
- # echo Applying $p
69
- # patch -p1 < $p
70
- # done
66
+ for p in ../../avr-gcc-patches/* .patch
67
+ do
68
+ echo Applying $p
69
+ patch -p1 < $p
70
+ done
71
71
autoconf
72
72
popd
73
73
popd
Original file line number Diff line number Diff line change @@ -27,6 +27,10 @@ cd toolsdir/bin
27
27
TOOLS_BIN_PATH=` pwd`
28
28
cd -
29
29
30
+ if [[ $CROSS_COMPILE == " mingw" ]] ; then
31
+ EXTRA_CONFARGS=" --host=i686-w64-mingw32"
32
+ fi
33
+
30
34
export PATH=" $TOOLS_BIN_PATH :$PATH "
31
35
32
36
if [[ ! -f avr-gdb.tar.bz2 ]] ;
@@ -59,7 +63,7 @@ CONFARGS=" \
59
63
--disable-binutils \
60
64
--target=avr"
61
65
62
- CFLAGS=" -w -O2 -g0 $CFLAGS " CXXFLAGS=" -w -O2 -g0 $CXXFLAGS " LDFLAGS=" -s $LDFLAGS " ../gdb/configure $CONFARGS
66
+ CFLAGS=" -w -O2 -g0 $CFLAGS " CXXFLAGS=" -w -O2 -g0 $CXXFLAGS " LDFLAGS=" -s $LDFLAGS " ../gdb/configure $CONFARGS $EXTRA_CONFARGS
63
67
64
68
if [ -z " $MAKE_JOBS " ]; then
65
69
MAKE_JOBS=" 2"
Original file line number Diff line number Diff line change @@ -58,6 +58,8 @@ tar xfjv automake-${AUTOMAKE_VERSION}.tar.bz2
58
58
59
59
cd automake-${AUTOMAKE_VERSION}
60
60
61
+ patch -p1 < ../automake-patches/0001-fix-perl-522.patch
62
+
61
63
./bootstrap
62
64
63
65
CONFARGS=" --prefix=$TOOLS_PATH "
You can’t perform that action at this time.
0 commit comments