atmos/morpheus
1
0
Fork 0
mirror of git://git.2f30.org/morpheus.git synced 2024-06-21 03:18:35 +00:00
Code Issues Releases Wiki Activity

Remove '|| return 1', mk returns for us on error

Browse Source
This commit is contained in:
Daniel Bainton 2014-03-01 01:45:56 +02:00
parent 0e83f34cd6
commit f04341d18b
28 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/abduco
View File

@ -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@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@LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}@LDFLAGS += $LDFLAGS ${LIBS} @" config.mk
sed -i "s@CC = cc@CC = $CC@" config.mk sed -i "s@CC = cc@CC = $CC@" config.mk
make || return 1 make
make DESTDIR="$root" install make DESTDIR="$root" install

2
pkgs/dvtm
View File

@ -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@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@LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}@LDFLAGS += $LDFLAGS @" config.mk
sed -i "s@CC = cc@CC = $CC@" config.mk sed -i "s@CC = cc@CC = $CC@" config.mk
make || return 1 make
make DESTDIR="$root" install make DESTDIR="$root" install

4
pkgs/dwm
View File

@ -8,5 +8,5 @@ build: tinyxlib
sed -i "s@X11LIB = /usr/X11R6/lib@X11LIB = $libcroot/lib @" config.mk 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@LDFLAGS = -s ${LIBS}@LDFLAGS = $LDFLAGS ${LIBS} @" config.mk
sed -i "s@CC = cc@CC = $CC@" config.mk sed -i "s@CC = cc@CC = $CC@" config.mk
make || return 1 make
make DESTDIR=${root} install || return 1 make DESTDIR=${root} install

4
pkgs/jupp
View File

@ -3,8 +3,8 @@ url="$mirror/joe-$v.tgz"
build: crossmusl build: crossmusl
cd src/jupp cd src/jupp
CC=$CC sh configure --prefix="/" || return 1 CC=$CC sh configure --prefix="/"
make || return 1 make
cp joe termidx "$root/bin" cp joe termidx "$root/bin"
mkdir -p "$root/share/man/man1" mkdir -p "$root/share/man/man1"
cp joe.1 "$root/share/man/man1" cp joe.1 "$root/share/man/man1"

2
pkgs/kernel
View File

@ -5,7 +5,7 @@ build: crossmusl kernel_headers
cp $top/stuff/kernel-config .config cp $top/stuff/kernel-config .config
#make menuconfig #make menuconfig
make oldconfig make oldconfig
make bzImage -j$nprocs || return 1 make bzImage -j$nprocs
cp arch/x86/boot/bzImage "$root/boot" cp arch/x86/boot/bzImage "$root/boot"
cp .config "$root/boot/bzImage.config" cp .config "$root/boot/bzImage.config"
cp System.map "$root/boot" cp System.map "$root/boot"

6
pkgs/libevent
View File

@ -3,6 +3,6 @@ url="$mirror/libevent-$v-stable.tar.gz"
build: crossmusl build: crossmusl
cd src/libevent-$v-stable cd src/libevent-$v-stable
CC="$CC -static" ./configure --prefix="$libcroot" --disable-shared --enable-static || return 1 CC="$CC -static" ./configure --prefix="$libcroot" --disable-shared --enable-static
make -j$nprocs || return 1 make -j$nprocs
make install || return 1 make install

6
pkgs/make
View File

@ -3,6 +3,6 @@ url="$mirror/make-$v.tar.bz2"
build: crossmusl build: crossmusl
cd src/make-$v cd src/make-$v
CC="$CC -static" ./configure --prefix="$root" --disable-nls || return 1 CC="$CC -static" ./configure --prefix="$root" --disable-nls
make -j$nprocs || return 1 make -j$nprocs
make install || return 1 make install

2
pkgs/man
View File

@ -2,5 +2,5 @@ url="$mirror/man.tar.gz"
build: crossmusl build: crossmusl
cd src/man 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" cp man "$root/bin"

2
pkgs/mksh
View File

@ -3,7 +3,7 @@ url="$mirror/mksh-$v.tar.gz"
build: crossmusl build: crossmusl
cd src/mksh 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" mkdir -p "$root/share/man/man1" "$root/share/man/cat1"
cp mksh "$root/bin" cp mksh "$root/bin"
cp mksh.1 "$root/share/man/man1/mksh.1" cp mksh.1 "$root/share/man/man1/mksh.1"

6
pkgs/mpg123
View File

@ -4,6 +4,6 @@ url="$mirror/mpg123-$v.tar.bz2"
build: tinyalsa build: tinyalsa
cd src/mpg123-$v cd src/mpg123-$v
CC=$CC ./configure --prefix="$root" --with-default-audio=tinyalsa \ CC=$CC ./configure --prefix="$root" --with-default-audio=tinyalsa \
--enable-static=yes --enable-shared=no || return 1 --enable-static=yes --enable-shared=no
make || return 1 make
make install || return 1 make install

6
pkgs/ncurses
View File

@ -7,9 +7,9 @@ build: crossmusl
CC="$CC -static" ./configure --prefix="${libcroot}" --mandir="$root/share" --without-tests \ CC="$CC -static" ./configure --prefix="${libcroot}" --mandir="$root/share" --without-tests \
--with-normal --enable-sigwinch --disable-nls --without-dlsym \ --with-normal --enable-sigwinch --disable-nls --without-dlsym \
--without-cxx-binding --enable-widec \ --without-cxx-binding --enable-widec \
--with-fallbacks="linux vt100 xterm xterm256-color" </dev/ptmx || return 1 --with-fallbacks="linux vt100 xterm xterm256-color" </dev/ptmx
make -j$nprocs || return 1 make -j$nprocs
make install || return 1 make install
cd $root/lib cd $root/lib
for lib in ncurses form panel menu ; do for lib in ncurses form panel menu ; do
ln -sf lib${lib}w_g.a lib${lib}_g.a ln -sf lib${lib}w_g.a lib${lib}_g.a

6
pkgs/rsync
View File

@ -3,6 +3,6 @@ url="$mirror/rsync-$v.tar.gz"
build: crossmusl build: crossmusl
cd src/rsync-$v cd src/rsync-$v
CC=$CC ./configure --prefix="$root" || return 1 CC=$CC ./configure --prefix="$root"
make -j$nprocs || return 1 make -j$nprocs
make install || return 1 make install

2
pkgs/sbase
View File

@ -3,5 +3,5 @@ git="git://git.2f30.org/sbase"
build: crossmusl build: crossmusl
cd src/sbase cd src/sbase
make clean make clean
make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS" || return 1 make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS"
make PREFIX="$root" install make PREFIX="$root" install

4
pkgs/sdhcp
View File

@ -3,7 +3,7 @@ url="$mirror/sdhcp.tar.gz"
build: crossmusl build: crossmusl
cd src/sdhcp cd src/sdhcp
make clean make clean
make CC=$CC || return 1 make CC=$CC
cp sdhcp "$root/bin" || return 1 cp sdhcp "$root/bin"
mkdir -p "$root/share/man/man8" mkdir -p "$root/share/man/man8"
cp sdhcp.8 "$root/share/man/man8/sdhcp.8" cp sdhcp.8 "$root/share/man/man8/sdhcp.8"

2
pkgs/sic
View File

@ -3,5 +3,5 @@ url="$mirror/sic.tar.gz"
build: crossmusl build: crossmusl
cd src/sic cd src/sic
make clean make clean
make CC=$CC LDFLAGS="$LDFLAGS" || return 1 make CC=$CC LDFLAGS="$LDFLAGS"
cp sic "$root/bin" cp sic "$root/bin"

2
pkgs/sinit
View File

@ -3,7 +3,7 @@ git="git://git.2f30.org/sinit"
build: crossmusl build: crossmusl
cd src/sinit cd src/sinit
make clean make clean
make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS" || return 1 make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS"
make PREFIX="$root" install make PREFIX="$root" install
cd "$root" cd "$root"
ln -sf /bin/sinit init ln -sf /bin/sinit init

4
pkgs/smdev
View File

@ -3,5 +3,5 @@ git="git://git.2f30.org/smdev"
build: crossmusl build: crossmusl
cd src/smdev cd src/smdev
make clean make clean
make CC=$CC LDFLAGS="$LDFLAGS" || return 1 make CC=$CC LDFLAGS="$LDFLAGS"
make PREFIX="$root" install || return 1 make PREFIX="$root" install

6
pkgs/terminus
View File

@ -4,9 +4,9 @@ url="$mirror/terminus-font-$v.tar.gz"
build: crossmusl build: crossmusl
cd src/terminus-font-$v cd src/terminus-font-$v
sh configure --psfdir="$root/share/fonts/console" \ sh configure --psfdir="$root/share/fonts/console" \
--x11dir="$root/share/fonts/misc" || return 1 --x11dir="$root/share/fonts/misc"
make || return 1 make
make DESTDIR=/ install || return 1 make DESTDIR=/ install
cd "$root/share/fonts/misc" cd "$root/share/fonts/misc"
gzip -d *.gz gzip -d *.gz
mkfontscale mkfontscale

2
pkgs/tinyalsa
View File

@ -3,7 +3,7 @@ url="$mirror/tinyalsa.tar.gz"
build: crossmusl build: crossmusl
cd src/tinyalsa cd src/tinyalsa
make clean 2>/dev/null make clean 2>/dev/null
make CC=$CC || return 1 make CC=$CC
cp tinycap tinymix tinypcminfo tinyplay "$root/bin" cp tinycap tinymix tinypcminfo tinyplay "$root/bin"
cp libtinyalsa.a "$root/lib" cp libtinyalsa.a "$root/lib"
cp -r include/tinyalsa "$root/include" cp -r include/tinyalsa "$root/include"

2
pkgs/tinywm
View File

@ -1,4 +1,4 @@
build: tinyxlib build: tinyxlib
cd stuff 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" cp tinywm "$root/bin"

4
pkgs/tinyxlib
View File

@ -4,5 +4,5 @@ build: crossmusl
cd src/tinyxlib cd src/tinyxlib
make clean make clean
make CC=$CC BINDIR="/bin" LIBDIR="/lib" STATIC=1 \ make CC=$CC BINDIR="/bin" LIBDIR="/lib" STATIC=1 \
FONT_ENCODINGS_DIRECTORY="/share/fonts/encodings/encodings.dir" || return 1 FONT_ENCODINGS_DIRECTORY="/share/fonts/encodings/encodings.dir"
make DESTDIR="$libcroot" BINDIR="/bin" LIBDIR="/lib" STATIC=1 install || return 1 make DESTDIR="$libcroot" BINDIR="/bin" LIBDIR="/lib" STATIC=1 install

4
pkgs/tinyxserver
View File

@ -4,8 +4,8 @@ build: tinyxlib zlib
cd src/tinyxserver cd src/tinyxserver
make clean make clean
make CC=$CC EXTRA_CFLAGS="-D_XSERVER64=1 $CFLAGS" \ make CC=$CC EXTRA_CFLAGS="-D_XSERVER64=1 $CFLAGS" \
FONTDIR="/usr/share/fonts" || return 1 FONTDIR="/usr/share/fonts"
make DESTDIR="$root" BINDIR="/bin" install || return 1 make DESTDIR="$root" BINDIR="/bin" install
cd "$root/usr/share/fonts/misc" cd "$root/usr/share/fonts/misc"
mkfontscale mkfontscale
mkfontdir mkfontdir

6
pkgs/tmux
View File

@ -4,6 +4,6 @@ url="$mirror/tmux-$v.tar.gz"
build: ncurses libevent build: ncurses libevent
cd src/tmux-$v cd src/tmux-$v
CC=$CC ./configure --prefix="$root" \ CC=$CC ./configure --prefix="$root" \
CFLAGS="-I$libcroot/include/ncursesw $CFLAGS" || return 1 CFLAGS="-I$libcroot/include/ncursesw $CFLAGS"
make -j$nprocs || return 1 make -j$nprocs
make install || return 1 make install

4
pkgs/ubase
View File

@ -3,6 +3,6 @@ git="git://git.2f30.org/ubase"
build: crossmusl build: crossmusl
cd src/ubase cd src/ubase
make clean make clean
make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS" || return 1 make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS"
make PREFIX="$root" install || return 1 make PREFIX="$root" install
chmod 4755 "$root/bin/su" chmod 4755 "$root/bin/su"

2
pkgs/uuterm
View File

@ -3,5 +3,5 @@ url="$mirror/uuterm.tar.gz"
build: tinyxlib build: tinyxlib
cd src/uuterm cd src/uuterm
make clean 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" cp uuterm-x11 "$root/bin"

6
pkgs/vim
View File

@ -6,6 +6,6 @@ build: ncurses
make clean make clean
CC=$CC ./configure --prefix=/ \ CC=$CC ./configure --prefix=/ \
--enable-multibyte --disable-gui --with-x=no \ --enable-multibyte --disable-gui --with-x=no \
--disable-nls --disable-netbeans || return 1 --disable-nls --disable-netbeans
make -j$nprocs || return 1 make -j$nprocs
make DESTDIR="$root" install || return 1 make DESTDIR="$root" install

2
pkgs/xsetroot
View File

@ -1,4 +1,4 @@
build: tinyxlib build: tinyxlib
cd stuff 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" cp xsetroot "$root/bin"

6
pkgs/zlib
View File

@ -3,6 +3,6 @@ url="$mirror/zlib-$v.tar.gz"
build: crossmusl build: crossmusl
cd src/zlib-$v cd src/zlib-$v
CC=$CC ./configure --prefix="$libcroot" --static || return 1 CC=$CC ./configure --prefix="$libcroot" --static
make -j$nprocs || return 1 make -j$nprocs
make install || return 1 make install