Created attachment 213883 [details]
Patch for emulators/qemu emulators/qemu-devel sysutils/dtc devel/valgrind
In synopsis: When building devel/qemu under poudriere, on a FreeBSD 12.1 amd64 machine I was encountering a persistent build failure with devel/qemu during staging - an excerpt from the build log
mkdir: dtc/libfdt/libfdt.h: File exists
gmake: *** [Makefile:488: dtc/libfdt/libfdt.h] Error 1
gmake: Leaving directory '/wrkdirs/usr/ports/emulators/qemu/work/qemu-4.1.1'
After taking a look at the qemu configure script, I discovered that it may be possible to build with an existing libfdt.so. In order to do so, I've had to update sysutils/dtc to version 1.6.0, as well as updating how the extra ldflags are provided to the qemu configure script.
The qemu build now succeeds, locally. The additional testing now available for sysutils/dtc also succeeds under make(test). For purpose of usability, I've made some additional changes in the update - as detailed, in the following.
Summary of changes:
devel/valgrind: Update vki-freebsd.h patch for changes recommended in
emulators/qemu-devel: Add dtc dependency; move debug support into a
DEBUG port option, also setting WITH_DEBUG in this situation, enabling
the option by default; allow build with ncurses from ports, similar to
the emulators/qemu port; Upate how extra-ldflags are provided to the
configure script - providing the value only once, with no quote marks,
to ensure that the system dtc is detected during configure
emulators/qemu: Update in parallel to emulator/qemu for dtc from ports
and debug support
sysutils/dtc: Update to upstream release 1.6.0 - in which, the
function fdt_check_full() is now defined differently, to a side effect
as that the function should not be stripped from libfdt.so during normal
pkg staging. The function is used during qemu configure, for detecting
the presence of a system dtc. Add port option for building with yaml
support for dtc (not enabled by default); Add port option for valgrind
support during make(test), for amd64, i386 architectures; Add
post-patch hacks for ensuring that the build will not fail when yaml.h
and valgrind/memcheck.h cannot be located under wrksrc - these were
being added to make dependencies under generated *.d files, in local
build, should otherwise be unused in the build; Add subst vars for
port version in distinfo, as a convenience for port maint.
In an update to the previous remarks: I may've introduced the option to build emulators/qemu with ncurses from ports, under an earlier local change. I've not tested this change with regards to the ncurses used, beyond the initial build, for emulators/qemu or emulators/qemu-devel
The remark with regards to extra-ldflags at https://bugs.freebsd.org/bugzilla/attachment.cgi?id=213883&action=diff#b/emulators/qemu-devel/Makefile_sec4 should not have been published in the diff
similarly, the remark at the section
It's taken a number of days to put this patch together. Candidly, I'd thought I'd linted those remark out of the actual published diff.
Can put together an updated diff, sometime later today
Created attachment 213884 [details]
Linted patch for emulators/qemu emulators/qemu-devel sysutils/dtc devel/valgrind
I've updated the local patch branch such as to remove two ephemeral, local comments from the resulting diff. The updated patch is attached
^Triage: assign to maintainer of emulators/qemu* but also Cc: maintainers of sysutils/dtc and devel/valgrind.
dtc was updated to 1.6.0 a few weeks ago.
I'm not the official qemu maintainer, but do generally approve of this direction FWIW.
1. We are moving qemu-devel to SNAPSHOTS version where we cannot use that specific version as it requires HEAD of dtc. Hopefully this will be committed by today or tomorrow. So I am going to add a CONFLICT with sysutils/dtc for qemu-devel.
2. Please see the latest qemu/Makefile for ncurses implementation giving the option of both. Giving the same for qemu-devel.
3. I am not keen on OPTIONIZING DEBUG for qemu-devel although will do it for qemu. Unless there is a very good reason behind it.
4. Please run portlint -abct before submitting patches. My eyes say that qemu/Makefile and qemu-devel/Makefile should throw errors with Contiguous blank lines.
5. When submitting a bug report please try to submit multiple bugs with different ports as bugzilla automagically assigns the bugs based on portname. Multiple portname causes it to have a panick attack. Depends or Blocks is easier to handle and easier to track.
A commit references this bug:
Date: Sat Sep 12 22:25:07 UTC 2020
New revision: 548428
emulators/qemu-devel: Update version 4.2.0=>18.104.22.16800909
- Move to SNAPSHOT versions of qemu
- Remove i386 support temporarily as build is failing on i386
- Change MASTER_SITES to GITHUB
- Mark IGNORE for 11.X as it cannot build Position Independent Code on 11
- OPTIONIZE NCURSES for support of both base and ports 
- Add OPTIONS CAPSTONE and use CAPSTONE from ports
- Remove PCAP related patches as was unable to create PANIC while using TSO
- Fixes for the RISC-V PLIC that are required to boot FreeBSD/riscv64 HEAD
PR: 245997 
Submitted by: email@example.com 
Reported by: lwhsu jhb