diff options
Diffstat (limited to 'emulators/qemu-user-static-devel')
| -rw-r--r-- | emulators/qemu-user-static-devel/Makefile | 4 | ||||
| -rw-r--r-- | emulators/qemu-user-static-devel/distinfo | 6 | ||||
| -rw-r--r-- | emulators/qemu-user-static-devel/files/patch-configure | 52 |
3 files changed, 5 insertions, 57 deletions
diff --git a/emulators/qemu-user-static-devel/Makefile b/emulators/qemu-user-static-devel/Makefile index 8ef0108f75a7..b78d20bf44a7 100644 --- a/emulators/qemu-user-static-devel/Makefile +++ b/emulators/qemu-user-static-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= qemu PORTVERSION= 3.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators PKGNAMESUFFIX= -user-static-devel DIST_SUBDIR= qemu/${PORTVERSION} @@ -18,7 +18,7 @@ CONFLICTS_INSTALL= qemu-user-static-[0-9]* USES= bison compiler:c11 gmake perl5 pkgconfig python:build USE_GITHUB= yes -GH_TUPLE= seanbruno:qemu-bsd-user:e21442a \ +GH_TUPLE= seanbruno:qemu-bsd-user:ed53c04a13 \ qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb HAS_CONFIGURE= yes USE_PERL5= build diff --git a/emulators/qemu-user-static-devel/distinfo b/emulators/qemu-user-static-devel/distinfo index 2399546946d1..ca397be8fe3d 100644 --- a/emulators/qemu-user-static-devel/distinfo +++ b/emulators/qemu-user-static-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1576119784 -SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-e21442a_GH0.tar.gz) = 8396a53fbf6f46f89327bc0b747aca928dc21916f67952f938f6c527ccab8cfd -SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-e21442a_GH0.tar.gz) = 16902208 +TIMESTAMP = 1600104424 +SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-ed53c04a13_GH0.tar.gz) = e464282b0a953b2622801fa370841ec6073cda0fd78c9946e0e9fcf0b2956d48 +SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-ed53c04a13_GH0.tar.gz) = 16904224 SHA256 (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a SIZE (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895 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 |