While here, mute the compiler when it is being called inside the
GNU make's $(shell ...) context: these errors do not cause build
failures (they are not propagated to the caller) but can confuse
careless readers of the build log.
PR: 260625
../src/vkutil/pipeline_builder.cpp:204:12: error: no matching constructor for initialization of 'ManagedResource<vk::Pipeline>'
return ManagedResource<vk::Pipeline>{
^ ~
../src/managed_resource.h:34:5: note: candidate constructor not viable: no known conversion from 'ResultValue<vk::Pipeline>' to 'vk::Pipeline' for 1st argument
ManagedResource(T&& raw, Destructor&& destructor)
^
../src/managed_resource.h:40:5: note: candidate constructor not viable: requires single argument 'rhs', but 2 arguments were provided
ManagedResource(ManagedResource&& rhs)
^
../src/managed_resource.h:28:8: note: candidate constructor (the implicit copy constructor) not viable: requires 1 argument, but 2 were provided
struct ManagedResource
^
../src/managed_resource.h:32:5: note: candidate constructor not viable: requires 0 arguments, but 2 were provided
ManagedResource() = default;
^
Increase array test sizes and reps to wash out sampling error on modern
hardware, where run times were becoming too short and inconsistent.
A few other minor enhancements
Update the CONFLICTS definitions of ports in the following categories:
- accessibility
- archivers
- audio
- benchmarks
- biology
- cad
- chinese
- comms
- converters
An attempt has been made to use generic conflicts patterns that do not
have to be updated whenever a new version of a conflicting port is
added to the ports system.
There is a misunderstanding that the port being built/installed has to
be omitted from the conflicts pattern. This is not true - the port
being built is implicitly non-conflicting due to logic in bsd.port.mk.
Approved by: portmgr (implicit)
There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.
This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.
Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).
A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.
These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,
Approved by: portmgr (implicit)
The CPU_SET macros in -CURRENT have been made compatible with GLIBC.
A simple test for the new signature of CPU_AND, CPU_OR, ... is the
existence of a CPU_ALLOC macro.
Approved by: portmgr (implicit)
MFH: 2022Q1
