summaryrefslogtreecommitdiff
path: root/emulators/qemu30/files/patch-configure
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-04-21 18:22:15 +0000
committerRene Ladan <rene@FreeBSD.org>2020-04-21 18:22:15 +0000
commit76d542859eed5f53059a18c4319b02835290663f (patch)
treef66054d07c0339fd3f1b27e031804a8543d4b45f /emulators/qemu30/files/patch-configure
parentsecurity/step-certificates: Update to 0.14.3 (diff)
Remove expired port:
2020-04-21 emulators/qemu30: No longer maintained by upstream
Notes
Notes: svn path=/head/; revision=532290
Diffstat (limited to 'emulators/qemu30/files/patch-configure')
-rw-r--r--emulators/qemu30/files/patch-configure314
1 files changed, 0 insertions, 314 deletions
diff --git a/emulators/qemu30/files/patch-configure b/emulators/qemu30/files/patch-configure
deleted file mode 100644
index 7c8698bcdba9..000000000000
--- a/emulators/qemu30/files/patch-configure
+++ /dev/null
@@ -1,314 +0,0 @@
---- configure.orig 2019-04-12 03:28:28 UTC
-+++ configure
-@@ -375,6 +375,7 @@ hax="no"
- hvf="no"
- whpx="no"
- rdma=""
-+pvrdma=""
- gprof="no"
- debug_tcg="no"
- debug="no"
-@@ -391,7 +392,7 @@ DSOSUF=".so"
- LDFLAGS_SHARED="-shared"
- modules="no"
- prefix="/usr/local"
--mandir="\${prefix}/share/man"
-+mandir="\${prefix}/man"
- datadir="\${prefix}/share"
- firmwarepath="\${prefix}/share/qemu-firmware"
- qemu_docdir="\${prefix}/share/doc/qemu"
-@@ -471,6 +472,9 @@ numa=""
- tcmalloc="no"
- jemalloc="no"
- replication="yes"
-+pcap="no"
-+pcap_create="no"
-+bpf="no"
- vxhs=""
- libxml2=""
- docker="no"
-@@ -1087,6 +1091,10 @@ for opt do
- ;;
- --enable-vnc-png) vnc_png="yes"
- ;;
-+ --enable-pcap) pcap="yes"
-+ ;;
-+ --disable-pcap) pcap="no"
-+ ;;
- --disable-slirp) slirp="no"
- ;;
- --disable-vde) vde="no"
-@@ -1363,6 +1371,10 @@ for opt do
- ;;
- --disable-rdma) rdma="no"
- ;;
-+ --enable-pvrdma) pvrdma="yes"
-+ ;;
-+ --disable-pvrdma) pvrdma="no"
-+ ;;
- --with-gtkabi=*) gtkabi="$optarg"
- ;;
- --disable-vte) vte="no"
-@@ -1669,7 +1681,8 @@ disabled with --disable-FEATURE, default is enabled if
- hax HAX acceleration support
- hvf Hypervisor.framework acceleration support
- whpx Windows Hypervisor Platform acceleration support
-- rdma Enable RDMA-based migration and PVRDMA support
-+ rdma Enable RDMA-based migration
-+ pvrdma Enable PVRDMA support
- vde support for vde network
- netmap support for netmap network
- linux-aio Linux AIO support
-@@ -2881,7 +2894,49 @@ else
- tasn1=no
- fi
-
-+##########################################
-+# PVRDMA detection
-
-+cat > $TMPC <<EOF &&
-+#include <sys/mman.h>
-+
-+int
-+main(void)
-+{
-+ char buf = 0;
-+ void *addr = &buf;
-+ addr = mremap(addr, 0, 1, MREMAP_MAYMOVE | MREMAP_FIXED);
-+
-+ return 0;
-+}
-+EOF
-+
-+if test "$rdma" = "yes" ; then
-+ case "$pvrdma" in
-+ "")
-+ if compile_prog "" ""; then
-+ pvrdma="yes"
-+ else
-+ pvrdma="no"
-+ fi
-+ ;;
-+ "yes")
-+ if ! compile_prog "" ""; then
-+ error_exit "PVRDMA is not supported since mremap is not implemented"
-+ fi
-+ pvrdma="yes"
-+ ;;
-+ "no")
-+ pvrdma="no"
-+ ;;
-+ esac
-+else
-+ if test "$pvrdma" = "yes" ; then
-+ error_exit "PVRDMA requires rdma suppport"
-+ fi
-+ pvrdma="no"
-+fi
-+
- ##########################################
- # getifaddrs (for tests/test-io-channel-socket )
-
-@@ -2891,6 +2946,14 @@ if ! check_include "ifaddrs.h" ; then
- fi
-
- ##########################################
-+# getifaddrs (for tests/test-io-channel-socket )
-+
-+have_ifaddrs_h=yes
-+if ! check_include "ifaddrs.h" ; then
-+ have_ifaddrs_h=no
-+fi
-+
-+##########################################
- # VTE probe
-
- if test "$vte" != "no"; then
-@@ -3061,7 +3124,51 @@ EOF
- fi
- fi
-
-+##########################################
-+# pcap probe
-
-+if test "$pcap" = "yes" -a "$pcap" != "no"; then
-+ cat > $TMPC << EOF
-+#include <pcap.h>
-+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); }
-+EOF
-+ if test "$mingw32" = "no" ; then
-+ libpcap=-lpcap
-+ else
-+ libpcap=-lwpcap
-+ fi
-+ if compile_prog "" "$libpcap" ; then
-+ :
-+ else
-+ echo
-+ echo "Error: Could not find pcap"
-+ echo "Make sure to have the pcap libs and headers installed."
-+ echo
-+ exit 1
-+ fi
-+ cat > $TMPC << EOF
-+#include <pcap.h>
-+int main(void)
-+{
-+ char errbuf[PCAP_ERRBUF_SIZE];
-+ return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0);
-+}
-+EOF
-+ if compile_prog "" "$libpcap" ; then
-+ pcap_create="yes"
-+ fi
-+ cat > $TMPC << EOF
-+#define PCAP_DONT_INCLUDE_PCAP_BPF_H
-+#include <pcap.h>
-+#include <net/bpf.h>
-+int main(void) { return (BPF_MAJOR_VERSION); }
-+EOF
-+ if compile_prog ; then
-+ bpf="yes"
-+ fi
-+ libs_softmmu="$libpcap $libs_softmmu"
-+fi # test "$pcap"
-+
- ##########################################
- # VNC SASL detection
- if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then
-@@ -3474,7 +3581,7 @@ for i in $glib_modules; do
- glib_libs=$($pkg_config --libs $i)
- QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
- LIBS="$glib_libs $LIBS"
-- libs_qga="$glib_libs $libs_qga"
-+ libs_qga="$glib_libs -lintl $libs_qga"
- else
- error_exit "glib-$glib_req_ver $i is required to compile QEMU"
- fi
-@@ -4419,14 +4526,7 @@ fi
-
- # Check if tools are available to build documentation.
- if test "$docs" != "no" ; then
-- if has makeinfo && has pod2man; then
- docs=yes
-- else
-- if test "$docs" = "yes" ; then
-- feature_not_found "docs" "Install texinfo and Perl/perl-podlators"
-- fi
-- docs=no
-- fi
- fi
-
- # Search for bswap_32 function
-@@ -4551,7 +4651,7 @@ fi
-
- # check for libusb
- if test "$libusb" != "no" ; then
-- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
-+ if $pkg_config libusb-1.0; then
- libusb="yes"
- libusb_cflags=$($pkg_config --cflags libusb-1.0)
- libusb_libs=$($pkg_config --libs libusb-1.0)
-@@ -5779,27 +5879,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
-@@ -5914,6 +6017,7 @@ echo "Audio drivers $audio_drv_list"
- echo "Block whitelist (rw) $block_drv_rw_whitelist"
- echo "Block whitelist (ro) $block_drv_ro_whitelist"
- echo "VirtFS support $virtfs"
-+echo "pcap support $pcap"
- echo "Multipath support $mpath"
- echo "VNC support $vnc"
- if test "$vnc" = "yes" ; then
-@@ -5949,6 +6053,7 @@ if test "$tcg" = "yes" ; then
- fi
- echo "malloc trim support $malloc_trim"
- echo "RDMA support $rdma"
-+echo "PVRDMA support $pvrdma"
- echo "fdt support $fdt"
- echo "membarrier $membarrier"
- echo "preadv support $preadv"
-@@ -6143,6 +6248,15 @@ fi
- if test "$profiler" = "yes" ; then
- echo "CONFIG_PROFILER=y" >> $config_host_mak
- fi
-+if test "$pcap" = "yes" ; then
-+ echo "CONFIG_PCAP=y" >> $config_host_mak
-+ if test "$pcap_create" = "yes" ; then
-+ echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak
-+ fi
-+ if test "$bpf" = "yes" ; then
-+ echo "CONFIG_BPF=y" >> $config_host_mak
-+ fi
-+fi
- if test "$slirp" = "yes" ; then
- echo "CONFIG_SLIRP=y" >> $config_host_mak
- echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
-@@ -6384,6 +6498,9 @@ fi
- if test "$have_fsxattr" = "yes" ; then
- echo "HAVE_FSXATTR=y" >> $config_host_mak
- fi
-+if test "$have_ifaddrs_h" = "yes" ; then
-+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak
-+fi
- if test "$have_copy_file_range" = "yes" ; then
- echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak
- fi
-@@ -6703,6 +6820,10 @@ echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_m
- if test "$rdma" = "yes" ; then
- echo "CONFIG_RDMA=y" >> $config_host_mak
- echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak
-+fi
-+
-+if test "$pvrdma" = "yes" ; then
-+ echo "CONFIG_PVRDMA=y" >> $config_host_mak
- fi
-
- if test "$have_rtnetlink" = "yes" ; then