Attachment 169479 Details for Bug 206292 – Replace X86_TARGETS with ALL_TARGETS

[patch] Replace X86_TARGETS with ALL_TARGETS

qemu-targets.diff (text/plain), 3.81 KB, created by Ed Maste on 2016-04-19 19:46:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Maste

Created: 2016-04-19 19:46:26 UTC

Size: 3.81 KB

patch

obsolete

>commit 1942a7000bf7a6eb09f3759557e9552908c324d3
>Author: Ed Maste <emaste@freebsd.org>
>Date:   Tue Apr 19 15:26:51 2016 -0400
>
>    Replace X86_TARGETS with ALL_TARGETS
>    
>    The double negative in X86_TARGETS was confusing ("Don't build non-x86
>    system targets") and was broken anyhow.
>
>diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
>index f6745c9..7802d07 100644
>--- a/emulators/qemu-devel/Makefile
>+++ b/emulators/qemu-devel/Makefile
>@@ -22,7 +22,7 @@ MAKE_ENV+=	BSD_MAKE="${MAKE}"
> ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts?
> 
> OPTIONS_DEFINE=	SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
>-		CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \
>+		CDROM_DMA PCAP USBREDIR GNS3 ALL_TARGETS \
> 		STATIC_LINK DOCS
> SAMBA_DESC=		samba dependency (for -smb)
> GNUTLS_DESC=		gnutls dependency (vnc encryption)
>@@ -33,9 +33,10 @@ CDROM_DMA_DESC=		IDE CDROM DMA
> PCAP_DESC=		pcap dependency (networking with bpf)
> USBREDIR_DESC=		usb device network redirection (experimental!)
> GNS3_DESC=		gns3 patches (promiscuous multicast)
>-X86_TARGETS_DESC=	Don't build non-x86 system targets
>+ALL_TARGETS_DESC=	Build all system targets, not just x86 ones
> STATIC_LINK_DESC=	Statically link the executables
>-OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP GNS3
>+OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP GNS3 \
>+		ALL_TARGETS
> OPTIONS_SUB=	yes
> X11_USE=	SDL=sdl
> X11_CONFIGURE_ON=	--enable-sdl
>diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
>index b1ea34c..fab0321 100644
>--- a/emulators/qemu-devel/pkg-plist
>+++ b/emulators/qemu-devel/pkg-plist
>@@ -8,34 +8,34 @@ bin/qemu-nbd
> bin/qemu-sparc
> bin/qemu-sparc64
> bin/qemu-x86_64
>-%%X86_TARGETS%%bin/qemu-system-aarch64
>-%%X86_TARGETS%%bin/qemu-system-alpha
>-%%X86_TARGETS%%bin/qemu-system-arm
>-%%X86_TARGETS%%bin/qemu-system-cris
>+%%ALL_TARGETS%%bin/qemu-system-aarch64
>+%%ALL_TARGETS%%bin/qemu-system-alpha
>+%%ALL_TARGETS%%bin/qemu-system-arm
>+%%ALL_TARGETS%%bin/qemu-system-cris
> bin/qemu-system-i386
>-%%X86_TARGETS%%bin/qemu-system-lm32
>-%%X86_TARGETS%%bin/qemu-system-m68k
>-%%X86_TARGETS%%bin/qemu-system-microblaze
>-%%X86_TARGETS%%bin/qemu-system-microblazeel
>-%%X86_TARGETS%%bin/qemu-system-mips
>-%%X86_TARGETS%%bin/qemu-system-mips64
>-%%X86_TARGETS%%bin/qemu-system-mips64el
>-%%X86_TARGETS%%bin/qemu-system-mipsel
>-%%X86_TARGETS%%bin/qemu-system-moxie
>-%%X86_TARGETS%%bin/qemu-system-or32
>-%%X86_TARGETS%%bin/qemu-system-ppc
>-%%X86_TARGETS%%bin/qemu-system-ppc64
>-%%X86_TARGETS%%bin/qemu-system-ppcemb
>-%%X86_TARGETS%%bin/qemu-system-s390x
>-%%X86_TARGETS%%bin/qemu-system-sh4
>-%%X86_TARGETS%%bin/qemu-system-sh4eb
>-%%X86_TARGETS%%bin/qemu-system-sparc
>-%%X86_TARGETS%%bin/qemu-system-sparc64
>-%%X86_TARGETS%%bin/qemu-system-tricore
>-%%X86_TARGETS%%bin/qemu-system-unicore32
>+%%ALL_TARGETS%%bin/qemu-system-lm32
>+%%ALL_TARGETS%%bin/qemu-system-m68k
>+%%ALL_TARGETS%%bin/qemu-system-microblaze
>+%%ALL_TARGETS%%bin/qemu-system-microblazeel
>+%%ALL_TARGETS%%bin/qemu-system-mips
>+%%ALL_TARGETS%%bin/qemu-system-mips64
>+%%ALL_TARGETS%%bin/qemu-system-mips64el
>+%%ALL_TARGETS%%bin/qemu-system-mipsel
>+%%ALL_TARGETS%%bin/qemu-system-moxie
>+%%ALL_TARGETS%%bin/qemu-system-or32
>+%%ALL_TARGETS%%bin/qemu-system-ppc
>+%%ALL_TARGETS%%bin/qemu-system-ppc64
>+%%ALL_TARGETS%%bin/qemu-system-ppcemb
>+%%ALL_TARGETS%%bin/qemu-system-s390x
>+%%ALL_TARGETS%%bin/qemu-system-sh4
>+%%ALL_TARGETS%%bin/qemu-system-sh4eb
>+%%ALL_TARGETS%%bin/qemu-system-sparc
>+%%ALL_TARGETS%%bin/qemu-system-sparc64
>+%%ALL_TARGETS%%bin/qemu-system-tricore
>+%%ALL_TARGETS%%bin/qemu-system-unicore32
> bin/qemu-system-x86_64
>-%%X86_TARGETS%%bin/qemu-system-xtensa
>-%%X86_TARGETS%%bin/qemu-system-xtensaeb
>+%%ALL_TARGETS%%bin/qemu-system-xtensa
>+%%ALL_TARGETS%%bin/qemu-system-xtensaeb
> man/man1/qemu.1.gz
> man/man1/qemu-img.1.gz
> man/man8/qemu-ga.8.gz

Flags:

bofh: maintainer-approval-

Actions: View | Diff

Attachments on bug 206292: 165632 | 167745 | 169479