From owner-svn-ports-all@freebsd.org Sun Mar 22 02:06:46 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 436A1273263; Sun, 22 Mar 2020 02:06:46 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48lLVG0Tfgz3G65; Sun, 22 Mar 2020 02:06:46 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51ADF1E188; Sun, 22 Mar 2020 02:06:45 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02M26jJ2091980; Sun, 22 Mar 2020 02:06:45 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02M26jPR091979; Sun, 22 Mar 2020 02:06:45 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <202003220206.02M26jPR091979@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Sun, 22 Mar 2020 02:06:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528890 - head/emulators/qemu-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: bofh X-SVN-Commit-Paths: head/emulators/qemu-devel/files X-SVN-Commit-Revision: 528890 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 02:06:46 -0000 Author: bofh Date: Sun Mar 22 02:06:44 2020 New Revision: 528890 URL: https://svnweb.freebsd.org/changeset/ports/528890 Log: emulators/qemu-devel: Fix build with lld 10.0.0 PR: 244769 Submitted by: dim Modified: head/emulators/qemu-devel/files/patch-configure Modified: head/emulators/qemu-devel/files/patch-configure ============================================================================== --- head/emulators/qemu-devel/files/patch-configure Sun Mar 22 00:50:42 2020 (r528889) +++ head/emulators/qemu-devel/files/patch-configure Sun Mar 22 02:06:44 2020 (r528890) @@ -1,6 +1,6 @@ ---- configure.orig 2019-04-23 18:14:45 UTC +--- configure.orig 2019-12-12 18:20:47 UTC +++ configure -@@ -396,7 +396,7 @@ DSOSUF=".so" +@@ -405,7 +405,7 @@ DSOSUF=".so" LDFLAGS_SHARED="-shared" modules="no" prefix="/usr/local" @@ -9,7 +9,7 @@ datadir="\${prefix}/share" firmwarepath="\${prefix}/share/qemu-firmware" qemu_docdir="\${prefix}/share/doc/qemu" -@@ -476,6 +476,9 @@ numa="" +@@ -489,6 +489,9 @@ numa="" tcmalloc="no" jemalloc="no" replication="yes" @@ -19,7 +19,7 @@ vxhs="" bochs="yes" cloop="yes" -@@ -1118,6 +1121,10 @@ for opt do +@@ -1125,6 +1128,10 @@ for opt do ;; --enable-vnc-png) vnc_png="yes" ;; @@ -29,8 +29,8 @@ + ;; --disable-slirp) slirp="no" ;; - --enable-slirp=system) slirp="system" -@@ -2972,6 +2979,14 @@ if ! check_include "ifaddrs.h" ; then + --enable-slirp=git) slirp="git" +@@ -3023,6 +3030,14 @@ if ! check_include "ifaddrs.h" ; then fi ########################################## @@ -45,7 +45,7 @@ # VTE probe if test "$vte" != "no"; then -@@ -3629,7 +3644,7 @@ for i in $glib_modules; do +@@ -3710,7 +3725,7 @@ for i in $glib_modules; do glib_libs=$($pkg_config --libs $i) QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" LIBS="$glib_libs $LIBS" @@ -54,7 +54,7 @@ else error_exit "glib-$glib_req_ver $i is required to compile QEMU" fi -@@ -4723,11 +4738,6 @@ has_sphinx_build() { +@@ -4802,11 +4817,6 @@ has_sphinx_build() { if test "$docs" != "no" ; then if has makeinfo && has pod2man && has_sphinx_build; then docs=yes @@ -66,7 +66,7 @@ fi fi -@@ -4861,7 +4871,7 @@ fi +@@ -4940,7 +4950,7 @@ fi # check for libusb if test "$libusb" != "no" ; then @@ -75,7 +75,7 @@ libusb="yes" libusb_cflags=$($pkg_config --cflags libusb-1.0) libusb_libs=$($pkg_config --libs libusb-1.0) -@@ -5251,7 +5261,51 @@ if test "$debug_stack_usage" = "yes"; then +@@ -5330,7 +5340,51 @@ if test "$debug_stack_usage" = "yes"; then fi fi @@ -127,7 +127,57 @@ ########################################## # check if we have open_by_handle_at -@@ -6332,6 +6386,7 @@ echo "Audio drivers $audio_drv_list" +@@ -6352,27 +6406,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] + cat > $TMPC </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 +@@ -6497,6 +6554,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" @@ -135,9 +185,9 @@ echo "Multipath support $mpath" echo "VNC support $vnc" if test "$vnc" = "yes" ; then -@@ -6565,6 +6620,15 @@ fi - if test "$profiler" = "yes" ; then - echo "CONFIG_PROFILER=y" >> $config_host_mak +@@ -6739,6 +6797,15 @@ fi + if test "$want_tools" = "yes" ; then + echo "CONFIG_TOOLS=y" >> $config_host_mak fi +if test "$pcap" = "yes" ; then + echo "CONFIG_PCAP=y" >> $config_host_mak @@ -151,7 +201,7 @@ if test "$slirp" != "no"; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -@@ -6812,6 +6876,9 @@ fi +@@ -6986,6 +7053,9 @@ fi # if this macro is set. if test "$have_fsxattr" = "yes" ; then echo "HAVE_FSXATTR=y" >> $config_host_mak