svn commit: r548272 - head/emulators/yuzu
Jan Beich
jbeich at FreeBSD.org
Sat Sep 12 00:39:11 UTC 2020
Author: jbeich
Date: Sat Sep 12 00:39:10 2020
New Revision: 548272
URL: https://svnweb.freebsd.org/changeset/ports/548272
Log:
emulators/yuzu: unbreak on FreeBSD < 12.2 after r548271
https://github.com/llvm/llvm-project/commit/86af6f5088b1
src/core/hle/service/sockets/bsd.cpp:450:55: error: no matching member function for call to 'emplace'
FileDescriptor& descriptor = file_descriptors[fd].emplace();
~~~~~~~~~~~~~~~~~~~~~^~~~~~~
src/core/hle/service/sockets/bsd.cpp:545:63: error: no matching member function for call to 'emplace'
FileDescriptor& new_descriptor = file_descriptors[new_fd].emplace();
~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
/usr/include/c++/v1/optional:820:5: note: candidate template ignored: requirement 'is_constructible_v<Service::Sockets::BSD::FileDescriptor>' was not satisfied [with _Args = <>]
emplace(_Args&&... __args)
^
/usr/include/c++/v1/optional:835:5: note: candidate function template not viable: requires at least argument '__il', but no arguments were provided
emplace(initializer_list<_Up> __il, _Args&&... __args)
^
Modified:
head/emulators/yuzu/Makefile (contents, props changed)
head/emulators/yuzu/distinfo (contents, props changed)
Modified: head/emulators/yuzu/Makefile
==============================================================================
--- head/emulators/yuzu/Makefile Sat Sep 12 00:38:36 2020 (r548271)
+++ head/emulators/yuzu/Makefile Sat Sep 12 00:39:10 2020 (r548272)
@@ -109,4 +109,12 @@ CXX= clang++${LLVM_DEFAULT}
CPP= clang-cpp${LLVM_DEFAULT}
.endif
+# XXX Drop after FreeBSD 11.3/12.1 EOL
+.if make(makesum) || (!exists(/usr/include/c++/v1/fenv.h) && exists(/usr/lib/libc++.so))
+MASTER_SITES+= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx
+DISTFILES+= libcxx-${LLVM_VER}.src.tar.xz:libcxx
+CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include
+LLVM_VER= 10.0.1
+.endif
+
.include <bsd.port.post.mk>
Modified: head/emulators/yuzu/distinfo
==============================================================================
--- head/emulators/yuzu/distinfo Sat Sep 12 00:38:36 2020 (r548271)
+++ head/emulators/yuzu/distinfo Sat Sep 12 00:39:10 2020 (r548272)
@@ -1,4 +1,6 @@
TIMESTAMP = 1599862769
+SHA256 (libcxx-10.0.1.src.tar.xz) = def674535f22f83131353b3c382ccebfef4ba6a35c488bdb76f10b68b25be86c
+SIZE (libcxx-10.0.1.src.tar.xz) = 1839172
SHA256 (yuzu-emu-yuzu-s20200911-f4400f3ba_GH0.tar.gz) = 84699f63872f3bd2a9551f8c07867422c4a9aa76c5a2f62a6a81d75e445742b8
SIZE (yuzu-emu-yuzu-s20200911-f4400f3ba_GH0.tar.gz) = 3680054
SHA256 (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 8f7b4d8eb998c2a4c146268d83b44fc22ca8d4d276f26d6af1071e51f4b5bd4f
More information about the svn-ports-all
mailing list