apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

tools: Add prefix messages that tell us where we're at in a build, inspired by SerenityOS :)

Browse Source
This commit is contained in:
apio 2022-10-23 20:03:29 +02:00
parent fb0fc29087
commit 2d807e3ca5
7 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/add-port.sh
View File

@ -71,14 +71,14 @@ then
if [ "$?" = "0" ]
then
echo "Unpacking $pkgname version $pkgver..."
port_unpack
port_unpack | filter-lines $pkgname "unpack"
fi
command -v port_patch >/dev/null
if [ "$?" = "0" ]
then
echo "Patching $pkgname version $pkgver..."
port_patch
port_patch | filter-lines $pkgname "patch"
fi
fi
@ -91,11 +91,11 @@ command -v port_configure >/dev/null
if [ "$?" = "0" ]
then
echo "Configuring $pkgname version $pkgver..."
port_configure
port_configure | filter-lines $pkgname "configure"
fi
echo "Making $pkgname version $pkgver..."
port_build # this one is required
port_build | filter-lines $pkgname "build" # this one is required
cd $workdir
@ -103,7 +103,7 @@ mkdir -p $installdir
cd $installdir
echo "Installing $pkgname version $pkgver..."
port_install
port_install | filter-lines $pkgname "install"
if ! [ "$SKIP_ADD_TO_PORTS_LIST" = "1" ]
then

2
ports/bc/package.sh
View File

@ -21,7 +21,7 @@ port_patch()
port_configure()
{
HOSTCC=gcc PREFIX=${PREFIX:-""} $workdir/bc-$pkgver/configure --disable-nls --bc-only --disable-history --disable-man-pages
HOSTCC=gcc PREFIX=${PREFIX:-""} $srcdir/configure --disable-nls --bc-only --disable-history --disable-man-pages
}
port_build()

2
ports/remove-port.sh
View File

@ -36,7 +36,7 @@ source $pkgscript
echo "Removing $pkgname version $pkgver..."
cd $installdir
port_uninstall
port_uninstall | filter-lines $pkgname "uninstall"
rm -rf $workdir
cat $listdir/ports.list | sort | uniq | grep -v $pkgname | tee $listdir/ports.list >/dev/null

6
tools/env.sh
View File

@ -9,3 +9,9 @@ export LD=x86_64-luna-ld
export AR=x86_64-luna-ar
export ASM=nasm
export STRIP=x86_64-luna-strip
unset -f filter-lines
filter-lines()
{
sed $'s|^|\x1b[32m('"$1/$2"$')\x1b[39m |'
}

2
tools/install-built-ports.sh
View File

@ -40,7 +40,7 @@ install_port()
echo "installing port: $pkgname version $pkgver"
mkdir -p $installdir
cd $installdir
port_install
port_install | filter-lines $pkgname "install"
}
while read package; do

8
tools/setup-binutils.sh
View File

@ -24,7 +24,7 @@ echo Patching Binutils...
cd toolchain
patch -u -i $LUNA_ROOT/tools/binutils.patch -p 1 -d build
patch -u -i $LUNA_ROOT/tools/binutils.patch -p 1 -d build | filter-lines "binutils" "patch"
cd -
@ -37,12 +37,12 @@ cd toolchain/build/binutils
unset CC
unset CXX
../binutils-$LUNA_BINUTILS_VERSION_REQUIRED/configure --prefix="$BUILD_PREFIX" --target=$BUILD_TARGET --disable-nls --with-sysroot=$BUILD_SYSROOT --disable-werror
../binutils-$LUNA_BINUTILS_VERSION_REQUIRED/configure --prefix="$BUILD_PREFIX" --target=$BUILD_TARGET --disable-nls --with-sysroot=$BUILD_SYSROOT --disable-werror | filter-lines "binutils" "configure"
echo Building Binutils...
make -j$(nproc)
make -j$(nproc) | filter-lines "binutils" "build"
echo Installing Binutils...
make install
make install | filter-lines "binutils" "install"

12
tools/setup-gcc.sh
View File

@ -32,7 +32,7 @@ echo Patching GCC...
cd toolchain
patch -u -i $LUNA_ROOT/tools/gcc.patch -p 1 -d build
patch -u -i $LUNA_ROOT/tools/gcc.patch -p 1 -d build | filter-lines "gcc" "patch"
cd -
@ -45,14 +45,14 @@ cd toolchain/build/gcc
unset CC
unset CXX
../gcc-$LUNA_GCC_VERSION_REQUIRED/configure --prefix="$BUILD_PREFIX" --target=$BUILD_TARGET --disable-nls --with-sysroot=$BUILD_SYSROOT --enable-languages=c,c++ --without-headers
../gcc-$LUNA_GCC_VERSION_REQUIRED/configure --prefix="$BUILD_PREFIX" --target=$BUILD_TARGET --disable-nls --with-sysroot=$BUILD_SYSROOT --enable-languages=c,c++ --without-headers | filter-lines "gcc" "configure"
echo Building GCC...
make all-gcc -j$(nproc)
make all-target-libgcc -j$(nproc) CFLAGS_FOR_TARGET='-g -O2 -mcmodel=large -mno-red-zone'
make all-gcc -j$(nproc) | filter-lines "gcc" "build"
make all-target-libgcc -j$(nproc) CFLAGS_FOR_TARGET='-g -O2 -mcmodel=large -mno-red-zone' | filter-lines "libgcc" "build"
echo Installing GCC...
make install-gcc
make install-target-libgcc
make install-gcc | filter-lines "gcc" "install"
make install-target-libgcc | filter-lines "libgcc" "install"