From b2877c417930e935b4797050c529730723d9decb Mon Sep 17 00:00:00 2001 From: Ella-0 <23418164+Ella-0@users.noreply.github.com> Date: Thu, 30 Sep 2021 15:01:41 +0100 Subject: [PATCH] switch to using bad utility in base packages --- base/ca-certificates/build.sh | 4 ++-- base/cmake/build.sh | 4 ++-- base/git/build.sh | 8 ++++---- base/kati/build.sh | 2 +- base/libffi/build.sh | 6 +++--- base/libnl-tiny/build.sh | 4 ++-- base/toybox/build.sh | 6 +++--- base/wpa_supplicant/build.sh | 2 +- base/zstd/build.sh | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/base/ca-certificates/build.sh b/base/ca-certificates/build.sh index 2b43120..4306cc1 100644 --- a/base/ca-certificates/build.sh +++ b/base/ca-certificates/build.sh @@ -17,7 +17,7 @@ fetch(){ build() { cd $pkgname-$pkgver - gmake + bad --gmake gmake } package() { @@ -28,7 +28,7 @@ package() { mkdir -p $pkgdir/etc/ca-certificates/update.d mkdir -p $pkgdir/usr/share/ca-certificates/ - gmake install DESTDIR="$pkgdir" + bad --gmake gmake install DESTDIR="$pkgdir" ( echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}" diff --git a/base/cmake/build.sh b/base/cmake/build.sh index 4e33871..6f28e96 100644 --- a/base/cmake/build.sh +++ b/base/cmake/build.sh @@ -32,14 +32,14 @@ package() { package_doc() { cd $pkgname-$pkgver - gmake install DESDIR=$pkgdir + DESDIR=$pkgdir samu install rm -r $pkgdir/usr/bin rm -r $pkgdir/usr/share/info rm -r $pkgdir/usr/include } package_dev() { cd $pkgname-$pkgver - gmake install DESTDIR=$pkgdir + DESTDIR=$pkgdir samu install rm -r $pkgdir/usr/bin rm -r $pkgdir/usr/share } diff --git a/base/git/build.sh b/base/git/build.sh index 929911e..f97627a 100644 --- a/base/git/build.sh +++ b/base/git/build.sh @@ -14,22 +14,22 @@ fetch() { build() { cd $pkgname-$pkgver # gmake NO_PERL=1 NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1 - gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1 + bad --gmake gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1 # Need to run twice for it to work ¯\_(ツ)_/¯ # Some issue with `msgfmt` 'cause I'm using gettext-tiny but idk why it works on the second run # gmake NO_PERL=1 NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1 - gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1 + bad --gmake gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 prefix=/usr gitexecdir=lib/gitcore INSTALL_SYMLINKS=1 } package() { cd $pkgname-$pkgver # gmake NO_PERL=1 NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install prefix=/usr gitexecdir=lib/gitcore DESTDIR=$pkgdir INSTALL_SYMLINKS=1 - gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install prefix=/usr gitexecdir=lib/gitcore DESTDIR=$pkgdir INSTALL_SYMLINKS=1 + bad --gmake gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install prefix=/usr gitexecdir=lib/gitcore DESTDIR=$pkgdir INSTALL_SYMLINKS=1 } package_doc() { # gmake NO_PERL=1 NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install-man prefix=/usr DESTDIR=$pkgdir INSTALL_SYMLINKS=1 - gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install-man prefix=/usr DESTDIR=$pkgdir INSTALL_SYMLINKS=1 + bad --gmake gmake NO_REGEX=NeedsStartEnd NO_TCLTK=1 NO_MSGFMT_EXTENDED_OPTIONS=1 install-man prefix=/usr DESTDIR=$pkgdir INSTALL_SYMLINKS=1 } license() { diff --git a/base/kati/build.sh b/base/kati/build.sh index 0530753..c64348d 100644 --- a/base/kati/build.sh +++ b/base/kati/build.sh @@ -9,7 +9,7 @@ fetch() { build() { cd $pkgname-$pkgver - gmake + bad --gmake gmake } package() { diff --git a/base/libffi/build.sh b/base/libffi/build.sh index 80f9484..47a93b1 100644 --- a/base/libffi/build.sh +++ b/base/libffi/build.sh @@ -11,17 +11,17 @@ fetch() { build() { cd $pkgname-$pkgver ./configure --prefix=/usr - gmake + bad --gmake gmake } package() { cd $pkgname-$pkgver - gmake install DESTDIR=$pkgdir + bad --gmake gmake install DESTDIR=$pkgdir } package_dev() { cd $pkgname-$pkgver - gmake install DESTDIR=$pkgdir + bad --gmake gmake install DESTDIR=$pkgdir } license() { diff --git a/base/libnl-tiny/build.sh b/base/libnl-tiny/build.sh index 4620f55..30702f9 100644 --- a/base/libnl-tiny/build.sh +++ b/base/libnl-tiny/build.sh @@ -9,12 +9,12 @@ fetch() { build() { cd $pkgname-$pkgver - gmake prefix=/usr all CC=cc + bad --gmake gmake prefix=/usr all CC=cc } package() { cd $pkgname-$pkgver - gmake prefix=/usr DESTDIR=$pkgdir install + bad --gmake gmake prefix=/usr DESTDIR=$pkgdir install } license() { diff --git a/base/toybox/build.sh b/base/toybox/build.sh index 6baa91f..caf27cd 100644 --- a/base/toybox/build.sh +++ b/base/toybox/build.sh @@ -14,8 +14,8 @@ fetch() { build() { cd $pkgname-$pkgver - CPUS=1 gmake defconfig - CPUS=1 gmake + CPUS=1 bad --gmake gmake defconfig + CPUS=1 bad --gmake gmake } package() { @@ -27,7 +27,7 @@ package() { # install -d $pkgdir/usr/bin # ln -sr $pkgdir/bin/toybox $pkgdir/usr/bin/install # ln -sr $pkgdir/bin/toybox $pkgdir/usr/bin/lspci - gmake PREFIX=$pkgdir install + bad --gmake gmake PREFIX=$pkgdir install # Provided by NetBSD Curses rm $pkgdir/usr/bin/clear diff --git a/base/wpa_supplicant/build.sh b/base/wpa_supplicant/build.sh index 1eb62b0..c2efaf7 100644 --- a/base/wpa_supplicant/build.sh +++ b/base/wpa_supplicant/build.sh @@ -25,7 +25,7 @@ build() { package() { cd $pkgname-$pkgver cd $pkgname - gmake install DESTDIR=$pkgdir BINDIR=/usr/sbin + bad --gmake gmake install DESTDIR=$pkgdir BINDIR=/usr/sbin } license() { diff --git a/base/zstd/build.sh b/base/zstd/build.sh index f0872bb..f92f308 100644 --- a/base/zstd/build.sh +++ b/base/zstd/build.sh @@ -9,12 +9,12 @@ fetch() { build() { cd $pkgname-$pkgver - gmake + bad --gmake gmake } package() { cd $pkgname-$pkgver - gmake install PREFIX=/usr DESTDIR=$pkgdir + bad --gmake gmake install PREFIX=/usr DESTDIR=$pkgdir } license() {