commit f04341d18ba62e9cf29e8df04345df69ee1e5a03
parent 0e83f34cd6bc5b23ae7a9e4dcd3c2d27b36b6370
Author: Daniel Bainton <dpb@driftaway.org>
Date: Sat, 1 Mar 2014 01:45:56 +0200
Remove '|| return 1', mk returns for us on error
Diffstat:
28 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/pkgs/abduco b/pkgs/abduco
@@ -7,5 +7,5 @@ build: crossmusl
sed -i "s@INCS = -I. -I/usr/include -I/usr/local/include@INCS = -I. -I$libcroot/include@" config.mk
sed -i "s@LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}@LDFLAGS += $LDFLAGS ${LIBS} @" config.mk
sed -i "s@CC = cc@CC = $CC@" config.mk
- make || return 1
+ make
make DESTDIR="$root" install
diff --git a/pkgs/dvtm b/pkgs/dvtm
@@ -8,5 +8,5 @@ build: ncurses
sed -i "s@INCS = -I. -I/usr/include -I/usr/local/include@INCS = -I. -I$libcroot/include -I$libcroot/include/ncursesw@" config.mk
sed -i "s@LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}@LDFLAGS += $LDFLAGS @" config.mk
sed -i "s@CC = cc@CC = $CC@" config.mk
- make || return 1
+ make
make DESTDIR="$root" install
diff --git a/pkgs/dwm b/pkgs/dwm
@@ -8,5 +8,5 @@ build: tinyxlib
sed -i "s@X11LIB = /usr/X11R6/lib@X11LIB = $libcroot/lib @" config.mk
sed -i "s@LDFLAGS = -s ${LIBS}@LDFLAGS = $LDFLAGS ${LIBS} @" config.mk
sed -i "s@CC = cc@CC = $CC@" config.mk
- make || return 1
- make DESTDIR=${root} install || return 1
+ make
+ make DESTDIR=${root} install
diff --git a/pkgs/jupp b/pkgs/jupp
@@ -3,8 +3,8 @@ url="$mirror/joe-$v.tgz"
build: crossmusl
cd src/jupp
- CC=$CC sh configure --prefix="/" || return 1
- make || return 1
+ CC=$CC sh configure --prefix="/"
+ make
cp joe termidx "$root/bin"
mkdir -p "$root/share/man/man1"
cp joe.1 "$root/share/man/man1"
diff --git a/pkgs/kernel b/pkgs/kernel
@@ -5,7 +5,7 @@ build: crossmusl kernel_headers
cp $top/stuff/kernel-config .config
#make menuconfig
make oldconfig
- make bzImage -j$nprocs || return 1
+ make bzImage -j$nprocs
cp arch/x86/boot/bzImage "$root/boot"
cp .config "$root/boot/bzImage.config"
cp System.map "$root/boot"
diff --git a/pkgs/libevent b/pkgs/libevent
@@ -3,6 +3,6 @@ url="$mirror/libevent-$v-stable.tar.gz"
build: crossmusl
cd src/libevent-$v-stable
- CC="$CC -static" ./configure --prefix="$libcroot" --disable-shared --enable-static || return 1
- make -j$nprocs || return 1
- make install || return 1
+ CC="$CC -static" ./configure --prefix="$libcroot" --disable-shared --enable-static
+ make -j$nprocs
+ make install
diff --git a/pkgs/make b/pkgs/make
@@ -3,6 +3,6 @@ url="$mirror/make-$v.tar.bz2"
build: crossmusl
cd src/make-$v
- CC="$CC -static" ./configure --prefix="$root" --disable-nls || return 1
- make -j$nprocs || return 1
- make install || return 1
+ CC="$CC -static" ./configure --prefix="$root" --disable-nls
+ make -j$nprocs
+ make install
diff --git a/pkgs/man b/pkgs/man
@@ -2,5 +2,5 @@ url="$mirror/man.tar.gz"
build: crossmusl
cd src/man
- $CC -std=gnu99 -o man man.c -static || return 1
+ $CC -std=gnu99 -o man man.c -static
cp man "$root/bin"
diff --git a/pkgs/mksh b/pkgs/mksh
@@ -3,7 +3,7 @@ url="$mirror/mksh-$v.tar.gz"
build: crossmusl
cd src/mksh
- CC=$CC sh Build.sh || return 1
+ CC=$CC sh Build.sh
mkdir -p "$root/share/man/man1" "$root/share/man/cat1"
cp mksh "$root/bin"
cp mksh.1 "$root/share/man/man1/mksh.1"
diff --git a/pkgs/mpg123 b/pkgs/mpg123
@@ -4,6 +4,6 @@ url="$mirror/mpg123-$v.tar.bz2"
build: tinyalsa
cd src/mpg123-$v
CC=$CC ./configure --prefix="$root" --with-default-audio=tinyalsa \
- --enable-static=yes --enable-shared=no || return 1
- make || return 1
- make install || return 1
+ --enable-static=yes --enable-shared=no
+ make
+ make install
diff --git a/pkgs/ncurses b/pkgs/ncurses
@@ -7,9 +7,9 @@ build: crossmusl
CC="$CC -static" ./configure --prefix="${libcroot}" --mandir="$root/share" --without-tests \
--with-normal --enable-sigwinch --disable-nls --without-dlsym \
--without-cxx-binding --enable-widec \
- --with-fallbacks="linux vt100 xterm xterm256-color" </dev/ptmx || return 1
- make -j$nprocs || return 1
- make install || return 1
+ --with-fallbacks="linux vt100 xterm xterm256-color" </dev/ptmx
+ make -j$nprocs
+ make install
cd $root/lib
for lib in ncurses form panel menu ; do
ln -sf lib${lib}w_g.a lib${lib}_g.a
diff --git a/pkgs/rsync b/pkgs/rsync
@@ -3,6 +3,6 @@ url="$mirror/rsync-$v.tar.gz"
build: crossmusl
cd src/rsync-$v
- CC=$CC ./configure --prefix="$root" || return 1
- make -j$nprocs || return 1
- make install || return 1
+ CC=$CC ./configure --prefix="$root"
+ make -j$nprocs
+ make install
diff --git a/pkgs/sbase b/pkgs/sbase
@@ -3,5 +3,5 @@ git="git://git.2f30.org/sbase"
build: crossmusl
cd src/sbase
make clean
- make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS" || return 1
+ make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS"
make PREFIX="$root" install
diff --git a/pkgs/sdhcp b/pkgs/sdhcp
@@ -3,7 +3,7 @@ url="$mirror/sdhcp.tar.gz"
build: crossmusl
cd src/sdhcp
make clean
- make CC=$CC || return 1
- cp sdhcp "$root/bin" || return 1
+ make CC=$CC
+ cp sdhcp "$root/bin"
mkdir -p "$root/share/man/man8"
cp sdhcp.8 "$root/share/man/man8/sdhcp.8"
diff --git a/pkgs/sic b/pkgs/sic
@@ -3,5 +3,5 @@ url="$mirror/sic.tar.gz"
build: crossmusl
cd src/sic
make clean
- make CC=$CC LDFLAGS="$LDFLAGS" || return 1
+ make CC=$CC LDFLAGS="$LDFLAGS"
cp sic "$root/bin"
diff --git a/pkgs/sinit b/pkgs/sinit
@@ -3,7 +3,7 @@ git="git://git.2f30.org/sinit"
build: crossmusl
cd src/sinit
make clean
- make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS" || return 1
+ make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS"
make PREFIX="$root" install
cd "$root"
ln -sf /bin/sinit init
diff --git a/pkgs/smdev b/pkgs/smdev
@@ -3,5 +3,5 @@ git="git://git.2f30.org/smdev"
build: crossmusl
cd src/smdev
make clean
- make CC=$CC LDFLAGS="$LDFLAGS" || return 1
- make PREFIX="$root" install || return 1
+ make CC=$CC LDFLAGS="$LDFLAGS"
+ make PREFIX="$root" install
diff --git a/pkgs/terminus b/pkgs/terminus
@@ -4,9 +4,9 @@ url="$mirror/terminus-font-$v.tar.gz"
build: crossmusl
cd src/terminus-font-$v
sh configure --psfdir="$root/share/fonts/console" \
- --x11dir="$root/share/fonts/misc" || return 1
- make || return 1
- make DESTDIR=/ install || return 1
+ --x11dir="$root/share/fonts/misc"
+ make
+ make DESTDIR=/ install
cd "$root/share/fonts/misc"
gzip -d *.gz
mkfontscale
diff --git a/pkgs/tinyalsa b/pkgs/tinyalsa
@@ -3,7 +3,7 @@ url="$mirror/tinyalsa.tar.gz"
build: crossmusl
cd src/tinyalsa
make clean 2>/dev/null
- make CC=$CC || return 1
+ make CC=$CC
cp tinycap tinymix tinypcminfo tinyplay "$root/bin"
cp libtinyalsa.a "$root/lib"
cp -r include/tinyalsa "$root/include"
diff --git a/pkgs/tinywm b/pkgs/tinywm
@@ -1,4 +1,4 @@
build: tinyxlib
cd stuff
- $CC -I"$libcroot/include" -L"$libcroot/lib" tinywm.c -o tinywm -lX11 -static || return 1
+ $CC -I"$libcroot/include" -L"$libcroot/lib" tinywm.c -o tinywm -lX11 -static
cp tinywm "$root/bin"
diff --git a/pkgs/tinyxlib b/pkgs/tinyxlib
@@ -4,5 +4,5 @@ build: crossmusl
cd src/tinyxlib
make clean
make CC=$CC BINDIR="/bin" LIBDIR="/lib" STATIC=1 \
- FONT_ENCODINGS_DIRECTORY="/share/fonts/encodings/encodings.dir" || return 1
- make DESTDIR="$libcroot" BINDIR="/bin" LIBDIR="/lib" STATIC=1 install || return 1
+ FONT_ENCODINGS_DIRECTORY="/share/fonts/encodings/encodings.dir"
+ make DESTDIR="$libcroot" BINDIR="/bin" LIBDIR="/lib" STATIC=1 install
diff --git a/pkgs/tinyxserver b/pkgs/tinyxserver
@@ -4,8 +4,8 @@ build: tinyxlib zlib
cd src/tinyxserver
make clean
make CC=$CC EXTRA_CFLAGS="-D_XSERVER64=1 $CFLAGS" \
- FONTDIR="/usr/share/fonts" || return 1
- make DESTDIR="$root" BINDIR="/bin" install || return 1
+ FONTDIR="/usr/share/fonts"
+ make DESTDIR="$root" BINDIR="/bin" install
cd "$root/usr/share/fonts/misc"
mkfontscale
mkfontdir
diff --git a/pkgs/tmux b/pkgs/tmux
@@ -4,6 +4,6 @@ url="$mirror/tmux-$v.tar.gz"
build: ncurses libevent
cd src/tmux-$v
CC=$CC ./configure --prefix="$root" \
- CFLAGS="-I$libcroot/include/ncursesw $CFLAGS" || return 1
- make -j$nprocs || return 1
- make install || return 1
+ CFLAGS="-I$libcroot/include/ncursesw $CFLAGS"
+ make -j$nprocs
+ make install
diff --git a/pkgs/ubase b/pkgs/ubase
@@ -3,6 +3,6 @@ git="git://git.2f30.org/ubase"
build: crossmusl
cd src/ubase
make clean
- make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS" || return 1
- make PREFIX="$root" install || return 1
+ make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS"
+ make PREFIX="$root" install
chmod 4755 "$root/bin/su"
diff --git a/pkgs/uuterm b/pkgs/uuterm
@@ -3,5 +3,5 @@ url="$mirror/uuterm.tar.gz"
build: tinyxlib
cd src/uuterm
make clean
- make CC=$CC LDFLAGS_X11="$LDFLAGS" uuterm-x11 || return 1
+ make CC=$CC LDFLAGS_X11="$LDFLAGS" uuterm-x11
cp uuterm-x11 "$root/bin"
diff --git a/pkgs/vim b/pkgs/vim
@@ -6,6 +6,6 @@ build: ncurses
make clean
CC=$CC ./configure --prefix=/ \
--enable-multibyte --disable-gui --with-x=no \
- --disable-nls --disable-netbeans || return 1
- make -j$nprocs || return 1
- make DESTDIR="$root" install || return 1
+ --disable-nls --disable-netbeans
+ make -j$nprocs
+ make DESTDIR="$root" install
diff --git a/pkgs/xsetroot b/pkgs/xsetroot
@@ -1,4 +1,4 @@
build: tinyxlib
cd stuff
- $CC -I"$libcroot/include" -L"$libcroot/lib" xsetroot.c -o xsetroot -lX11 -static || return 1
+ $CC -I"$libcroot/include" -L"$libcroot/lib" xsetroot.c -o xsetroot -lX11 -static
cp xsetroot "$root/bin"
diff --git a/pkgs/zlib b/pkgs/zlib
@@ -3,6 +3,6 @@ url="$mirror/zlib-$v.tar.gz"
build: crossmusl
cd src/zlib-$v
- CC=$CC ./configure --prefix="$libcroot" --static || return 1
- make -j$nprocs || return 1
- make install || return 1
+ CC=$CC ./configure --prefix="$libcroot" --static
+ make -j$nprocs
+ make install
