Skip to content

Commit 55858d2

Browse files
committed
Split long shell script lines
1 parent 4281d21 commit 55858d2

9 files changed

+33
-11
lines changed

prepare-debian-ubuntu.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#!/bin/bash
22

33
# Install build dependencies
4-
sudo apt-get install $@ g++ build-essential autoconf automake cmake doxygen bison flex libncurses5-dev libsdl1.2-dev libreadline-dev libusb-dev texinfo libelf-dev libfreetype6-dev zlib1g-dev libtool libtool-bin subversion git tcl wget unzip bzip2 gzip xz-utils
4+
sudo apt-get install $@ g++ build-essential autoconf automake cmake doxygen \
5+
bison flex libncurses5-dev libsdl1.2-dev libreadline-dev libusb-dev texinfo \
6+
libelf-dev libfreetype6-dev zlib1g-dev libtool libtool-bin subversion git \
7+
tcl wget unzip bzip2 gzip xz-utils
58

69
# Make `/bin/sh` an alias for `/bin/bash` instead of `/bin/dash` - which is
710
# faster, but doesn't play nice with some autotools scripts in psp-ports.

scripts/001-binutils.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ cd build-psp
2222
CFLAGS="$CFLAGS -I/opt/local/include" \
2323
CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
2424
LDFLAGS="$LDFLAGS -L/opt/local/lib" \
25-
../configure --prefix="$PSPDEV" --target="psp" --enable-install-libbfd --enable-plugins --disable-werror --with-system-zlib
25+
../configure --prefix="$PSPDEV" --target="psp" --enable-install-libbfd \
26+
--enable-plugins --disable-werror --with-system-zlib
2627

2728
# Compile and install. ( -r is required for building under osx )
2829
make -j $(num_cpus) clean

scripts/002-gcc-stage1.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@
3535
cd build-psp
3636

3737
## Configure the build.
38-
CFLAGS="$CFLAGS -I/opt/local/include" CPPFLAGS="$CPPFLAGS -I/opt/local/include" LDFLAGS="$LDFLAGS -L/opt/local/lib" ../configure --prefix="$PSPDEV" --target="psp" --enable-languages="c" --enable-lto --with-newlib --without-headers --disable-libssp
38+
CFLAGS="$CFLAGS -I/opt/local/include" \
39+
CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
40+
LDFLAGS="$LDFLAGS -L/opt/local/lib" \
41+
../configure --prefix="$PSPDEV" --target="psp" --enable-languages="c" \
42+
--enable-lto --with-newlib --without-headers --disable-libssp
3943

4044
## Compile and install.
4145
make -j $(num_cpus) clean

scripts/003-pspsdk-stage1.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
./bootstrap
1515

1616
## Configure the build.
17-
CFLAGS="$CFLAGS -I/opt/local/include" CPPFLAGS="$CPPFLAGS -I/opt/local/include" LDFLAGS="$LDFLAGS -L/opt/local/lib" ./configure --with-pspdev="$PSPDEV"
17+
CFLAGS="$CFLAGS -I/opt/local/include" \
18+
CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
19+
LDFLAGS="$LDFLAGS -L/opt/local/lib" \
20+
./configure --with-pspdev="$PSPDEV"
1821

1922
## Build and install.
2023
make -j $(num_cpus) clean

scripts/004-newlib-1.20.0.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ clone_git_repo github.com pspdev newlib newlib-1_20_0-PSP
1616

1717
## Configure the build.
1818
../configure --prefix="$PSPDEV" --target="psp" \
19-
--enable-newlib-iconv \
20-
--enable-newlib-multithread \
21-
--enable-newlib-mb \
19+
--enable-newlib-iconv --enable-newlib-multithread --enable-newlib-mb
2220

2321
## Compile and install.
2422
make -j $(num_cpus) clean

scripts/005-gcc-stage2.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@
3737

3838
## Configure the build.
3939
## If you want to build gdc add "d" to --enable-languages option.
40-
CFLAGS="$CFLAGS -I/opt/local/include" CPPFLAGS="$CPPFLAGS -I/opt/local/include" LDFLAGS="$LDFLAGS -L/opt/local/lib" ../configure --prefix="$PSPDEV" --target="psp" --enable-languages="c,c++" --enable-lto --with-newlib --enable-cxx-flags="-G0"
40+
CFLAGS="$CFLAGS -I/opt/local/include" \
41+
CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
42+
LDFLAGS="$LDFLAGS -L/opt/local/lib" \
43+
../configure --prefix="$PSPDEV" --target="psp" --enable-languages="c,c++" \
44+
--enable-lto --with-newlib --enable-cxx-flags="-G0"
4145

4246
## Compile and install.
4347
make -j $(num_cpus) clean

scripts/006-pspsdk-stage2.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
./bootstrap
1515

1616
## Configure the build.
17-
CFLAGS="$CFLAGS -I/opt/local/include" CPPFLAGS="$CPPFLAGS -I/opt/local/include" LDFLAGS="$LDFLAGS -L/opt/local/lib" ./configure --with-pspdev="$PSPDEV"
17+
CFLAGS="$CFLAGS -I/opt/local/include" \
18+
CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
19+
LDFLAGS="$LDFLAGS -L/opt/local/lib" \
20+
./configure --with-pspdev="$PSPDEV"
1821

1922
## Build and install.
2023
make -j $(num_cpus) clean

scripts/007-gdb-7.3.1.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
cd build-psp
2020

2121
## Configure the build.
22-
CFLAGS="$CFLAGS -I/opt/local/include" CPPFLAGS="$CPPFLAGS -I/opt/local/include" LDFLAGS="$LDFLAGS -L/opt/local/lib" ../configure --prefix="$PSPDEV" --target="psp" --disable-werror --disable-nls
22+
CFLAGS="$CFLAGS -I/opt/local/include" \
23+
CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
24+
LDFLAGS="$LDFLAGS -L/opt/local/lib" \
25+
../configure --prefix="$PSPDEV" --target="psp" --disable-werror --disable-nls
2326

2427
## Compile and install.
2528
make -j $(num_cpus) clean

scripts/008-insight-6.8.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ exit;
1717
cd build-psp
1818

1919
## Configure the build.
20-
CFLAGS="$CFLAGS -I/opt/local/include" CPPFLAGS="$CPPFLAGS -I/opt/local/include" LDFLAGS="$LDFLAGS -L/opt/local/lib" ../configure --prefix="$PSPDEV" --target="psp" --disable-nls --disable-werror
20+
CFLAGS="$CFLAGS -I/opt/local/include" \
21+
CPPFLAGS="$CPPFLAGS -I/opt/local/include" \
22+
LDFLAGS="$LDFLAGS -L/opt/local/lib" \
23+
../configure --prefix="$PSPDEV" --target="psp" --disable-nls --disable-werror
2124

2225
## Compile and install.
2326
make -j $(num_cpus) clean

0 commit comments

Comments
 (0)