From fc9c903e089660a77208aae7f6ed3db33bce848d Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Mon, 14 Sep 2020 18:39:53 +0000
Subject: emulator/qemu-user-static: fix major regression from signal refactor

Excellent diagnosis by Andrew Gierth revealed the exact nature of the
regression from previous signal handling fixes; gobject-introspection now
builds, and we should be able to once again build a pretty large chunk of
the ports tree.

The configure script patch has been incorporated into our tree, so the patch
may be removed.

As mentioned previously, qemu-user-static and qemu-user-static-devel will
not always be updated in lockstep; future changes will land to
qemu-user-static-devel first followed by qemu-user-static.
---
 .../qemu-user-static-devel/files/patch-configure   | 52 ----------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 emulators/qemu-user-static-devel/files/patch-configure

(limited to 'emulators/qemu-user-static-devel/files/patch-configure')

diff --git a/emulators/qemu-user-static-devel/files/patch-configure b/emulators/qemu-user-static-devel/files/patch-configure
deleted file mode 100644
index 683beb48437e..000000000000
--- a/emulators/qemu-user-static-devel/files/patch-configure
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	2019-12-12 02:59:17 UTC
-+++ configure
-@@ -5954,27 +5954,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] 
-     cat > $TMPC <<EOF
-     int main(void) { return 0; }
- EOF
--    textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
-+    textseg_ldflags="-Wl,--image-base=$textseg_addr"
-     if ! compile_prog "" "$textseg_ldflags"; then
--      # In case ld does not support -Ttext-segment, edit the default linker
--      # script via sed to set the .text start addr.  This is needed on FreeBSD
--      # at least.
--      if ! $ld --verbose >/dev/null 2>&1; then
--        error_exit \
--            "We need to link the QEMU user mode binaries at a" \
--            "specific text address. Unfortunately your linker" \
--            "doesn't support either the -Ttext-segment option or" \
--            "printing the default linker script with --verbose." \
--            "If you don't want the user mode binaries, pass the" \
--            "--disable-user option to configure."
--      fi
-+      textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
-+      if ! compile_prog "" "$textseg_ldflags"; then
-+        # In case ld does not support -Ttext-segment, edit the default linker
-+        # script via sed to set the .text start addr.  This is needed on FreeBSD
-+        # at least.
-+        if ! $ld --verbose >/dev/null 2>&1; then
-+          error_exit \
-+              "We need to link the QEMU user mode binaries at a" \
-+              "specific text address. Unfortunately your linker" \
-+              "doesn't support either the -Ttext-segment option or" \
-+              "printing the default linker script with --verbose." \
-+              "If you don't want the user mode binaries, pass the" \
-+              "--disable-user option to configure."
-+        fi
- 
--      $ld --verbose | sed \
--        -e '1,/==================================================/d' \
--        -e '/==================================================/,$d' \
--        -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
--        -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
--      textseg_ldflags="-Wl,-T../config-host.ld"
-+        $ld --verbose | sed \
-+          -e '1,/==================================================/d' \
-+          -e '/==================================================/,$d' \
-+          -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
-+          -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
-+        textseg_ldflags="-Wl,-T../config-host.ld"
-+      fi
-     fi
-   fi
- fi
-- 
cgit v1.2.3