From 2cec0b27de4e62a3955d8c5371da991413293ec6 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Thu, 28 Dec 2023 19:30:34 +0100 Subject: [PATCH] ports: Update recipes to use new stripping method and misc changes --- host-recipes/autoconf | 3 +++ host-recipes/autoconf-2.69 | 3 +++ host-recipes/autoconf-archive | 2 ++ host-recipes/automake | 5 ++++- host-recipes/binutils | 5 ++++- host-recipes/cmake | 3 +++ host-recipes/gcc | 3 +++ host-recipes/libtool | 5 ++++- host-recipes/limine | 5 ++++- host-recipes/pkg-config | 5 ++++- host-recipes/v | 3 +++ host-recipes/xorg-font-util | 5 ++++- host-recipes/xorg-macros | 5 ++++- host-recipes/xtrans | 5 ++++- jinx-config | 16 ++++++++++++++++ kernel/GNUmakefile | 2 +- patches/mlibc/jinx-working-patch.patch | 18 ++++++++++-------- recipes/bash | 4 +++- recipes/binutils | 4 +++- recipes/bzip2 | 8 +++++--- recipes/coreutils | 4 +++- recipes/cxxshim | 2 ++ recipes/dejavu | 2 ++ recipes/diffutils | 4 +++- recipes/findutils | 4 +++- recipes/fontconfig | 4 +++- recipes/freetype | 3 ++- recipes/frigg | 2 ++ recipes/gawk | 4 +++- recipes/gcc | 4 +++- recipes/gmp | 4 +++- recipes/grep | 4 +++- recipes/gzip | 4 +++- recipes/init | 4 +++- recipes/kernel | 2 ++ recipes/less | 6 ++---- recipes/libepoxy | 2 +- recipes/libexpat | 4 +++- recipes/libffi | 4 +++- recipes/libfontenc | 4 +++- recipes/libgcc | 2 +- recipes/libice | 4 +++- recipes/libiconv | 4 ++-- recipes/libintl | 6 +++--- recipes/libpng | 4 +++- recipes/libsm | 4 +++- recipes/libstdc++ | 8 +++++--- recipes/libx11 | 4 +++- recipes/libxau | 4 +++- recipes/libxaw | 4 +++- recipes/libxcb | 4 +++- recipes/libxcrypt | 4 +++- recipes/libxcursor | 4 +++- recipes/libxdamage | 4 +++- recipes/libxdmcp | 4 +++- recipes/libxext | 4 +++- recipes/libxfixes | 4 +++- recipes/libxfont2 | 4 +++- recipes/libxft | 4 +++- recipes/libxi | 4 +++- recipes/libxkbcommon | 4 +--- recipes/libxkbfile | 4 +++- recipes/libxml | 4 +++- recipes/libxmu | 4 +++- recipes/libxpm | 4 +++- recipes/libxrandr | 4 +++- recipes/libxrender | 4 +++- recipes/libxshmfence | 4 +++- recipes/libxt | 4 +++- recipes/libxtrans | 4 +++- recipes/libxv | 4 +++- recipes/libxxf86vm | 4 +++- recipes/limine | 4 +++- recipes/llvm | 4 +++- recipes/make | 4 +++- recipes/mesa | 2 +- recipes/mlibc | 1 + recipes/mpc | 4 +++- recipes/mpfr | 4 +++- recipes/nano | 4 +++- recipes/nasm | 3 ++- recipes/ncurses | 3 +-- recipes/nettle | 4 +--- recipes/pcre2 | 4 +++- recipes/pixman | 4 +++- recipes/readline | 3 +-- recipes/sed | 4 +++- recipes/tar | 4 +++- recipes/twm | 4 +++- recipes/tzdata | 2 ++ recipes/util-vinix | 2 ++ recipes/v | 4 ++-- recipes/xbitmaps | 2 ++ recipes/xcb-proto | 4 +++- recipes/xclock | 4 +++- recipes/xeyes | 4 +++- recipes/xf86-input-keyboard | 4 +++- recipes/xf86-input-mouse | 4 +++- recipes/xf86-video-fbdev | 4 +++- recipes/xkbcomp | 4 +++- recipes/xkbutils | 4 +++- recipes/xkeyboard-config | 4 +++- recipes/xorg-font-util | 4 +++- recipes/xorg-proto | 4 +++- recipes/xorg-server | 4 +++- recipes/xorg-util-macros | 4 +++- recipes/xsetroot | 4 +++- recipes/xz-utils | 4 +++- recipes/zlib | 2 +- recipes/zstd | 4 +--- util-vinix/GNUmakefile | 8 ++++---- 111 files changed, 331 insertions(+), 125 deletions(-) diff --git a/host-recipes/autoconf b/host-recipes/autoconf index d230af9fe..08a52ad80 100644 --- a/host-recipes/autoconf +++ b/host-recipes/autoconf @@ -10,4 +10,7 @@ build() { package() { DESTDIR="${dest_dir}" make install + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/autoconf-2.69 b/host-recipes/autoconf-2.69 index e36ee6600..9593c60ac 100644 --- a/host-recipes/autoconf-2.69 +++ b/host-recipes/autoconf-2.69 @@ -10,4 +10,7 @@ build() { package() { DESTDIR="${dest_dir}" make install + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/autoconf-archive b/host-recipes/autoconf-archive index 9c9659e7c..1846aac50 100644 --- a/host-recipes/autoconf-archive +++ b/host-recipes/autoconf-archive @@ -5,4 +5,6 @@ revision=1 package() { mkdir -p "${dest_dir}${prefix}"/share/aclocal cp -r "${source_dir}"/m4/. "${dest_dir}${prefix}"/share/aclocal/ + + post_package_strip } diff --git a/host-recipes/automake b/host-recipes/automake index b1dbed16f..ba10abce9 100644 --- a/host-recipes/automake +++ b/host-recipes/automake @@ -11,8 +11,11 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install cp -pv /usr/local/share/autoconf/build-aux/config.sub "${dest_dir}${prefix}"/share/automake-1.16/ cp -pv /usr/local/share/autoconf/build-aux/config.guess "${dest_dir}${prefix}"/share/automake-1.16/ + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/binutils b/host-recipes/binutils index 8b63dcbc6..1fa8fb86e 100644 --- a/host-recipes/binutils +++ b/host-recipes/binutils @@ -17,5 +17,8 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/cmake b/host-recipes/cmake index f1df51252..38dea0145 100644 --- a/host-recipes/cmake +++ b/host-recipes/cmake @@ -12,4 +12,7 @@ build() { package() { DESTDIR="${dest_dir}" make install echo 'include(Platform/UnixPaths)' > "${dest_dir}${prefix}/share/cmake-3.27/Modules/Platform/Vinix.cmake" + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/gcc b/host-recipes/gcc index c72acf36a..8e61a54c7 100644 --- a/host-recipes/gcc +++ b/host-recipes/gcc @@ -30,4 +30,7 @@ build() { package() { cd build DESTDIR="${dest_dir}" make install-gcc + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/libtool b/host-recipes/libtool index fb83326a7..3141fc5d9 100644 --- a/host-recipes/libtool +++ b/host-recipes/libtool @@ -13,8 +13,11 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install cp -pv /usr/local/share/autoconf/build-aux/config.sub "${dest_dir}${prefix}"/share/libtool/build-aux/ cp -pv /usr/local/share/autoconf/build-aux/config.guess "${dest_dir}${prefix}"/share/libtool/build-aux/ + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/limine b/host-recipes/limine index bf7f13771..244ecab13 100644 --- a/host-recipes/limine +++ b/host-recipes/limine @@ -20,5 +20,8 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/pkg-config b/host-recipes/pkg-config index 212717cb4..ee2b4f6a1 100644 --- a/host-recipes/pkg-config +++ b/host-recipes/pkg-config @@ -12,7 +12,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install mkdir -p "${dest_dir}${prefix}/share/pkgconfig/personality.d" cat <"${dest_dir}${prefix}/share/pkgconfig/personality.d/${OS_TRIPLET}.personality" Triplet: ${OS_TRIPLET} @@ -22,4 +22,7 @@ SystemIncludePaths: ${sysroot_dir}/usr/include SystemLibraryPaths: ${sysroot_dir}/usr/lib EOF ln -s pkgconf "${dest_dir}${prefix}/bin/${OS_TRIPLET}-pkg-config" + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/v b/host-recipes/v index 48fef8ba6..88aba372d 100644 --- a/host-recipes/v +++ b/host-recipes/v @@ -15,4 +15,7 @@ package() { mkdir -p "${dest_dir}${prefix}"/bin ln -sf ../v/v "${dest_dir}${prefix}"/bin/v + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/xorg-font-util b/host-recipes/xorg-font-util index 297017632..30e711beb 100644 --- a/host-recipes/xorg-font-util +++ b/host-recipes/xorg-font-util @@ -10,5 +10,8 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/xorg-macros b/host-recipes/xorg-macros index 5fa1f3069..f5b9aef8e 100644 --- a/host-recipes/xorg-macros +++ b/host-recipes/xorg-macros @@ -9,5 +9,8 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + strip_command=strip \ + post_package_strip } diff --git a/host-recipes/xtrans b/host-recipes/xtrans index fd60dc11d..d174a18dd 100644 --- a/host-recipes/xtrans +++ b/host-recipes/xtrans @@ -10,5 +10,8 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + strip_command=strip \ + post_package_strip } diff --git a/jinx-config b/jinx-config index ed3b2292d..9ac22d954 100644 --- a/jinx-config +++ b/jinx-config @@ -5,6 +5,22 @@ export CXXFLAGS="${CFLAGS}" OS_TRIPLET=x86_64-vinix +post_package_strip() { + if [ -z "$strip_command" ]; then + strip_command=${OS_TRIPLET}-strip + fi + + for f in $(find "${dest_dir}"); do + if file "$f" | grep 'not stripped' >/dev/null; then + echo "* stripping '$f'..." + stripped_file=$(mktemp) + $strip_command "$f" -o "$stripped_file" + chmod --reference="$f" "$stripped_file" + mv -f "$stripped_file" "$f" + fi + done +} + autotools_recursive_regen() { for f in $(find . -name configure.ac); do echo "* autotools regen in '$(dirname $f)'..." diff --git a/kernel/GNUmakefile b/kernel/GNUmakefile index 571738964..6e3228c64 100644 --- a/kernel/GNUmakefile +++ b/kernel/GNUmakefile @@ -114,7 +114,7 @@ distclean: clean .PHONY: install install: install -d "$(DESTDIR)$(PREFIX)/boot" - install -s --strip-program=x86_64-vinix-strip $(KERNEL) "$(DESTDIR)$(PREFIX)/boot/" + install $(KERNEL) "$(DESTDIR)$(PREFIX)/boot/" blob.o: $(VFILES) freestanding_headers flanterm-c c/printf $(V) $(VFLAGS) $(INTERNALVFLAGS) -o blob.c . diff --git a/patches/mlibc/jinx-working-patch.patch b/patches/mlibc/jinx-working-patch.patch index 36f5f6da8..a91eb5113 100644 --- a/patches/mlibc/jinx-working-patch.patch +++ b/patches/mlibc/jinx-working-patch.patch @@ -213,10 +213,10 @@ index 524350c..c2e00db 100644 rtdl_include_dirs += include_directories('sysdeps/lyre/include') diff --git mlibc-workdir/sysdeps/vinix/generic/entry.cpp mlibc-workdir/sysdeps/vinix/generic/entry.cpp new file mode 100644 -index 0000000..5345d0e +index 0000000..cadab22 --- /dev/null +++ mlibc-workdir/sysdeps/vinix/generic/entry.cpp -@@ -0,0 +1,119 @@ +@@ -0,0 +1,120 @@ +#include +#include +#include @@ -231,6 +231,7 @@ index 0000000..5345d0e +void __mlibc_initLocale(); + +extern "C" uintptr_t *__dlapi_entrystack(); ++extern "C" void __dlapi_enter(uintptr_t *); + +extern char **environ; +static mlibc::exec_stack_data __mlibc_stack_data; @@ -329,10 +330,10 @@ index 0000000..5345d0e + __builtin_unreachable(); +} + -+extern "C" void __mlibc_entry(int (*main_fn)(int argc, char *argv[], char *env[])) { ++extern "C" void __mlibc_entry(uintptr_t *entry_stack, int (*main_fn)(int argc, char *argv[], char *env[])) { + mlibc::sys_sigentry((void *)__mlibc_sigentry); + -+ // TODO: call __dlapi_enter, otherwise static builds will break (see Linux sysdeps) ++ __dlapi_enter(entry_stack); + auto result = main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ); + exit(result); +} @@ -2680,15 +2681,16 @@ index 0000000..0713674 + diff --git mlibc-workdir/sysdeps/vinix/x86_64/crt-src/crt0.S mlibc-workdir/sysdeps/vinix/x86_64/crt-src/crt0.S new file mode 100644 -index 0000000..d16a46f +index 0000000..9b77ee7 --- /dev/null +++ mlibc-workdir/sysdeps/vinix/x86_64/crt-src/crt0.S -@@ -0,0 +1,7 @@ +@@ -0,0 +1,8 @@ +.section .text +.global _start +_start: -+ mov $main, %rdi -+ call __mlibc_entry ++ mov %rsp, %rdi ++ mov $main, %rsi ++ call __mlibc_entry +.section .note.GNU-stack,"",%progbits + diff --git mlibc-workdir/sysdeps/vinix/x86_64/crt-src/crti.S mlibc-workdir/sysdeps/vinix/x86_64/crt-src/crti.S diff --git a/recipes/bash b/recipes/bash index 935f30f9d..a220be4fa 100644 --- a/recipes/bash +++ b/recipes/bash @@ -19,6 +19,8 @@ build() { } package() { - make install-strip DESTDIR="${dest_dir}" + make install DESTDIR="${dest_dir}" ln -s bash "${dest_dir}${prefix}"/bin/sh + + post_package_strip } diff --git a/recipes/binutils b/recipes/binutils index 78257be3d..a65e702ed 100644 --- a/recipes/binutils +++ b/recipes/binutils @@ -25,11 +25,13 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install # Remove unnecessary directory rm -rf "${dest_dir}${prefix}"/${OS_TRIPLET} # Remove static libraries rm -rf "${dest_dir}${prefix}"/lib/*.a + + post_package_strip } diff --git a/recipes/bzip2 b/recipes/bzip2 index 17fdb02c4..e508ea5c6 100644 --- a/recipes/bzip2 +++ b/recipes/bzip2 @@ -15,9 +15,9 @@ build() { package() { mkdir -p "${dest_dir}${prefix}/bin" "${dest_dir}${prefix}/lib" "${dest_dir}${prefix}/lib/pkgconfig" "${dest_dir}${prefix}/include" - install -s --strip-program=${OS_TRIPLET}-strip bzip2-shared "${dest_dir}${prefix}/bin/bzip2" - install -s --strip-program=${OS_TRIPLET}-strip bzip2recover "${dest_dir}${prefix}/bin/" - install -s --strip-program=${OS_TRIPLET}-strip libbz2.so.1.0.8 "${dest_dir}${prefix}/lib/" + install bzip2-shared "${dest_dir}${prefix}/bin/bzip2" + install bzip2recover "${dest_dir}${prefix}/bin/" + install libbz2.so.1.0.8 "${dest_dir}${prefix}/lib/" install -m 644 bzlib.h "${dest_dir}${prefix}/include/" ln -sf libbz2.so.1.0.8 "${dest_dir}${prefix}/lib/libbz2.so.1.0" ln -sf libbz2.so.1.0 "${dest_dir}${prefix}/lib/libbz2.so.1" @@ -56,4 +56,6 @@ Requires: Libs: -L${prefix}/lib -lbz2 Cflags: -I${prefix}/include EOF + + post_package_strip } diff --git a/recipes/coreutils b/recipes/coreutils index 4d739a37b..51891f065 100644 --- a/recipes/coreutils +++ b/recipes/coreutils @@ -20,5 +20,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/cxxshim b/recipes/cxxshim index caf86c182..5bc9b7901 100644 --- a/recipes/cxxshim +++ b/recipes/cxxshim @@ -16,4 +16,6 @@ build() { package() { DESTDIR="${dest_dir}" ninja install + + post_package_strip } diff --git a/recipes/dejavu b/recipes/dejavu index 300291302..1cb78c129 100644 --- a/recipes/dejavu +++ b/recipes/dejavu @@ -10,4 +10,6 @@ build() { package() { mkdir -p "${dest_dir}${prefix}/share/fonts/truetype" cp -r ttf/* "${dest_dir}${prefix}/share/fonts/truetype/" + + post_package_strip } diff --git a/recipes/diffutils b/recipes/diffutils index 8144758f4..c667a00c1 100644 --- a/recipes/diffutils +++ b/recipes/diffutils @@ -18,5 +18,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/findutils b/recipes/findutils index 6d5039326..eb028da29 100644 --- a/recipes/findutils +++ b/recipes/findutils @@ -20,5 +20,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/fontconfig b/recipes/fontconfig index f6028d2b9..863d3dd5a 100644 --- a/recipes/fontconfig +++ b/recipes/fontconfig @@ -20,5 +20,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/freetype b/recipes/freetype index 9a312eb2d..5615e114a 100644 --- a/recipes/freetype +++ b/recipes/freetype @@ -19,5 +19,6 @@ build() { package() { DESTDIR="${dest_dir}" make install - ${OS_TRIPLET}-strip "${dest_dir}${prefix}/lib/libfreetype.so.6.20.1" + + post_package_strip } diff --git a/recipes/frigg b/recipes/frigg index 1f1da7041..27efebed2 100644 --- a/recipes/frigg +++ b/recipes/frigg @@ -17,4 +17,6 @@ build() { package() { DESTDIR="${dest_dir}" ninja install + + post_package_strip } diff --git a/recipes/gawk b/recipes/gawk index d3655684d..8bb12974e 100644 --- a/recipes/gawk +++ b/recipes/gawk @@ -18,5 +18,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/gcc b/recipes/gcc index a856c55a5..fa4a6326d 100644 --- a/recipes/gcc +++ b/recipes/gcc @@ -28,9 +28,11 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip-gcc + DESTDIR="${dest_dir}" make install-gcc ln -s gcc "${dest_dir}${prefix}"/bin/cc # Remove static libraries rm -rf "${dest_dir}${prefix}"/lib/*.a + + post_package_strip } diff --git a/recipes/gmp b/recipes/gmp index 177417c9f..8d8316284 100644 --- a/recipes/gmp +++ b/recipes/gmp @@ -19,5 +19,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/grep b/recipes/grep index a137b4ac4..28b5cc36f 100644 --- a/recipes/grep +++ b/recipes/grep @@ -19,5 +19,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/gzip b/recipes/gzip index 91b6ddfbb..5f5be3fe9 100644 --- a/recipes/gzip +++ b/recipes/gzip @@ -18,5 +18,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/init b/recipes/init index 27f0634ab..d69c927dc 100644 --- a/recipes/init +++ b/recipes/init @@ -16,5 +16,7 @@ build() { package() { install -d "${dest_dir}/usr/bin" - install -s --strip-program=x86_64-vinix-strip init "${dest_dir}/usr/bin/" + install init "${dest_dir}/usr/bin/" + + post_package_strip } diff --git a/recipes/kernel b/recipes/kernel index 94321ee77..cda084b73 100644 --- a/recipes/kernel +++ b/recipes/kernel @@ -12,4 +12,6 @@ build() { package() { make install PREFIX="/" DESTDIR="${dest_dir}" + + post_package_strip } diff --git a/recipes/less b/recipes/less index dcdf624b3..e4696741e 100644 --- a/recipes/less +++ b/recipes/less @@ -16,8 +16,6 @@ build() { package() { make install DESTDIR="${dest_dir}" - # We strip it manually because install-strip is broken. - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/bin/less - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/bin/lessecho - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/bin/lesskey + + post_package_strip } diff --git a/recipes/libepoxy b/recipes/libepoxy index c2a8dd76d..7115f64d6 100644 --- a/recipes/libepoxy +++ b/recipes/libepoxy @@ -20,5 +20,5 @@ build() { package() { DESTDIR="${dest_dir}" ninja install - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/libepoxy.so.0.0.0 + post_package_strip } diff --git a/recipes/libexpat b/recipes/libexpat index 5a9ddd330..6f6bb3733 100644 --- a/recipes/libexpat +++ b/recipes/libexpat @@ -17,5 +17,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libffi b/recipes/libffi index e85eac89a..25408d697 100644 --- a/recipes/libffi +++ b/recipes/libffi @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libfontenc b/recipes/libfontenc index db5983fbf..3eb234594 100644 --- a/recipes/libfontenc +++ b/recipes/libfontenc @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libgcc b/recipes/libgcc index 1e977231e..2b7b828b9 100644 --- a/recipes/libgcc +++ b/recipes/libgcc @@ -17,7 +17,7 @@ package() { rm -rf tmp_libgcc_dir mkdir tmp_libgcc_dir - DESTDIR="$(realpath tmp_libgcc_dir)" make install-strip-target-libgcc + DESTDIR="$(realpath tmp_libgcc_dir)" make install-target-libgcc mkdir -p "${dest_dir}${prefix}" diff --git a/recipes/libice b/recipes/libice index e2e4bf32c..81f07709b 100644 --- a/recipes/libice +++ b/recipes/libice @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libiconv b/recipes/libiconv index f9f9ac0a3..e9259bd92 100644 --- a/recipes/libiconv +++ b/recipes/libiconv @@ -19,7 +19,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/{libcharset.so.1.0.0,libiconv.so.2.6.1} + post_package_strip } diff --git a/recipes/libintl b/recipes/libintl index 3eff3ef25..41e62a904 100644 --- a/recipes/libintl +++ b/recipes/libintl @@ -39,7 +39,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make -C gettext-runtime/intl install-strip - # For some reason libintl.so is still not stripped, strip it now. - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/libintl.so.8.4.0 + DESTDIR="${dest_dir}" make -C gettext-runtime/intl install + + post_package_strip } diff --git a/recipes/libpng b/recipes/libpng index 70c959ea5..0a969eeb1 100644 --- a/recipes/libpng +++ b/recipes/libpng @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libsm b/recipes/libsm index 4446a4621..1ea2d9701 100644 --- a/recipes/libsm +++ b/recipes/libsm @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libstdc++ b/recipes/libstdc++ index b0707596d..664fdaea1 100644 --- a/recipes/libstdc++ +++ b/recipes/libstdc++ @@ -17,14 +17,16 @@ package() { rm -rf tmp_libstdc++_dir mkdir tmp_libstdc++_dir - DESTDIR="$(realpath tmp_libstdc++_dir)" make install-strip-target-libstdc++-v3 + DESTDIR="$(realpath tmp_libstdc++_dir)" make install-target-libstdc++-v3 + + # For some reason this also installs libgcc even though it shouldn't... + # Remove it. + rm -fv tmp_libstdc++_dir/usr/local/${OS_TRIPLET}/lib/libgcc* mkdir -p "${dest_dir}${prefix}" cp -r tmp_libstdc++_dir/usr/local/share "${dest_dir}${prefix}"/ cp -r tmp_libstdc++_dir/usr/local/${OS_TRIPLET}/* "${dest_dir}${prefix}"/ - # Remove static libraries - rm -rf "${dest_dir}${prefix}"/lib/*.a # Copy libstdc++ and headers into GCC's tree else it will complain. mkdir -p "${base_dir}"/host-pkgs/gcc/usr/local/${OS_TRIPLET} diff --git a/recipes/libx11 b/recipes/libx11 index 9ec25ce21..89b6a3fec 100644 --- a/recipes/libx11 +++ b/recipes/libx11 @@ -20,5 +20,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxau b/recipes/libxau index 22bc29b98..960d3dcf3 100644 --- a/recipes/libxau +++ b/recipes/libxau @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxaw b/recipes/libxaw index 77587f69e..2f35f6945 100644 --- a/recipes/libxaw +++ b/recipes/libxaw @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxcb b/recipes/libxcb index 24882559e..a8f28e913 100644 --- a/recipes/libxcb +++ b/recipes/libxcb @@ -18,5 +18,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxcrypt b/recipes/libxcrypt index 52e672743..bd07899e5 100644 --- a/recipes/libxcrypt +++ b/recipes/libxcrypt @@ -19,5 +19,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxcursor b/recipes/libxcursor index a8c45aa70..1f3c34a0e 100644 --- a/recipes/libxcursor +++ b/recipes/libxcursor @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxdamage b/recipes/libxdamage index d719b9428..6687dd2b0 100644 --- a/recipes/libxdamage +++ b/recipes/libxdamage @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxdmcp b/recipes/libxdmcp index 418e93808..5c815c032 100644 --- a/recipes/libxdmcp +++ b/recipes/libxdmcp @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxext b/recipes/libxext index 978da9406..68367c55b 100644 --- a/recipes/libxext +++ b/recipes/libxext @@ -17,5 +17,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxfixes b/recipes/libxfixes index 101ab4ba2..e179adefd 100644 --- a/recipes/libxfixes +++ b/recipes/libxfixes @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxfont2 b/recipes/libxfont2 index 16902e317..61d217c09 100644 --- a/recipes/libxfont2 +++ b/recipes/libxfont2 @@ -19,5 +19,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxft b/recipes/libxft index 66a1ada61..17624e8e0 100644 --- a/recipes/libxft +++ b/recipes/libxft @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxi b/recipes/libxi index 9729eeb35..738169d4d 100644 --- a/recipes/libxi +++ b/recipes/libxi @@ -17,5 +17,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxkbcommon b/recipes/libxkbcommon index 8682c7771..4f855e5ec 100644 --- a/recipes/libxkbcommon +++ b/recipes/libxkbcommon @@ -23,7 +23,5 @@ package() { DESTDIR="${dest_dir}" ninja install mkdir -p "${dest_dir}${prefix}/share/X11/xkb" - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/bin/* - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/{libxkbcommon-x11.so.0.0.0,libxkbcommon.so.0.0.0,libxkbregistry.so.0.0.0} - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/libexec/xkbcommon/* + post_package_strip } diff --git a/recipes/libxkbfile b/recipes/libxkbfile index befbaf94f..ee070decd 100644 --- a/recipes/libxkbfile +++ b/recipes/libxkbfile @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxml b/recipes/libxml index c637c466c..2140272eb 100644 --- a/recipes/libxml +++ b/recipes/libxml @@ -20,5 +20,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxmu b/recipes/libxmu index 7024dfb75..684184020 100644 --- a/recipes/libxmu +++ b/recipes/libxmu @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxpm b/recipes/libxpm index 444f52ff3..56a1c0e59 100644 --- a/recipes/libxpm +++ b/recipes/libxpm @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxrandr b/recipes/libxrandr index a8b7198d4..5d37bc81b 100644 --- a/recipes/libxrandr +++ b/recipes/libxrandr @@ -17,5 +17,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxrender b/recipes/libxrender index bdda316e5..70b9b3289 100644 --- a/recipes/libxrender +++ b/recipes/libxrender @@ -17,5 +17,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxshmfence b/recipes/libxshmfence index 3ddf1ae74..10355bbab 100644 --- a/recipes/libxshmfence +++ b/recipes/libxshmfence @@ -17,5 +17,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxt b/recipes/libxt index 956600938..315dad8fc 100644 --- a/recipes/libxt +++ b/recipes/libxt @@ -19,5 +19,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxtrans b/recipes/libxtrans index c77fecac9..01067a7c6 100644 --- a/recipes/libxtrans +++ b/recipes/libxtrans @@ -15,5 +15,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxv b/recipes/libxv index 4e745442a..ee54cb66c 100644 --- a/recipes/libxv +++ b/recipes/libxv @@ -17,5 +17,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/libxxf86vm b/recipes/libxxf86vm index b26d3e359..8d23a78b7 100644 --- a/recipes/libxxf86vm +++ b/recipes/libxxf86vm @@ -17,5 +17,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/limine b/recipes/limine index c29323d19..a23c6bd4e 100644 --- a/recipes/limine +++ b/recipes/limine @@ -23,5 +23,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/llvm b/recipes/llvm index 9b8aa565f..5c5183443 100644 --- a/recipes/llvm +++ b/recipes/llvm @@ -25,5 +25,7 @@ build() { } package() { - DESTDIR="${dest_dir}" ninja install/strip + DESTDIR="${dest_dir}" ninja install + + post_package_strip } diff --git a/recipes/make b/recipes/make index 2c713e97f..5ca80d649 100644 --- a/recipes/make +++ b/recipes/make @@ -18,5 +18,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/mesa b/recipes/mesa index 7eae36d80..6fe4ab805 100644 --- a/recipes/mesa +++ b/recipes/mesa @@ -17,5 +17,5 @@ build() { package() { DESTDIR="${dest_dir}" ninja install - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/{libGL.so.1.5.0,libGLESv1_CM.so.1.1.0,libGLESv2.so.2.0.0,libglapi.so.0.0.0} + post_package_strip } diff --git a/recipes/mlibc b/recipes/mlibc index 47675717e..956ed7dd1 100644 --- a/recipes/mlibc +++ b/recipes/mlibc @@ -13,6 +13,7 @@ build() { --libdir=lib \ --buildtype=debugoptimized \ -Dmlibc_no_headers=true \ + -Ddefault_library=both \ -Ddisable_crypt_option=true \ -Ddisable_iconv_option=true \ -Ddisable_intl_option=true \ diff --git a/recipes/mpc b/recipes/mpc index c09304956..d2a593541 100644 --- a/recipes/mpc +++ b/recipes/mpc @@ -17,5 +17,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/mpfr b/recipes/mpfr index 6d330d76c..736f89e74 100644 --- a/recipes/mpfr +++ b/recipes/mpfr @@ -21,5 +21,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/nano b/recipes/nano index 5cb1dbf58..b8ffd2957 100644 --- a/recipes/nano +++ b/recipes/nano @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/nasm b/recipes/nasm index 9f34add5d..ce3ded33d 100644 --- a/recipes/nasm +++ b/recipes/nasm @@ -17,6 +17,7 @@ build() { } package() { - make strip DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/ncurses b/recipes/ncurses index b804f61fc..99ab1fe8e 100644 --- a/recipes/ncurses +++ b/recipes/ncurses @@ -39,6 +39,5 @@ package() { # Remove static libraries rm -rf "${dest_dir}${prefix}"/lib/*.a - # Strip - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/{libformw.so,libmenuw.so,libncursesw.so,libpanelw.so,libtinfow.so} + post_package_strip } diff --git a/recipes/nettle b/recipes/nettle index ba2820deb..727dc84de 100644 --- a/recipes/nettle +++ b/recipes/nettle @@ -20,7 +20,5 @@ build() { package() { DESTDIR="${dest_dir}" make install - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/bin/* - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/libhogweed.so.6.8 - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/libnettle.so.8.8 + post_package_strip } diff --git a/recipes/pcre2 b/recipes/pcre2 index d6b157a27..9f25102c5 100644 --- a/recipes/pcre2 +++ b/recipes/pcre2 @@ -24,5 +24,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/pixman b/recipes/pixman index 644168b8f..b626fc38b 100644 --- a/recipes/pixman +++ b/recipes/pixman @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/readline b/recipes/readline index ddebb788d..721d8203d 100644 --- a/recipes/readline +++ b/recipes/readline @@ -20,6 +20,5 @@ build() { package() { make SHLIB_LIBS="-lncursesw" install DESTDIR="${dest_dir}" - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/libhistory.so.8 - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/libreadline.so.8 + post_package_strip } diff --git a/recipes/sed b/recipes/sed index 34b3d4c3b..0232471a6 100644 --- a/recipes/sed +++ b/recipes/sed @@ -18,5 +18,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/tar b/recipes/tar index b47a7ff20..de4d1248a 100644 --- a/recipes/tar +++ b/recipes/tar @@ -18,5 +18,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/twm b/recipes/twm index fb0c9b309..fd3b46300 100644 --- a/recipes/twm +++ b/recipes/twm @@ -15,5 +15,7 @@ build() { } package() { - make DESTDIR=${dest_dir} install-strip + make DESTDIR=${dest_dir} install + + post_package_strip } diff --git a/recipes/tzdata b/recipes/tzdata index 7a37df00f..cfc9fb17a 100644 --- a/recipes/tzdata +++ b/recipes/tzdata @@ -50,4 +50,6 @@ package() { # Default to UTC for localtime, this should be fixed, but that is pending xbstrap support. ln -sf /usr/share/zoneinfo/UTC "${dest_dir}"/etc/localtime + + post_package_strip } diff --git a/recipes/util-vinix b/recipes/util-vinix index 2d3708df7..0fc89b3d4 100644 --- a/recipes/util-vinix +++ b/recipes/util-vinix @@ -12,4 +12,6 @@ build() { package() { make install PREFIX="${prefix}" DESTDIR="${dest_dir}" + + post_package_strip } diff --git a/recipes/v b/recipes/v index fe10fed1e..c54f49bad 100644 --- a/recipes/v +++ b/recipes/v @@ -11,12 +11,12 @@ build() { } package() { - x86_64-vinix-strip v - rm -rf "${dest_dir}${prefix}"/v mkdir -p "${dest_dir}${prefix}"/v cp -r . "${dest_dir}${prefix}"/v/ mkdir -p "${dest_dir}${prefix}"/bin ln -sf ../v/v "${dest_dir}${prefix}"/bin/v + + post_package_strip } diff --git a/recipes/xbitmaps b/recipes/xbitmaps index a052c0180..ce6e7080b 100644 --- a/recipes/xbitmaps +++ b/recipes/xbitmaps @@ -16,4 +16,6 @@ build() { package() { make DESTDIR=${dest_dir} install + + post_package_strip } diff --git a/recipes/xcb-proto b/recipes/xcb-proto index 1ea7cc86f..e048f0003 100644 --- a/recipes/xcb-proto +++ b/recipes/xcb-proto @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xclock b/recipes/xclock index f4217720d..7d406438e 100644 --- a/recipes/xclock +++ b/recipes/xclock @@ -16,7 +16,9 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install mv -v "${dest_dir}"/sysroot/* "${dest_dir}"/ rm -rf "${dest_dir}"/sysroot + + post_package_strip } diff --git a/recipes/xeyes b/recipes/xeyes index ec0e8d955..3c1675749 100644 --- a/recipes/xeyes +++ b/recipes/xeyes @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xf86-input-keyboard b/recipes/xf86-input-keyboard index 26197f976..2f9f40874 100644 --- a/recipes/xf86-input-keyboard +++ b/recipes/xf86-input-keyboard @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xf86-input-mouse b/recipes/xf86-input-mouse index eb4f09e32..3aeef2549 100644 --- a/recipes/xf86-input-mouse +++ b/recipes/xf86-input-mouse @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xf86-video-fbdev b/recipes/xf86-video-fbdev index 71af35b4c..1b6e78786 100644 --- a/recipes/xf86-video-fbdev +++ b/recipes/xf86-video-fbdev @@ -18,5 +18,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xkbcomp b/recipes/xkbcomp index 058c7d139..797760f41 100644 --- a/recipes/xkbcomp +++ b/recipes/xkbcomp @@ -15,5 +15,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xkbutils b/recipes/xkbutils index 0291cc02b..ae28ef177 100644 --- a/recipes/xkbutils +++ b/recipes/xkbutils @@ -15,5 +15,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xkeyboard-config b/recipes/xkeyboard-config index 495c398a4..29c99882c 100644 --- a/recipes/xkeyboard-config +++ b/recipes/xkeyboard-config @@ -18,5 +18,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xorg-font-util b/recipes/xorg-font-util index 434af169b..3624ecc52 100644 --- a/recipes/xorg-font-util +++ b/recipes/xorg-font-util @@ -15,5 +15,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xorg-proto b/recipes/xorg-proto index be4ee3fee..7f8fcf2f9 100644 --- a/recipes/xorg-proto +++ b/recipes/xorg-proto @@ -15,5 +15,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xorg-server b/recipes/xorg-server index 81cbb3cae..e849ebcf2 100644 --- a/recipes/xorg-server +++ b/recipes/xorg-server @@ -45,5 +45,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xorg-util-macros b/recipes/xorg-util-macros index 1b84e6423..e07dda40d 100644 --- a/recipes/xorg-util-macros +++ b/recipes/xorg-util-macros @@ -15,5 +15,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/xsetroot b/recipes/xsetroot index d1f66db02..2555422a8 100644 --- a/recipes/xsetroot +++ b/recipes/xsetroot @@ -15,5 +15,7 @@ build() { } package() { - make DESTDIR=${dest_dir} install-strip + make DESTDIR=${dest_dir} install + + post_package_strip } diff --git a/recipes/xz-utils b/recipes/xz-utils index d58c89598..1c24a6b45 100644 --- a/recipes/xz-utils +++ b/recipes/xz-utils @@ -16,5 +16,7 @@ build() { } package() { - DESTDIR="${dest_dir}" make install-strip + DESTDIR="${dest_dir}" make install + + post_package_strip } diff --git a/recipes/zlib b/recipes/zlib index 462fc2dd2..e5da846ef 100644 --- a/recipes/zlib +++ b/recipes/zlib @@ -17,5 +17,5 @@ package() { # Remove static libraries rm -rf "${dest_dir}${prefix}"/lib/*.a - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/libz.so.1.3 + post_package_strip } diff --git a/recipes/zstd b/recipes/zstd index 3cdc5f743..7388bfcf9 100644 --- a/recipes/zstd +++ b/recipes/zstd @@ -23,7 +23,5 @@ package() { # Remove static libraries. rm -rf "${dest_dir}${prefix}"/lib/*.a - # Strip executables. - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/lib/libzstd.so.1.5.5 - ${OS_TRIPLET}-strip "${dest_dir}${prefix}"/bin/zstd + post_package_strip } diff --git a/util-vinix/GNUmakefile b/util-vinix/GNUmakefile index bf112e10f..3679dbebf 100644 --- a/util-vinix/GNUmakefile +++ b/util-vinix/GNUmakefile @@ -51,7 +51,7 @@ clean: install: install -d "$(DESTDIR)$(PREFIX)/bin" - install -s --strip-program=x86_64-vinix-strip $(CHSH_TARGET) "$(DESTDIR)$(PREFIX)/bin/" - install -s --strip-program=x86_64-vinix-strip $(FETCH_TARGET) "$(DESTDIR)$(PREFIX)/bin/" - install -s --strip-program=x86_64-vinix-strip $(LSCPU_TARGET) "$(DESTDIR)$(PREFIX)/bin/" - install -s --strip-program=x86_64-vinix-strip $(MOUNT_TARGET) "$(DESTDIR)$(PREFIX)/bin/" + install $(CHSH_TARGET) "$(DESTDIR)$(PREFIX)/bin/" + install $(FETCH_TARGET) "$(DESTDIR)$(PREFIX)/bin/" + install $(LSCPU_TARGET) "$(DESTDIR)$(PREFIX)/bin/" + install $(MOUNT_TARGET) "$(DESTDIR)$(PREFIX)/bin/"