ports: Update recipes to use new stripping method and misc changes

vlang · Dec 28, 2023 · 2cec0b2 · 2cec0b2
1 parent 3d5c52c
commit 2cec0b2
Show file tree

Hide file tree

Showing 111 changed files with 331 additions and 125 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <<EOF >"${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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <stdint.h>
 +#include <stdlib.h>
 +#include <bits/ensure.h>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -16,4 +16,6 @@ build() {
 
 package() {
     DESTDIR="${dest_dir}" ninja install
+
+    post_package_strip
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,4 +17,6 @@ build() {
 
 package() {
     DESTDIR="${dest_dir}" ninja install
+
+    post_package_strip
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 }