Merge pull request #289 from kisslinux/env

Update packages to use new environment
2024-07-02 14:02:27 +00:00 · 2021-07-18 07:36:21 +03:00 · 2021-07-18 07:36:21 +03:00 · 04d1ff7fa0
commit 04d1ff7fa0
parent e8d1d91604 471e46b99c
119 changed files with 149 additions and 230 deletions
--- a/core/baseinit/build
+++ b/core/baseinit/build
@ -10,6 +10,6 @@ cp -R lib "$1/usr/lib"
 # Disable warning as CFLAGS must work this way.
 # shellcheck disable=2086
 for bin in kpow kall; do
-    "${CC:-cc}" -o "$1/usr/bin/$bin" "bin/$bin.c" $CFLAGS -static
+    "$CC" -o "$1/usr/bin/$bin" "bin/$bin.c" $CFLAGS -static
    cp -f "bin/$bin.c" "$1/usr/share/doc/kiss/init/$bin.c"
 done
--- a/core/binutils/build
+++ b/core/binutils/build
@ -28,6 +28,6 @@ export PATH=$PATH:$PWD

 make configure-host
 make tooldir=/usr
-make DESTDIR="$1" tooldir=/usr install
+make tooldir=/usr install

 ln -sf ld.bfd "$1/usr/bin/ld"
--- a/core/bison/build
+++ b/core/bison/build
@ -7,7 +7,7 @@

 make

-make DESTDIR="$1" \
+make \
    install-libLIBRARIES \
    install-binPROGRAMS \
    install-nodist_binSCRIPTS \
--- a/core/busybox/build
+++ b/core/busybox/build
@ -5,8 +5,8 @@ for patch in patch/*.patch; do
 done

 # Remove forced gcc/g++ usage so builds work on gcc-less systems.
-sed -e "s#= g[c+][c+]#= ${CC:=cc}#g" \
-    -e "s#\(\$(CROSS_COMPILE)\)gcc#\1${CC}#g" Makefile > _
+sed -e "s#= g[c+][c+]#= $CC#g" \
+    -e "s#\(\$(CROSS_COMPILE)\)gcc#\1$CC#g" Makefile > _
 mv -f _ Makefile

 case $("$CC" --version) in *clang*)
@ -16,13 +16,13 @@ case $("$CC" --version) in *clang*)

    # Ensure that busybox's build system is aware that 'cc' may point
    # to clang rather than GCC. This is the case in non-GCC systems.
-    sed "s&\(\$(CC),\)clang&\1${CC}&g" Makefile.flags > _
+    sed "s&\(\$(CC),\)clang&\1$CC&g" Makefile.flags > _
    mv -f _ Makefile.flags
 esac

 # Build and install regular busybox.
 # This excludes utilities which require 'suid' to function.
-make CC="$CC" HOSTCC="$CC"
+make HOSTCC="$CC"
 make CONFIG_PREFIX="$1/usr" install

 # Rename the binary temporarily.
@ -31,7 +31,7 @@ mv "$1/usr/bin/busybox" "$1/usr/bin/busybox-nosuid"
 # Build and install suid busybox.
 # This _only_ includes utlities which require 'suid' to function.
 cp -f .config-suid .config
-make CC="$CC" HOSTCC="$CC"
+make HOSTCC="$CC"
 make CONFIG_PREFIX="$1/usr" install

 # Aptly name the busybox binaries.
--- a/core/bzip2/build
+++ b/core/bzip2/build
@ -1,7 +1,7 @@
 #!/bin/sh -e

-make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" -f Makefile-libbz2_so
-make CC="${CC:-cc} $CFLAGS -static -fPIC $LDFLAGS" bzip2
+make CC="$CC $CFLAGS -fPIC $LDFLAGS" -f Makefile-libbz2_so
+make CC="$CC $CFLAGS -static -fPIC $LDFLAGS" bzip2

 mkdir -p \
    "$1/usr/bin" \
--- a/core/curl/build
+++ b/core/curl/build
@ -19,4 +19,4 @@
    --without-zstd

 make curl_LDFLAGS=-all-static
-make DESTDIR="$1" install
+make install
--- a/core/flex/build
+++ b/core/flex/build
@ -6,7 +6,7 @@
    ac_cv_func_realloc_0_nonnull=yes

 make
-make DESTDIR="$1" install
+make install

 ln -s flex "$1/usr/bin/lex"

--- a/core/gcc/build
+++ b/core/gcc/build
@ -58,7 +58,7 @@ export libat_cv_have_ifunc=no
    "${bootstrap:---enable-bootstrap}"

 make
-make DESTDIR="$1" install
+make install

 # Save 35MB.
 find "$1" -name libgtkpeer.a  -exec rm -f {} +
--- a/core/git/build
+++ b/core/git/build
@ -24,6 +24,6 @@ EOF
    ac_cv_fread_reads_directories=yes

 make LIBS="$(curl-config --static-libs) libgit.a xdiff/lib.a -lz"
-make DESTDIR="$1" install
+make install

 cp -Rf man "$1/usr/share/man"
--- a/core/grub/build
+++ b/core/grub/build
@ -18,10 +18,6 @@ done
 CFLAGS=$(printf %s "$CFLAGS"   | sed 's/-march=[^ ]*//g')
 CFLAGS=$(printf %s "$CXXFLAGS" | sed 's/-march=[^ ]*//g')

-# Grub is built in a function so the script argument
-# needs to be stored.
-pkg_dir=$1
-
 build_grub() (
    cd "grub-${1##*=}"

@ -36,7 +32,7 @@ build_grub() (
        "$@"

    make
-    make DESTDIR="$pkg_dir" install
+    make install
 )

 build_grub --with-platform=pc
@ -47,7 +43,7 @@ cp -f grub.default "$1/etc/default/grub"

 # Remove gdb debugging files.
 (
-    cd "$pkg_dir/usr/lib"
+    cd "$1/usr/lib"

    rm -f grub/*/*.module
    rm -f grub/*/*.image
--- a/core/linux-headers/build
+++ b/core/linux-headers/build
@ -1,6 +1,6 @@
 #!/bin/sh -e

-make HOSTCC="${CC:-cc}" headers
+make HOSTCC="$CC" headers

 # The headers require rsync for installation, this command
 # simply does the equivalent using find, mkdir and cp.
--- a/core/m4/build
+++ b/core/m4/build
@ -6,4 +6,4 @@ export CFLAGS="$CFLAGS -static"
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install
--- a/core/make/build
+++ b/core/make/build
@ -6,4 +6,4 @@ export CFLAGS="$CFLAGS -static"
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install
--- a/core/musl/build
+++ b/core/musl/build
@ -10,7 +10,7 @@
 #   --enable-debug

 make
-make DESTDIR="$1" install
+make install

 mkdir -p "$1/usr/bin"
 ln -s  /usr/lib/ld-musl-x86_64.so.1 "$1/usr/bin/ldd"
--- a/core/openssl/build
+++ b/core/openssl/build
@ -1,9 +1,5 @@
 #!/bin/sh -e

-# Build with CC for clang compatibility.
-# If CC is unset, GCC is forced.
-export CC="${CC:-cc}"
-
 ./Configure \
    --prefix=/usr \
    --openssldir=/etc/ssl \
@ -31,5 +27,5 @@ cp -f update-certdata.sh "$1/etc/ssl"
        --with-openssl="$1/usr"

    make
-    make DESTDIR="$1" install
+    make install
 )
--- a/core/pigz/build
+++ b/core/pigz/build
@ -1,15 +1,20 @@
-#!/bin/sh -e
+#!/bin/sh -ef
+#
+# Intentional, globbing disabled.
+# shellcheck disable=2086

-make CC="${CC:-cc} -static"
+set -- pigz.o yarn.o try.o
+
+for f do
+    "$CC" -c -o "$f" "${f%%.o}.c" $CPPFLAGS -DNOZOPFLI $CFLAGS
+done
+"$CC" -static -o pigz "$@" $CPPFLAGS $CFLAGS -lz $LDFLAGS

 mkdir -p \
-    "$1/usr/bin" \
-    "$1/usr/share/man/man1"
+    "$DESTDIR/usr/bin" \
+    "$DESTDIR/usr/share/man/man1"

-cp -f pigz unpigz "$1/usr/bin"
-cp -f pigz.1 "$1/usr/share/man/man1"
-
-ln -sf pigz   "$1/usr/bin/gzip"
-ln -sf pigz   "$1/usr/bin/zcat"
-ln -sf unpigz "$1/usr/bin/gunzip"
-ln -sf pigz.1 "$1/usr/share/man/man1/gzip.1"
+cp  -f pigz   "$DESTDIR/usr/bin"
+ln -sf pigz   "$DESTDIR/usr/bin/gzip"
+cp  -f pigz.1 "$DESTDIR/usr/share/man/man1"
+ln -sf pigz.1 "$DESTDIR/usr/share/man/man1/gzip.1"
--- a/core/pigz/depends
+++ b/core/pigz/depends
@ -0,0 +1 @@
+zlib make
--- a/core/pigz/post-install
+++ b/core/pigz/post-install
@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+cat <<EOF
+
+The commands zcat, unpigz and gunzip were merely symbolic
+links to the pigz binary. They have been removed. To gain
+them back, create the symlinks (or use an alias or shell
+function).
+
+EOF
--- a/core/pigz/version
+++ b/core/pigz/version
@ -1 +1 @@
-2.6 1
+2.6 2
--- a/core/xz/build
+++ b/core/xz/build
@ -6,4 +6,4 @@
    --disable-nls

 make
-make DESTDIR="$1" install
+make install
--- a/core/zlib/build
+++ b/core/zlib/build
@ -8,4 +8,4 @@ export CFLAGS="$CFLAGS -fPIC"
    --shared

 make
-make DESTDIR="$1" install
+make install
--- a/extra/adwaita-icon-theme/build
+++ b/extra/adwaita-icon-theme/build
@ -4,4 +4,4 @@
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install
--- a/extra/alsa-lib/build
+++ b/extra/alsa-lib/build
@ -5,4 +5,4 @@
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install
--- a/extra/alsa-utils/build
+++ b/extra/alsa-utils/build
@ -10,4 +10,4 @@
    --disable-nls

 make
-make DESTDIR="$1" install
+make install
--- a/extra/atk/build
+++ b/extra/atk/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 # Don't build tests.
 sed "/subdir('tests')/d" meson.build > _
 mv -f _ meson.build
--- a/extra/cairo/build
+++ b/extra/cairo/build
@ -24,4 +24,4 @@ mv -f _ Makefile.in
    --disable-gtk-doc-html

 make
-make DESTDIR="$1" install
+make install
--- a/extra/ccache/build
+++ b/extra/ccache/build
@ -1,6 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
 export CFLAGS="$CFLAGS -static"
 export CXXFLAGS="$CXXFLAGS -static"

--- a/extra/clang/build
+++ b/extra/clang/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 cmake -B build \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_BUILD_TYPE=Release \
--- a/extra/cmake/build
+++ b/extra/cmake/build
@ -3,8 +3,6 @@
 patch -p1 < cmake-no-execinfo.patch

 if kiss l cmake; then
-    export DESTDIR="$1"
-
    cmake -B build \
        -DCMAKE_INSTALL_PREFIX=/usr \
        -DCMAKE_BUILD_TYPE=Release \
@ -26,7 +24,7 @@ else
        --system-bzip2

    make
-    make DESTDIR="$1" install
+    make install
 fi

 rm -rf \
--- a/extra/dhcpcd/build
+++ b/extra/dhcpcd/build
@ -8,7 +8,7 @@
    --libexecdir=/usr/lib/dhcpcd

 make
-make DESTDIR="$1" install
+make install

 # Install runit service.
 mkdir -p "$1/etc/sv/dhcpcd"
--- a/extra/dosfstools/build
+++ b/extra/dosfstools/build
@ -11,4 +11,4 @@ mv -f _ Makefile.in
    --enable-compat-symlinks

 make
-make DESTDIR="$1" install
+make install
--- a/extra/e2fsprogs/build
+++ b/extra/e2fsprogs/build
@ -16,10 +16,7 @@ export LDFLAGS="$LDFLAGS -static"

 make

-dest=$1
-
 set -- \
-    DESTDIR="$dest" \
    MKDIR_P="mkdir -p" \
    BLKID_MAN="" \
    BLKID_PROG="" \
--- a/extra/efibootmgr/build
+++ b/extra/efibootmgr/build
@ -1,6 +1,6 @@
 #!/bin/sh -e

-make CC="${CC:-cc}" EFIDIR=/boot/EFI efibootmgr
+make EFIDIR=/boot/EFI efibootmgr

 mkdir -p \
    "$1/usr/bin" \
--- a/extra/efivar/build
+++ b/extra/efivar/build
@ -17,5 +17,5 @@ mk() {
        "$@"
 }

-mk CC="${CC:-cc}"
-mk DESTDIR="$1" install
+mk COMPILER="$CC"
+mk install
--- a/extra/eiwd/build
+++ b/extra/eiwd/build
@ -7,7 +7,7 @@
    --disable-dbus

 make
-make DESTDIR="$1" install
+make install

 # Install runit service.
 install -Dm755 eiwd.run         "$1/etc/sv/eiwd/run"
--- a/extra/expat/build
+++ b/extra/expat/build
@ -8,9 +8,7 @@
    --without-docbook

 make
-make DESTDIR="$1" install
+make install

 # Remove documentation (Changelogs, etc).
-# False positive.
-# shellcheck disable=SC2115
-rm -rf "$1/usr/share"
+rm -rf "${1:?}/usr/share"
--- a/extra/ffmpeg/build
+++ b/extra/ffmpeg/build
@ -1,8 +1,8 @@
 #!/bin/sh -e

 ./configure \
-    --cc="${CC:-cc}" \
-    --cxx="${CXX:-c++}" \
+    --cc="$CC" \
+    --cxx="$CXX" \
    --prefix=/usr \
    --disable-debug \
    --disable-libxml2 \
@ -30,6 +30,6 @@
    --x86asmexe=nasm \

 make
-make DESTDIR="$1" install
+make install

 rm -rf "$1/usr/share/ffmpeg/examples"
--- a/extra/firefox/build
+++ b/extra/firefox/build
@ -40,15 +40,10 @@ mv -f _ "$_f"
 export PATH="$PWD/junk/bin:$PATH"

 # If using libc++, CXXSTDLIB needs to be set manually.
-case $("${CC:-cc}" -print-file-name=libc++.so) in */*)
+case $("$CC" -print-file-name=libc++.so) in */*)
    export CXXSTDLIB=c++
 esac

-# Bypass 'ccache' as it's totally useless when building
-# Firefox and only slows things down.
-export CC="${CC:-/usr/bin/cc}"
-export CXX="${CXX:-/usr/bin/c++}"
-
 export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox,--enable-new-dtags"
 export RUSTFLAGS="$RUSTFLAGS -Cdebuginfo=0"
 export MACH_USE_SYSTEM_PYTHON=1
@ -103,7 +98,7 @@ ac_add_options --disable-webrtc
 EOF

 ./mach build
-DESTDIR="$1" ./mach install
+./mach install

 # Remove a lot of uneeded "stuff".
 rm -rf \
--- a/extra/fontconfig/build
+++ b/extra/fontconfig/build
@ -10,4 +10,4 @@
    --disable-nls

 make
-make DESTDIR="$1" install
+make install
--- a/extra/freetype-harfbuzz/build
+++ b/extra/freetype-harfbuzz/build
@ -10,7 +10,7 @@ build_freetype() (
        --with-harfbuzz="$2"

    make
-    make DESTDIR="$1" install
+    make install
 )

 build_harfbuzz() (
@ -18,7 +18,6 @@ build_harfbuzz() (
    export CFLAGS="$CFLAGS -I$1/usr/include/freetype2"
    export CXXFLAGS="$CXXFLAGS -I$1/usr/include/freetype2"
    export LDFLAGS="$LDFLAGS -L$1/usr/lib"
-    export DESTDIR="$1"

    cd harfbuzz

--- a/extra/gcompat/build
+++ b/extra/gcompat/build
@ -11,7 +11,7 @@ mv -f _ Makefile
 export PKG_CONFIG=/bin/true

 make LINKER_PATH=/usr/lib/ld-musl-x86_64.so.1
-make DESTDIR="$1" install
+make install

 ln -s ld-linux.so.2 "$1/usr/lib/ld-linux-x86-64.so.2"

--- a/extra/gdk-pixbuf/build
+++ b/extra/gdk-pixbuf/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 sed "/subdir('tests')/d" meson.build > _
 mv -f _ meson.build

--- a/extra/giflib/build
+++ b/extra/giflib/build
@ -1,4 +1,4 @@
 #!/bin/sh -e

 make
-make DESTDIR="$1" PREFIX=/usr install
+make PREFIX=/usr install
--- a/extra/glib/build
+++ b/extra/glib/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 # Remove 'libelf' dependency.
 sed 's/HAVE_LIBELF/HAVE_KISS/' gio/meson.build > _
 mv -f _ gio/meson.build
--- a/extra/gnugrep/build
+++ b/extra/gnugrep/build
@ -6,6 +6,6 @@ export CFLAGS="$CFLAGS -Wno-error -static"
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install

 cp -f src/grep "$1/usr/bin/ggrep"
--- a/extra/gnupg1/build
+++ b/extra/gnupg1/build
@ -11,4 +11,4 @@ export CFLAGS="$CFLAGS -fcommon"
    --disable-nls

 make
-make DESTDIR="$1" install
+make install
--- a/extra/gperf/build
+++ b/extra/gperf/build
@ -4,7 +4,7 @@
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install

 # Remove HTML documentation.
 rm -rf "$1/usr/share/doc"
--- a/extra/gtk+3/build
+++ b/extra/gtk+3/build
@ -17,8 +17,6 @@ patch -p1 < schemas.patch
        -Dintrospection=false \
        . output

-    export DESTDIR="$1"
-
    ninja -C output
    ninja -C output install
 )
@ -57,7 +55,7 @@ mv -f _ Makefile.in
    --enable-gtk-doc-html=no

 make
-make DESTDIR="$1" install
+make install

 # We don't compile with librsvg which leads to this
 # utility solely causing compiler errors for some
--- a/extra/hicolor-icon-theme/build
+++ b/extra/hicolor-icon-theme/build
@ -3,4 +3,4 @@
 ./configure \
    --prefix=/usr

-make DESTDIR="$1" install
+make install
--- a/extra/intel-vaapi-driver/build
+++ b/extra/intel-vaapi-driver/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 # Fix build fail with GCC 10.
 export CFLAGS="$CFLAGS -fcommon"

--- a/extra/json-c/build
+++ b/extra/json-c/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 cmake -B build \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_INSTALL_LIBDIR=lib \
--- a/extra/lame/build
+++ b/extra/lame/build
@ -12,4 +12,4 @@ mv -f _ doc/Makefile.in
    --disable-gtktest

 make
-make DESTDIR="$1" install
+make install
--- a/extra/libass/build
+++ b/extra/libass/build
@ -15,4 +15,4 @@ chmod +x configure
    --enable-fontconfig

 make
-make DESTDIR="$1" install
+make install
--- a/extra/libelf/build
+++ b/extra/libelf/build
@ -23,8 +23,8 @@ mv -f _ lib/Makefile.in
 # Skip the default make target and build only what we need.
 make -C lib
 make -C libelf
-make -C libelf DESTDIR="$1" install
-make -C doc    DESTDIR="$1" install-man3
+make -C libelf install
+make -C doc    install-man3

 mkdir -p "$1/usr/lib/pkgconfig"
 cp -f config/libelf.pc "$1/usr/lib/pkgconfig/libelf.pc"
--- a/extra/libepoxy/build
+++ b/extra/libepoxy/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 meson \
    --prefix=/usr \
    --sysconfdir=/etc \
--- a/extra/libffi/build
+++ b/extra/libffi/build
@ -6,7 +6,7 @@
    --with-pic

 make
-make DESTDIR="$1" install
+make install

 # Maintain compatibility and avoid the need
 # for rebuilds of all packages linking to
--- a/extra/libjpeg-turbo/build
+++ b/extra/libjpeg-turbo/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 patch -p1 < no-docs.patch

 cmake -B build \
--- a/extra/libogg/build
+++ b/extra/libogg/build
@ -4,12 +4,7 @@
    --prefix=/usr

 make -C src
+make -C include install
+make -C src     install

-# Install library and headers.
-make -C include DESTDIR="$1" install
-make -C src     DESTDIR="$1" install
-
-# Install m4 and pkg-config data.
-make DESTDIR="$1" \
-    install-m4dataDATA \
-    install-pkgconfigDATA
+make install-m4dataDATA install-pkgconfigDATA
--- a/extra/libpng/build
+++ b/extra/libpng/build
@ -6,4 +6,4 @@ patch -p1 < libpng-1.6.37-apng.patch
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install
--- a/extra/libtheora/build
+++ b/extra/libtheora/build
@ -6,6 +6,6 @@ patch -p0 < libtheora-1.1.1-libpng16.patch
    --prefix=/usr

 make
-make -C lib     DESTDIR="$1" install
-make -C include DESTDIR="$1" install
-make            DESTDIR="$1" install-pkgconfigDATA
+make -C lib     install
+make -C include install
+make install-pkgconfigDATA
--- a/extra/libudev-zero/build
+++ b/extra/libudev-zero/build
@ -1,4 +1,4 @@
 #!/bin/sh -e

 make PREFIX=/usr
-make DESTDIR="$1" PREFIX=/usr install
+make PREFIX=/usr install
--- a/extra/libva-utils/build
+++ b/extra/libva-utils/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 meson \
    --prefix=/usr \
    --sysconfdir=/etc \
--- a/extra/libva/build
+++ b/extra/libva/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 meson \
    --prefix=/usr \
    --sysconfdir=/etc \
--- a/extra/libvorbis/build
+++ b/extra/libvorbis/build
@ -5,12 +5,8 @@

 make

-# Install library and headers.
-make -C lib     DESTDIR="$1" install
-make -C include DESTDIR="$1" install
+make -C lib     install
+make -C include install

-# Install m4 and pkg-config data.
-make DESTDIR="$1" \
-    install-m4dataDATA \
-    install-pkgconfigDATA
+make install-m4dataDATA install-pkgconfigDATA

--- a/extra/libvpx/build
+++ b/extra/libvpx/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export CC=${CC:-cc} CXX=${CXX:-c++}
-
 # Remove the perl requirement from configure.
 # Also fix issue with non-GNU diff.
 sed 's/perl/:/g;s/diff --version/command -v diff/' configure > _
@ -28,4 +26,4 @@ chmod +x configure
    --as=nasm

 make
-make DESTDIR="$1" install
+make install
--- a/extra/libwebp/build
+++ b/extra/libwebp/build
@ -8,4 +8,4 @@
    --enable-libwebpdecoder

 make
-make DESTDIR="$1" install
+make install
--- a/extra/llvm/build
+++ b/extra/llvm/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 cmake -B build \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_BUILD_TYPE=Release \
--- a/extra/lzip/build
+++ b/extra/lzip/build
@ -4,4 +4,4 @@
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install
--- a/extra/mandoc/build
+++ b/extra/mandoc/build
@ -8,7 +8,7 @@ sed 's,"more -s","less",g' main.c > _
 mv -f _ main.c

 # Use CC rather than broken default.
-sed "s/CC=.*/CC=${CC:-cc}/" configure > _
+sed "s/CC=.*/CC=$CC/" configure > _
 mv -f _ configure
 chmod +x configure

@ -17,7 +17,6 @@ PREFIX=/usr
 MANDIR=/usr/share/man
 LIBDIR=/usr/lib
 SBINDIR=/usr/bin
-CC="${CC:-cc}"
 CFLAGS="$CFLAGS -fcommon"
 LN="ln -sf"
 EOF
@ -25,4 +24,4 @@ EOF
 ./configure

 make
-make -j1 DESTDIR="$1" base-install
+make -j1 base-install
--- a/extra/mesa/build
+++ b/extra/mesa/build
@ -24,7 +24,6 @@
 }

 export PYTHONPATH
-export DESTDIR="$1"
 export CFLAGS="$CFLAGS -DGLX_X86_READONLY_TEXT"

 # Fix issues with musl and firefox.
--- a/extra/mutt/build
+++ b/extra/mutt/build
@ -35,6 +35,6 @@ mv -f _ Makefile.in
    --with-sasl="$out/usr"

 make
-make DESTDIR="$1" install-exec
+make install-exec

 rm -f "$1/etc/mime.types"
--- a/extra/nasm/build
+++ b/extra/nasm/build
@ -4,4 +4,4 @@
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install
--- a/extra/ncurses/build
+++ b/extra/ncurses/build
@ -14,7 +14,7 @@
    --without-cxx-binding

 make
-make DESTDIR="$1" install
+make install

 # Force ncurses to link against wide-character ncurses library.
 for lib in ncurses form panel menu; do
--- a/extra/nodejs/build
+++ b/extra/nodejs/build
@ -8,8 +8,6 @@
    mv -f _ node.gyp
 }

-export CC="${CC:-cc}" CXX="${CXX:-c++}"
-
 ./configure \
    --shared-zlib \
    --shared-openssl \
--- a/extra/opendoas/build
+++ b/extra/opendoas/build
@ -11,7 +11,7 @@ mv -f _ GNUmakefile
    --without-pam

 make
-make DESTDIR="$1" install
+make install

 mkdir -p "$1/etc"
 cp -f doas.conf "$1/etc"
--- a/extra/openresolv/build
+++ b/extra/openresolv/build
@ -6,4 +6,4 @@
    --sysconfdir=/etc

 make
-make DESTDIR="$1" install
+make install
--- a/extra/opus/build
+++ b/extra/opus/build
@ -6,4 +6,4 @@
    --enable-float-approx

 make
-make DESTDIR="$1" install
+make install
--- a/extra/pango/build
+++ b/extra/pango/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 patch -p1 < no-fribidi.patch

 # First substitution disables weird case where build may try to git clone
--- a/extra/patchelf/build
+++ b/extra/patchelf/build
@ -4,6 +4,6 @@
    --prefix=/usr

 make
-make DESTDIR="$1" install
+make install

 rm -rf "$1/usr/share/doc"
--- a/extra/pcre/build
+++ b/extra/pcre/build
@ -5,6 +5,6 @@
    --enable-unicode-properties

 make
-make DESTDIR="$1" install
+make install

 rm -rf "$1/usr/share/doc"
--- a/extra/perl/build
+++ b/extra/perl/build
@ -20,10 +20,10 @@ export CFLAGS="$CFLAGS -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
    -Dlddlflags="-shared $LDFLAGS" \
    -Dldflags="$LDFLAGS" \
    -Doptimize="-Wall $CFLAGS" \
-    -Dcc="${CC:-cc}" \
-    -Dar="${AR:-ar}" \
-    -Dnm="${NM:-nm}" \
-    -Dranlib="${RANLIB:-ranlib}" \
+    -Dcc="$CC" \
+    -Dar="$AR" \
+    -Dnm="$NM" \
+    -Dranlib="$RANLIB" \
    -Dman1dir=/usr/share/man/man1 \
    -Dman3dir=/usr/share/man/man3 \
    -Dinstallman1dir=/usr/share/man/man1 \
@ -34,7 +34,7 @@ export CFLAGS="$CFLAGS -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
    -Dd_static_inline

 make
-make DESTDIR="$1" install
+make install

 # Remove all unneeded files.
 find "$1" -name \*.pod       -exec rm -f {} +
--- a/extra/pkgconf/build
+++ b/extra/pkgconf/build
@ -5,7 +5,7 @@
    --sysconfdir=/etc

 make
-make DESTDIR="$1" install
+make install

 ln -s pkgconf "$1/usr/bin/pkg-config"

--- a/extra/plzip/build
+++ b/extra/plzip/build
@ -6,7 +6,7 @@
 (cd lzlib; ./configure; make)

 # Fix build in libc++ environment.
-case $("${CC:-cc}" -print-file-name=libc++.a) in */*)
+case $("$CC" -print-file-name=libc++.a) in */*)
    CXXFLAGS="$CXXFLAGS -lunwind -lc++abi"
 esac

@ -15,7 +15,7 @@ esac
    CXXFLAGS="$CXXFLAGS -static -L$PWD/lzlib -I$PWD/lzlib"

 make
-make DESTDIR="$1" install
+make install

 # Create the symlink for compatibility. We're using
 # a multi-threaded implementation of lzip.
--- a/extra/python/build
+++ b/extra/python/build
@ -23,7 +23,7 @@ patch -p1 < python3-always-pip.patch
    --without-doc-strings

 make
-make DESTDIR="$1" install
+make install

 ln -s python3 "$1/usr/bin/python"
 ln -s pip3    "$1/usr/bin/pip"
--- a/extra/rsync/build
+++ b/extra/rsync/build
@ -16,4 +16,4 @@ export CFLAGS="-static $CFLAGS"
    --without-included-zlib

 make
-make DESTDIR="$1" install
+make install
--- a/extra/rust/build
+++ b/extra/rust/build
@ -65,8 +65,6 @@ llvm-config = "/usr/bin/llvm-config"
 crt-static  = false
 EOF

-export DESTDIR="$1"
-
 python3 ./x.py build -j "$(nproc)"
 python3 ./x.py install

--- a/extra/samurai/build
+++ b/extra/samurai/build
@ -1,7 +1,7 @@
 #!/bin/sh -e

 make PREFIX=/usr
-make PREFIX=/usr DESTDIR="$1" install
+make PREFIX=/usr install

 ln -sf samu   "$1/usr/bin/ninja"
 ln -sf samu.1 "$1/usr/share/man/man1/ninja.1"
--- a/extra/scdoc/build
+++ b/extra/scdoc/build
@ -1,4 +1,4 @@
 #!/bin/sh -e

 make PREFIX=/usr
-make DESTDIR="$1" PREFIX=/usr install
+make PREFIX=/usr install
--- a/extra/sqlite/build
+++ b/extra/sqlite/build
@ -12,5 +12,5 @@ chmod +x configure
    --enable-dynamic-extensions \
    --enable-fts5

-make -j1
-make DESTDIR="$1" install
+make
+make install
--- a/extra/ssu/build
+++ b/extra/ssu/build
@ -2,7 +2,6 @@

 make
 make \
-    DESTDIR="$1" \
    PREFIX=/usr \
    BINOWN="$(id -u)" \
    BINGRP="$(id -g)" \
--- a/extra/strace/build
+++ b/extra/strace/build
@ -5,4 +5,4 @@
    --disable-mpers

 make
-make DESTDIR="$1" install
+make install
--- a/extra/tiff/build
+++ b/extra/tiff/build
@ -8,7 +8,7 @@
    --without-x

 make
-make DESTDIR="$1" install
+make install

 # Remove HTML documentation.
 rm -rf "$1/usr/share/doc"
--- a/extra/tzdata/build
+++ b/extra/tzdata/build
@ -1,13 +1,11 @@
 #!/bin/sh -e

-pkg_dir=$1
-
-make CC="${CC:-cc}"
+make
 make DESTDIR="$1" ZICDIR=/usr/bin install

 set -- africa asia australasia europe northamerica southamerica

-./zic -d "$pkg_dir/usr/share/zoneinfo" "$@"
-./zic -d "$pkg_dir/usr/share/zoneinfo/posix" "$@"
-./zic -d "$pkg_dir/usr/share/zoneinfo/right" -L leapseconds "$@"
-./zic -d "$pkg_dir/usr/share/zoneinfo" -p America/New_York
+./zic -d "$DESTDIR/usr/share/zoneinfo" "$@"
+./zic -d "$DESTDIR/usr/share/zoneinfo/posix" "$@"
+./zic -d "$DESTDIR/usr/share/zoneinfo/right" -L leapseconds "$@"
+./zic -d "$DESTDIR/usr/share/zoneinfo" -p America/New_York
--- a/extra/util-linux/build
+++ b/extra/util-linux/build
@ -16,7 +16,7 @@
    --without-systemd

 make
-make DESTDIR="$1" install
+make install

 # Fix broken --sbindir.
 mv -f "$1/usr/sbin/"* "$1/usr/bin"
--- a/extra/vim/build
+++ b/extra/vim/build
@ -18,4 +18,4 @@
    --without-x

 make
-make DESTDIR="$1" install
+make install
--- a/extra/wpa_supplicant/build
+++ b/extra/wpa_supplicant/build
@ -3,7 +3,7 @@
 # The wpa_supplicant package is built statically using
 # libnl-tiny which is a minimal version of libnl maintained
 # by OpenWRT.
-make CC="${CC:-cc}" ALL_LIBS=libnl-tiny.a -C libnl
+make CC="$CC" ALL_LIBS=libnl-tiny.a -C libnl

 # The CFLAGS must be set to link to the above locally built
 # libnl-tiny library.
@ -12,8 +12,8 @@ export CFLAGS="$CFLAGS -static -D_GNU_SOURCE -DLIBNL1_COMPAT"

 cd wpa_supplicant

-make LIBDIR=/usr/lib BINDIR=/usr/bin DRV_LIBS="$CFLAGS" CC="${CC:-cc}"
-make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="$1" install
+make LIBDIR=/usr/lib BINDIR=/usr/bin DRV_LIBS="$CFLAGS"
+make LIBDIR=/usr/lib BINDIR=/usr/bin install

 mkdir -p \
    "$1/usr/share/man/man5" \
--- a/extra/x264/build
+++ b/extra/x264/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export CC=${CC:-cc} CXX=${CXX:-c++}
-
 patch -p1 < x264-no-bash.patch

 ./configure \
@ -12,4 +10,4 @@ patch -p1 < x264-no-bash.patch
    --enable-shared

 make
-make DESTDIR="$1" install
+make install
--- a/extra/x265/build
+++ b/extra/x265/build
@ -1,7 +1,5 @@
 #!/bin/sh -e

-export DESTDIR="$1"
-
 cmake source \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_BUILD_TYPE=Release
--- a/extra/zip/build
+++ b/extra/zip/build
@ -2,7 +2,7 @@

 make \
    prefix=/usr \
-    CC="${CC:-cc} $CFLAGS $CXXFLAGS" \
+    CC="$CC $CFLAGS $CXXFLAGS" \
    -f unix/Makefile generic

 make \
--- a/extra/zstd/build
+++ b/extra/zstd/build
@ -9,6 +9,5 @@ make \
    HAVE_LZ4=0

 make \
-    DESTDIR="$1" \
    PREFIX=/usr \
    install
--- a/Show More
+++ b/Show More
 @ -1 +1 @@
 .6 1
 .6 2