From 48ca562cf15ebc0aa8359b82bb39db79b32577ee Mon Sep 17 00:00:00 2001 From: Anhad Singh Date: Thu, 9 Jan 2025 20:20:21 +1100 Subject: [PATCH 1/2] feat(prefix): set default hash style to GNU Our dynamic linker supports it. Signed-off-by: Anhad Singh --- mk/prefix.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mk/prefix.mk b/mk/prefix.mk index 14ef8d7..3030cdb 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -168,6 +168,7 @@ else --program-prefix="$(GNU_TARGET)-" \ --prefix="" \ --disable-werror \ + --enable-default-hash-style=gnu \ && \ $(MAKE) -j `$(NPROC)` all && \ $(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial" @@ -207,6 +208,7 @@ else --disable-nls \ --enable-languages=c,c++ \ --without-headers \ + --with-linker-hash-style=gnu \ && \ $(MAKE) -j `$(NPROC)` all-gcc && \ $(MAKE) -j `$(NPROC)` install-gcc DESTDIR="$(ROOT)/$@.partial" @@ -296,6 +298,7 @@ else --enable-languages=c,c++ \ --enable-shared \ --enable-threads=posix \ + --with-linker-hash-style=gnu \ && \ $(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc all-target-libstdc++-v3 && \ $(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="$(ROOT)/$@.partial" From 0bf3a56feaacd2c16bce2cc2308bf6887b464db4 Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Thu, 9 Jan 2025 16:15:28 -0800 Subject: [PATCH 2/2] Add 'touch sysroot' after copy of relibc-install --- mk/prefix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/mk/prefix.mk b/mk/prefix.mk index e10ab09..06f4049 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -110,6 +110,7 @@ ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) $(MAKE) $@ else cp -r "$(PREFIX)/relibc-install/" "$@" + touch "$@" cd "$(PREFIX)/libtool-build" && \ $(MAKE) install -j `$(NPROC)` cd "$@" && $(PREFIX_STRIP)