Ports: Clean up some package.sh scripts

- Remove superfluous function overrides and use makeopts instead
- Remove superfluous installopts
- Use run rather than cd'ing manually
- Ensure empty line between functions
This commit is contained in:
Linus Groh 2021-01-21 19:12:25 +01:00 committed by Andreas Kling
parent a4fbdb97c7
commit 7cc7f7ac54
5 changed files with 7 additions and 14 deletions

View file

@ -11,9 +11,11 @@ installopts="DESTDIR=$SERENITY_ROOT/Build/Root install-gcc install-target-libgcc
depends="binutils"
auth_type="sig"
auth_opts="--keyring ./gnu-keyring.gpg gcc-${version}.tar.xz.sig"
post_fetch() {
run contrib/download_prerequisites
}
build() {
run make $makeopts
run find ./host-i686-pc-serenity/gcc/ -maxdepth 1 -type f -executable -exec strip --strip-debug {} \; || echo

View file

@ -6,10 +6,6 @@ configopts="--with-oniguruma=builtin --disable-maintainer-mode"
files="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz jq-1.6.tar.gz"
makeopts="LDFLAGS=-all-static"
build() {
run make $makeopts
}
pre_configure() {
pushd $workdir/modules/oniguruma
autoreconf -fi

View file

@ -5,7 +5,6 @@ files="https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.gz na
useconfigure=true
makeopts=
configure() {
pre_configure() {
run ./autogen.sh
run ./"$configscript" --host=i686-pc-serenity $configopts
}

View file

@ -7,11 +7,11 @@ depends="zlib openssl"
useconfigure=true
usr_local=$SERENITY_ROOT/Build/Root/usr/local/
configopts="--prefix=/usr/local --disable-utmp --sysconfdir=/etc/ssh --with-ssl-dir=$usr_local/lib"
pre_configure() {
cd "${workdir}"
autoreconf
cd ..
run autoreconf
}
install() {
# Can't make keys outside of Serenity since ssh-keygen is built for Serenity.
run make DESTDIR="$SERENITY_ROOT"/Build/Root $installopts install-nokeys

View file

@ -3,8 +3,4 @@ port=stress-ng
version=0.11.23
workdir=stress-ng-${version}
files="https://github.com/ColinIanKing/stress-ng/archive/V${version}.tar.gz stress-ng-${version}.tar.gz"
installopts="DESTDIR=$SERENITY_ROOT/Build/Root"
build() {
run make STATIC=1
}
makeopts="STATIC=1"