Removed executable bit from some build files and discarded build options that set /bin path for elf files

2024-10-29 20:12:47 +05:30 · 2024-10-29 20:12:47 +05:30 · f39b658381
commit f39b658381
parent fd5cb987b4
120 changed files with 33 additions and 96 deletions
--- a/base/alsa-lib/alsa-lib.SMBuild
+++ b/base/alsa-lib/alsa-lib.SMBuild
--- a/base/alsa-plugins/alsa-plugins.SMBuild
+++ b/base/alsa-plugins/alsa-plugins.SMBuild
--- a/base/alsa-utils/alsa-utils.SMBuild
+++ b/base/alsa-utils/alsa-utils.SMBuild
--- a/base/argon2/argon2.SMBuild
+++ b/base/argon2/argon2.SMBuild
--- a/base/argp-standalone/argp-standalone.SMBuild
+++ b/base/argp-standalone/argp-standalone.SMBuild
--- a/base/asciidoc/asciidoc.SMBuild
+++ b/base/asciidoc/asciidoc.SMBuild
--- a/base/aspell/aspell.SMBuild
+++ b/base/aspell/aspell.SMBuild
--- a/base/aspell6/aspell6.SMBuild
+++ b/base/aspell6/aspell6.SMBuild
--- a/base/attr/attr.SMBuild
+++ b/base/attr/attr.SMBuild
--- a/base/autoconf/autoconf.SMBuild
+++ b/base/autoconf/autoconf.SMBuild
--- a/base/automake/automake.SMBuild
+++ b/base/automake/automake.SMBuild
--- a/base/bash-completion/bash-completion.SMBuild
+++ b/base/bash-completion/bash-completion.SMBuild
--- a/base/ed/ed.SMBuild
+++ b/base/ed/ed.SMBuild
@ -18,7 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=/usr \
+    --prefix=/usr

  make CFLAGS="$CFLAGS"
  make install DESTDIR=$pkg
--- a/base/gmime/gmime.SMBuild
+++ b/base/gmime/gmime.SMBuild
--- a/base/gmp/gmp.SMBuild
+++ b/base/gmp/gmp.SMBuild
--- a/base/haveged/haveged.SMBuild
+++ b/base/haveged/haveged.SMBuild
@ -19,8 +19,7 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
-    --sbindir=/bin \
+    --sbindir=/usr/bin \
    --disable-static

  make
--- a/base/id3lib/id3lib.SMBuild
+++ b/base/id3lib/id3lib.SMBuild
@ -30,8 +30,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=/usr \
-    --bindir=/bin
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
--- a/base/initfs/initfs.SMBuild
+++ b/base/initfs/initfs.SMBuild
--- a/base/iso-codes/iso-codes.SMBuild
+++ b/base/iso-codes/iso-codes.SMBuild
--- a/base/itstool/itstool.SMBuild
+++ b/base/itstool/itstool.SMBuild
@ -18,8 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=/usr \
-    --bindir=/bin
+    --prefix=/usr

  make
  make install DESTDIR=$pkg 
--- a/base/jansson/jansson.SMBuild
+++ b/base/jansson/jansson.SMBuild
--- a/base/jbig2dec/jbig2dec.SMBuild
+++ b/base/jbig2dec/jbig2dec.SMBuild
@ -18,7 +18,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static \
    --enable-shared 

--- a/base/json-glib/json-glib.SMBuild
+++ b/base/json-glib/json-glib.SMBuild
@ -18,7 +18,6 @@ prepbuilddir() {
 build() {
  mkdir -p smbuild && cd smbuild
  meson .. --prefix=/usr \
-     --bindir=/bin \
     -Dintrospection=false

  ninja
--- a/base/kbd/kbd.SMBuild
+++ b/base/kbd/kbd.SMBuild
@ -42,7 +42,7 @@ build() {
 	./loadkeys -b -q data/keymaps/i386/$i > "$pkg"/usr/share/kmap/$k.kmap || echo "Error loadkeys...$i"
  done

-  install -Dm 755 $srcdir/loadkeys $pkg/bin/loadkeys
+  install -Dm 755 $srcdir/loadkeys $pkg/usr/bin/loadkeys

  cp COPYING $pkgdocs/

--- a/base/keyutils/keyutils.SMBuild
+++ b/base/keyutils/keyutils.SMBuild
@ -19,7 +19,8 @@ build() {
  make -j1 NO_ARLIB=1 \
    LIBDIR=/usr/lib \
    USRLIBDIR=/usr/lib \
-    SBINDIR=/bin \
+    BINDIR=/usr/bin \
+    SBINDIR=/usr/bin \
    MANDIR=/usr/share/man \
    SHAREDIR=/usr/share \
    INCLUDEDIR=/usr/include \
@ -30,7 +31,8 @@ build() {
  make -j1 NO_ARLIB=1 \
    LIBDIR=/usr/lib \
    USRLIBDIR=/usr/lib \
-    SBINDIR=/bin \
+    BINDIR=/usr/bin \
+    SBINDIR=/usr/bin \
    MANDIR=/usr/share/man \
    SHAREDIR=/usr/share \
    INCLUDEDIR=/usr/include \
--- a/base/kmod/kmod.SMBuild
+++ b/base/kmod/kmod.SMBuild
@ -20,8 +20,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=/usr \
-    --bindir=/bin
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
@ -29,7 +28,7 @@ build() {
  cp COPYING $pkgdocs/
  
  (
-    cd $pkg/bin
+    cd $pkg/usr/bin
    for file in depmod insmod lsmod modinfo modprobe rmmod ; do 
      ln -sf kmod $file
    done
--- a/base/lame/lame.SMBuild
+++ b/base/lame/lame.SMBuild
@ -20,7 +20,6 @@ build() {
  LIBS="-lcurses -lterminfo" \
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --enable-shared \
    --enable-nasm \
    --disable-static
--- a/base/less/less.SMBuild
+++ b/base/less/less.SMBuild
@ -22,8 +22,7 @@ prepbuilddir() {
 build() {
  LDFLAGS="-static" \
  ./configure \
-    --prefix=/usr \
-    --bindir=/bin
+    --prefix=/usr

  make
  make install DESTDIR=$pkg
--- a/base/libaio/libaio.SMBuild
+++ b/base/libaio/libaio.SMBuild
--- a/base/libao/libao.SMBuild
+++ b/base/libao/libao.SMBuild
--- a/base/libarchive/libarchive.SMBuild
+++ b/base/libarchive/libarchive.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --with-pic \
    --without-openssl \
    --without-xml2 \
@ -37,4 +36,4 @@ build() {

 sha512sums="
 71a69f6ef8049167e3901b0fea2dc872888d9a9373e77921a5b3831ea20a9a63506e8e28e75d617d0e91740d324ef13d6beedf0a92fca1d49a86cd9a833defe4  libarchive-3.7.6.tar.lz
-"
+"
--- a/base/libasr/libasr.SMBuild
+++ b/base/libasr/libasr.SMBuild
--- a/base/libassuan/libassuan.SMBuild
+++ b/base/libassuan/libassuan.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libcap-ng/libcap-ng.SMBuild
+++ b/base/libcap-ng/libcap-ng.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --enable-static=no \
    --with-python=no \
    --with-python3=no
--- a/base/libcap/libcap.SMBuild
+++ b/base/libcap/libcap.SMBuild
@ -23,16 +23,14 @@ prepbuilddir() {
 }

 build() {
-  make prefix= man_prefix=/share/man lib=lib CFLAGS="$CFLAGS" \
+  make prefix=/usr man_prefix=/usr/share/man lib=lib CFLAGS="$CFLAGS" \
     BUILD_CC="$CC" 

-  make FAKEROOT=$pkg prefix= man_prefix=/share/man SBINDIR=/bin lib=lib install
+  make FAKEROOT=$pkg prefix=/usr man_prefix=/usr/share/man SBINDIR=/usr/bin lib=lib install

  LIBDIR=$pkg/lib
  SBINDIR=$pkg/bin

-  #LD_LIBRARY_PATH=${LIBDIR} ${SBINDIR}/setcap cap_setfacap=i ${SBINDIR}/setcap || echo "oops"
-
  cp License $pkgdocs/

  mkfinalpkg
--- a/base/libcddb/libcddb.SMBuild
+++ b/base/libcddb/libcddb.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libcdio-paranoia/libcdio-paranoia.SMBuild
+++ b/base/libcdio-paranoia/libcdio-paranoia.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --enable-cpp-progs \
    --disable-static \
    --disable-example-progs
--- a/base/libcdio/libcdio.SMBuild
+++ b/base/libcdio/libcdio.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-vcd-info \
    --disable-static \
    --enable-cpp-progs
--- a/base/libcroco/libcroco.SMBuild
+++ b/base/libcroco/libcroco.SMBuild
@ -18,7 +18,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libcue/libcue.SMBuild
+++ b/base/libcue/libcue.SMBuild
--- a/base/libdaemon/libdaemon.SMBuild
+++ b/base/libdaemon/libdaemon.SMBuild
--- a/base/libelf-compat/libelf-compat.SMBuild
+++ b/base/libelf-compat/libelf-compat.SMBuild
--- a/base/libetpan/libetpan.SMBuild
+++ b/base/libetpan/libetpan.SMBuild
--- a/base/libevent/libevent.SMBuild
+++ b/base/libevent/libevent.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libexif/libexif.SMBuild
+++ b/base/libexif/libexif.SMBuild
--- a/base/libffi/libffi.SMBuild
+++ b/base/libffi/libffi.SMBuild
--- a/base/libgc/libgc.SMBuild
+++ b/base/libgc/libgc.SMBuild
--- a/base/libgcrypt/libgcrypt.SMBuild
+++ b/base/libgcrypt/libgcrypt.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --enable-shared=yes \
    --enable-static=no \
    --program-prefix="" \
--- a/base/libgit2/libgit2.SMBuild
+++ b/base/libgit2/libgit2.SMBuild
--- a/base/libgpg-error/libgpg-error.SMBuild
+++ b/base/libgpg-error/libgpg-error.SMBuild
@ -22,7 +22,6 @@ build() {
  autoreconf -vif
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --enable-install-gpg-error-config \
    --disable-nls

--- a/base/libical/libical.SMBuild
+++ b/base/libical/libical.SMBuild
--- a/base/libid3tag/libid3tag.SMBuild
+++ b/base/libid3tag/libid3tag.SMBuild
@ -20,7 +20,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libidn2/libidn2.SMBuild
+++ b/base/libidn2/libidn2.SMBuild
@ -18,7 +18,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static \
    --disable-nls

--- a/base/libjpeg-turbo/libjpeg-turbo.SMBuild
+++ b/base/libjpeg-turbo/libjpeg-turbo.SMBuild
@ -19,7 +19,6 @@ build() {
  mkdir -p smbuild && cd smbuild
  cmake .. \
    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_BINDIR="/bin" \
    -DCMAKE_INSTALL_LIBDIR="/usr/lib" \
    -DENABLE_STATIC=OFF

--- a/base/libkate/libkate.SMBuild
+++ b/base/libkate/libkate.SMBuild
@ -24,7 +24,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static

  make
--- a/base/libksba/libksba.SMBuild
+++ b/base/libksba/libksba.SMBuild
@ -18,7 +18,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --enable-shared=yes \
    --enable-static=no

--- a/base/libmilter/libmilter.SMBuild
+++ b/base/libmilter/libmilter.SMBuild
--- a/base/libminizip/libminizip.SMBuild
+++ b/base/libminizip/libminizip.SMBuild
--- a/base/libmms/libmms.SMBuild
+++ b/base/libmms/libmms.SMBuild
--- a/base/libmnl/libmnl.SMBuild
+++ b/base/libmnl/libmnl.SMBuild
--- a/base/libmodplug/libmodplug.SMBuild
+++ b/base/libmodplug/libmodplug.SMBuild
--- a/base/libmtp/libmtp.SMBuild
+++ b/base/libmtp/libmtp.SMBuild
@ -18,9 +18,8 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static \
-    --with-udev=/lib/udev
+    --with-udev=/usr/lib/udev

  make
  make install DESTDIR=$pkg
--- a/base/libmypaint/libmypaint.SMBuild
+++ b/base/libmypaint/libmypaint.SMBuild
--- a/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild
+++ b/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild
--- a/base/libnfnetlink/libnfnetlink.SMBuild
+++ b/base/libnfnetlink/libnfnetlink.SMBuild
--- a/base/libnfs/libnfs.SMBuild
+++ b/base/libnfs/libnfs.SMBuild
@ -18,7 +18,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static

  make
--- a/base/libnl/libnl.SMBuild
+++ b/base/libnl/libnl.SMBuild
@ -18,7 +18,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libogg/libogg.SMBuild
+++ b/base/libogg/libogg.SMBuild
--- a/base/libopenal/libopenal.SMBuild
+++ b/base/libopenal/libopenal.SMBuild
@ -19,7 +19,6 @@ build() {
  mkdir -p smbuild && cd smbuild
  cmake .. \
    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_BINDIR=/bin \
    -DCMAKE_INSTALL_LIBDIR=lib

  make
--- a/base/libpcap/libpcap.SMBuild
+++ b/base/libpcap/libpcap.SMBuild
@ -21,7 +21,6 @@ build() {
  ac_cv_type_u_int64_t=yes \
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --enable-shared \
    --with-libnl \
    --enable-usb \
--- a/base/libplist/libplist.SMBuild
+++ b/base/libplist/libplist.SMBuild
@ -21,7 +21,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static

  make
--- a/base/libpng/libpng.SMBuild
+++ b/base/libpng/libpng.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libpsl/libpsl.SMBuild
+++ b/base/libpsl/libpsl.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static

  make 
--- a/base/libpthread-stubs/libpthread-stubs.SMBuild
+++ b/base/libpthread-stubs/libpthread-stubs.SMBuild
--- a/base/libptytty/libptytty.SMBuild
+++ b/base/libptytty/libptytty.SMBuild
@ -18,7 +18,7 @@ prepbuilddir() {
 build() {
  mkdir -p smbuild && cd smbuild
  cmake .. \
-    -DCMAKE_INSTALL_PREFIX="" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
    -DBUILD_SHARED_LIBS=ON \
    -DCMAKE_INSTALL_LIBDIR=lib \
    -DUTMP_SUPPORT=OFF \
--- a/base/libqalculate/libqalculate.SMBuild
+++ b/base/libqalculate/libqalculate.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static \
    --disable-nls

--- a/base/libsamplerate/libsamplerate.SMBuild
+++ b/base/libsamplerate/libsamplerate.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libseccomp/libseccomp.SMBuild
+++ b/base/libseccomp/libseccomp.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static

  make
--- a/base/libsecret/libsecret.SMBuild
+++ b/base/libsecret/libsecret.SMBuild
@ -20,7 +20,6 @@ build() {

  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static \
    --disable-introspection \
    --disable-manpages \
--- a/base/libshout/libshout.SMBuild
+++ b/base/libshout/libshout.SMBuild
--- a/base/libsndfile/libsndfile.SMBuild
+++ b/base/libsndfile/libsndfile.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libsodium/libsodium.SMBuild
+++ b/base/libsodium/libsodium.SMBuild
--- a/base/libssh2/libssh2.SMBuild
+++ b/base/libssh2/libssh2.SMBuild
--- a/base/libtasn1/libtasn1.SMBuild
+++ b/base/libtasn1/libtasn1.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libtheora/libtheora.SMBuild
+++ b/base/libtheora/libtheora.SMBuild
--- a/base/libtirpc/libtirpc.SMBuild
+++ b/base/libtirpc/libtirpc.SMBuild
--- a/base/libtool/libtool.SMBuild
+++ b/base/libtool/libtool.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static 

  make
--- a/base/libtorrent/libtorrent.SMBuild
+++ b/base/libtorrent/libtorrent.SMBuild
--- a/base/libunistring/libunistring.SMBuild
+++ b/base/libunistring/libunistring.SMBuild
--- a/base/libusb/libusb.SMBuild
+++ b/base/libusb/libusb.SMBuild
--- a/base/libuv/libuv.SMBuild
+++ b/base/libuv/libuv.SMBuild
--- a/base/libvncserver/libvncserver.SMBuild
+++ b/base/libvncserver/libvncserver.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static \
    --without-ssl

--- a/base/libvorbis/libvorbis.SMBuild
+++ b/base/libvorbis/libvorbis.SMBuild
--- a/base/libvpx/libvpx.SMBuild
+++ b/base/libvpx/libvpx.SMBuild
--- a/base/libxml2/libxml2.SMBuild
+++ b/base/libxml2/libxml2.SMBuild
@ -21,7 +21,6 @@ build() {
  ./configure \
    --prefix=/usr \
    --sysconfdir=/etc \
-    --bindir=/bin \
    --disable-static \
    --with-legacy \
    --with-history
--- a/base/libxslt/libxslt.SMBuild
+++ b/base/libxslt/libxslt.SMBuild
@ -21,9 +21,8 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --disable-static \
-    --with-python=/bin/python
+    --with-python=/usr/bin/python

  make
  make install DESTDIR=$pkg
--- a/base/p11-kit/p11-kit.SMBuild
+++ b/base/p11-kit/p11-kit.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --without-trust-paths

  make
--- a/base/parted/parted.SMBuild
+++ b/base/parted/parted.SMBuild
@ -23,7 +23,7 @@ build() {
  CFLAGS+=" -Dloff_t=off_t -include sys/sysmacros.h" \
  ./configure \
    --prefix=/usr \
-    --sbindir=/bin \
+    --sbindir=/usr/bin \
    --enable-threads=posix \
    --disable-static 

--- a/base/swig/swig.SMBuild
+++ b/base/swig/swig.SMBuild
@ -18,8 +18,7 @@ prepbuilddir() {

 build() {
  ./configure \
-    --prefix=/usr \
-    --bindir=/bin
+    --prefix=/usr

  make
  make install DESTDIR=$pkg 
--- a/base/sysfsutils/sysfsutils.SMBuild
+++ b/base/sysfsutils/sysfsutils.SMBuild
@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
  ./configure \
    --prefix=/usr \
-    --bindir=/bin \
    --mandir=/usr/share/man \
    --disable-static

--- a/Show more
+++ b/Show more