svn commit: r483808 - in head: devel/boost-all games/keeperrl/files graphics/mesa-dri/files lang/phantomjs/files mail/thunderbird/files multimedia/aom/files net-mgmt/netdata/files print/harfbuzz/fi...
Rene Ladan
rene at FreeBSD.org
Fri Nov 2 13:40:25 UTC 2018
Author: rene
Date: Fri Nov 2 13:40:24 2018
New Revision: 483808
URL: https://svnweb.freebsd.org/changeset/ports/483808
Log:
Followup on r483807.
jbeich commented on some ports in D17724 but I forgot to add them to the list.
Submitted by: rene
Reviewed by: bapt, jbeich
Differential Revision: https://reviews.freebsd.org/D17724
Deleted:
head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro
head/mail/thunderbird/files/patch-ipc_glue_MessageChannel.cpp
head/multimedia/aom/files/patch-av1_encoder_rd.h
head/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c
head/print/harfbuzz/files/patch-src_test-ot-color.cc
head/print/lyx/files/patch-src_TexRow.cpp
head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in
head/www/firefox-esr/files/patch-ipc_glue_MessageChannel.cpp
Modified:
head/devel/boost-all/compiled.mk
head/games/keeperrl/files/patch-stack__printer.cpp
head/graphics/mesa-dri/files/patch-src_util_futex.h
Modified: head/devel/boost-all/compiled.mk
==============================================================================
--- head/devel/boost-all/compiled.mk Fri Nov 2 13:32:34 2018 (r483807)
+++ head/devel/boost-all/compiled.mk Fri Nov 2 13:40:24 2018 (r483808)
@@ -4,15 +4,8 @@ MAKE_CMD= bjam
MAKEFILE= #
MAKE_FLAGS= #
ALL_TARGET= stage
-# XXX Drop conditional after 10.4 EOL as both libstdc++ 7 and libc++ 6
-# have near complete C++17 support.
-.if exists(/usr/lib/libstdc++.so) || exists(/usr/include/c++/v1/__undef_macros)
USES+= compiler:c++17-lang
USE_CXXSTD= gnu++17
-.else
-USES+= compiler:c++14-lang
-USE_CXXSTD= gnu++14
-.endif
PLIST_SUB+= BOOST_SHARED_LIB_VER=${PORTVERSION}
Modified: head/games/keeperrl/files/patch-stack__printer.cpp
==============================================================================
--- head/games/keeperrl/files/patch-stack__printer.cpp Fri Nov 2 13:32:34 2018 (r483807)
+++ head/games/keeperrl/files/patch-stack__printer.cpp Fri Nov 2 13:40:24 2018 (r483808)
@@ -10,7 +10,7 @@ stack_printer.cpp:329:18: error: assigning to 'char *'
stack_t ss = {};
/* malloc is usually used here, I'm not 100% sure my static allocation
is valid but it seems to work just fine. */
-+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ < 11)
++#if defined(__DragonFly__)
+ ss.ss_sp = (char*)alternate_stack;
+#else
ss.ss_sp = (void*)alternate_stack;
Modified: head/graphics/mesa-dri/files/patch-src_util_futex.h
==============================================================================
--- head/graphics/mesa-dri/files/patch-src_util_futex.h Fri Nov 2 13:32:34 2018 (r483807)
+++ head/graphics/mesa-dri/files/patch-src_util_futex.h Fri Nov 2 13:40:24 2018 (r483808)
@@ -1,16 +1,13 @@
- Implement futex_wake() and futex_wait() via _umtx_op()
---- src/util/futex.h.orig 2018-01-23 18:08:50 UTC
+--- src/util/futex.h.orig 2018-09-24 16:00:57 UTC
+++ src/util/futex.h
-@@ -29,10 +29,35 @@
+@@ -29,10 +29,32 @@
#include <limits.h>
#include <stdint.h>
#include <unistd.h>
+#if defined(__FreeBSD__)
+#include <errno.h>
-+# if __FreeBSD__ < 11
-+# include <machine/atomic.h>
-+# endif
+#include <sys/umtx.h>
+#else
#include <linux/futex.h>
@@ -38,7 +35,7 @@
static inline long sys_futex(void *addr1, int op, int val1, const struct timespec *timeout, void *addr2, int val3)
{
return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
-@@ -50,6 +75,7 @@ static inline int futex_wait(uint32_t *addr, int32_t v
+@@ -50,6 +72,7 @@ static inline int futex_wait(uint32_t *addr, int32_t v
return sys_futex(addr, FUTEX_WAIT_BITSET, value, timeout, NULL,
FUTEX_BITSET_MATCH_ANY);
}
More information about the svn-ports-all
mailing list