diff options
| author | Leah Neukirchen <leah@vuxu.org> | 2020-02-03 19:41:19 +0100 |
|---|---|---|
| committer | Leah Neukirchen <leah@vuxu.org> | 2020-02-03 19:41:19 +0100 |
| commit | 15fcd8e108ce2e9287f13fc92eb4c31cc56f478a (patch) | |
| tree | 4df37e171cc99fa50f1c1e7ba68b9b98f2bcd34d | |
| parent | 77b9c2ed2b148f5063109978975152e2cedcadb8 (diff) | |
| download | mewix-15fcd8e108ce2e9287f13fc92eb4c31cc56f478a.tar.gz mewix-15fcd8e108ce2e9287f13fc92eb4c31cc56f478a.tar.xz mewix-15fcd8e108ce2e9287f13fc92eb4c31cc56f478a.zip | |
use $MAKEFLAGS, drop $makejobs
| -rw-r--r-- | def/a/bzip2 | 4 | ||||
| -rw-r--r-- | lib2.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/def/a/bzip2 b/def/a/bzip2 index 00c66db..97230a3 100644 --- a/def/a/bzip2 +++ b/def/a/bzip2 @@ -3,8 +3,8 @@ version=1.0.8 distfiles="https://sourceware.org/pub/${pkgname}/${pkgname}-${version}.tar.gz" do_build() { - make ${makejobs} CFLAGS="$CFLAGS -fPIC $LDFLAGS" LDFLAGS="$LDFLAGS" -f Makefile-libbz2_so - make ${makejobs} CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" bzip2recover libbz2.a + make CFLAGS="$CFLAGS -fPIC $LDFLAGS" LDFLAGS="$LDFLAGS" -f Makefile-libbz2_so + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" bzip2recover libbz2.a } do_install() { diff --git a/lib2.sh b/lib2.sh index 374f74c..ac94cb5 100644 --- a/lib2.sh +++ b/lib2.sh @@ -4,7 +4,7 @@ : ${distfiles:=""} configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr/bin --mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib --localstatedir=/var ${configure_args}" -: ${makejobs:=-j16} +: ${MAKEFLAGS:=-j$(nproc)} : ${make_default_target:=all} : ${make_default_args:=} : ${CC:=gcc} @@ -16,6 +16,8 @@ configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr : ${make_install_args:=} : ${DESTDIR:=/dst/$pkgcat/$pkgname/$version} +export MAKEFLAGS CC CXX CFLAGS CXXFLAGS LDFLAGS DESTDIR + for s in fetch extract configure build check install; do verbose pre_$s verbose do_$s |