From 21c2f839131ffd0a257b272a57dccecd3ed0d0b6 Mon Sep 17 00:00:00 2001 From: PktSurf Date: Fri, 17 Mar 2023 14:19:05 +0530 Subject: [PATCH] Rewrote CFLAGS for base/{parted.pciutils} Discarded unnecessary build options in base/{sysstat,texinfo,tofrodos,unzip,util-linux,wayland-protocols,xmlto,zlib} base/which is now statically-linked --- base/parted/parted.SMBuild | 2 +- base/pciutils/pciutils.SMBuild | 4 ++-- base/pigz/pigz.SMBuild | 7 ++++--- base/sysstat/sysstat.SMBuild | 1 - base/texinfo/texinfo.SMBuild | 2 +- base/tofrodos/tofrodos.SMBuild | 2 ++ base/unzip/unzip.SMBuild | 1 + base/util-linux/util-linux.SMBuild | 4 ---- base/wayland-protocols/wayland-protocols.SMBuild | 2 +- base/which/which.SMBuild | 2 +- base/xmlto/xmlto.SMBuild | 3 +-- base/zlib/zlib.SMBuild | 2 +- 12 files changed, 15 insertions(+), 17 deletions(-) diff --git a/base/parted/parted.SMBuild b/base/parted/parted.SMBuild index a55d515..a05f9fd 100755 --- a/base/parted/parted.SMBuild +++ b/base/parted/parted.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { } build() { - CFLAGS="$CFLAGS -D_GNU_SOURCE -Dloff_t=off_t -include sys/sysmacros.h" \ + CFLAGS+=" -Dloff_t=off_t -include sys/sysmacros.h" \ ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/base/pciutils/pciutils.SMBuild b/base/pciutils/pciutils.SMBuild index 17ef05c..89df6a4 100755 --- a/base/pciutils/pciutils.SMBuild +++ b/base/pciutils/pciutils.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { } build() { - make CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PREAD -fPIC" \ + make CFLAGS+=" -DHAVE_PREAD" \ LDFLAGS="-llzma" \ PREFIX="/" \ SHARED=yes \ @@ -27,7 +27,7 @@ build() { DESTDIR="$pkg" \ STRIP="" all install - make CFLAGS="-D_GNU_SOURCE -DHAVE_PREAD -fPIC" \ + make CFLAGS+=" -DHAVE_PREAD" \ LDFLAGS="-llzma" \ PREFIX="/" \ SHARED=yes \ diff --git a/base/pigz/pigz.SMBuild b/base/pigz/pigz.SMBuild index d53d751..9ea4109 100755 --- a/base/pigz/pigz.SMBuild +++ b/base/pigz/pigz.SMBuild @@ -17,9 +17,10 @@ prepbuilddir() { build() { make CFLAGS="$CFLAGS" - mkdir -p $pkg/bin $pkg/share/man/man1 - cp pigz unpigz $pkg/bin/ - cp pigz.1 $pkg/share/man/man1/ + + install -Dm 755 pigz $pkg/bin/pigz + install -Dm 755 unpigz $pkg/bin/unpigz + install -Dm 644 pigz.1 $pkg/share/man/man1/pigz.1 cp README $pkgdocs/ cp zopfli/COPYING $pkgdocs/COPYING.zopfli diff --git a/base/sysstat/sysstat.SMBuild b/base/sysstat/sysstat.SMBuild index 4a6b115..6991091 100755 --- a/base/sysstat/sysstat.SMBuild +++ b/base/sysstat/sysstat.SMBuild @@ -23,7 +23,6 @@ build() { ./configure \ --prefix="/" \ - --sysconfdir=/etc \ --disable-nls make diff --git a/base/texinfo/texinfo.SMBuild b/base/texinfo/texinfo.SMBuild index c041847..15d5b0b 100755 --- a/base/texinfo/texinfo.SMBuild +++ b/base/texinfo/texinfo.SMBuild @@ -23,7 +23,7 @@ build() { make make install DESTDIR=$pkg - cp AUTHORS COPYING NEWS README* TODO $pkgdocs/ + cp COPYING $pkgdocs/ mkfinalpkg } diff --git a/base/tofrodos/tofrodos.SMBuild b/base/tofrodos/tofrodos.SMBuild index 2a97d7a..482ce84 100755 --- a/base/tofrodos/tofrodos.SMBuild +++ b/base/tofrodos/tofrodos.SMBuild @@ -17,8 +17,10 @@ prepbuilddir() { build() { cd src + make install -Dm 755 fromdos $pkg/bin/fromdos + ( cd $pkg/bin ; ln -s fromdos todos ) cp ../COPYING $pkgdocs/ diff --git a/base/unzip/unzip.SMBuild b/base/unzip/unzip.SMBuild index 6521e41..91ef737 100755 --- a/base/unzip/unzip.SMBuild +++ b/base/unzip/unzip.SMBuild @@ -26,6 +26,7 @@ build() { make -f unix/Makefile generic make prefix="$pkg" -f unix/Makefile install + mkdir -p $pkg/share/man mv $pkg/man/man* $pkg/share/man/ rmdir $pkg/man diff --git a/base/util-linux/util-linux.SMBuild b/base/util-linux/util-linux.SMBuild index 437aaab..441b22b 100755 --- a/base/util-linux/util-linux.SMBuild +++ b/base/util-linux/util-linux.SMBuild @@ -25,7 +25,6 @@ build() { ./configure \ --prefix="" --sbindir=/bin --libdir=/lib \ --includedir=/include \ - --disable-silent-rules \ --disable-nls --disable-fsck\ --enable-libmount-support-mtab \ --disable-fdformat --disable-switch-root \ @@ -42,9 +41,6 @@ build() { make make install DESTDIR=$pkg - # libuuid.la is required by gegl - cp .libs/libuuid.la $pkg/lib/ - # Replace dynamically-linked mount with statically-linked mount ( cd $pkg/bin diff --git a/base/wayland-protocols/wayland-protocols.SMBuild b/base/wayland-protocols/wayland-protocols.SMBuild index 4874112..cd085ac 100755 --- a/base/wayland-protocols/wayland-protocols.SMBuild +++ b/base/wayland-protocols/wayland-protocols.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - mkdir smbuild && cd smbuild + mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" diff --git a/base/which/which.SMBuild b/base/which/which.SMBuild index 3e2e4f4..14dc7bc 100755 --- a/base/which/which.SMBuild +++ b/base/which/which.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - CFLAGS="-O2 -static" \ + LDFLAGS="-static" \ ./configure \ --prefix="" diff --git a/base/xmlto/xmlto.SMBuild b/base/xmlto/xmlto.SMBuild index 186377f..e935b32 100755 --- a/base/xmlto/xmlto.SMBuild +++ b/base/xmlto/xmlto.SMBuild @@ -17,8 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --sysconfdir=/etc + --prefix="" make make install DESTDIR=$pkg diff --git a/base/zlib/zlib.SMBuild b/base/zlib/zlib.SMBuild index f2687b1..579612b 100755 --- a/base/zlib/zlib.SMBuild +++ b/base/zlib/zlib.SMBuild @@ -22,7 +22,7 @@ build() { make make install DESTDIR=$pkg - cp README $pkgdocs/ + cp LICENSE $pkgdocs/ mkfinalpkg }