svn commit: r469338 - in head: Mk cad/opencascade cad/openscad-devel devel/llvm-devel devel/llvm60 devel/opendht dns/powerdns-recursor editors/libreoffice editors/libreoffice/files emulators/rpcs3 ...
Jan Beich
jbeich at FreeBSD.org
Mon May 7 22:29:51 UTC 2018
Author: jbeich
Date: Mon May 7 22:29:46 2018
New Revision: 469338
URL: https://svnweb.freebsd.org/changeset/ports/469338
Log:
Drop FreeBSD 10.3 support
Reviewed by: yuri (SoPlex), sunpoet (nghttp2), cpm (chromium), brooks (llvm*)
Approved by: portmgr (rene)
Differential Revision: https://reviews.freebsd.org/D15238
Added:
head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py (contents, props changed)
- copied, changed from r469336, head/www/chromium/files/extra-patch-libc++-new
Deleted:
head/editors/libreoffice/files/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx
head/editors/libreoffice/files/extrapatch-vcl_unx_gtk_gtkinst.cxx
head/emulators/rpcs3/files/extra-patch-no-thread_local
head/graphics/sekrit-twc-zimg/files/extra-patch-src_zimg_api_zimg.cpp
head/math/SoPlex/files/patch-CMakeLists.txt
head/security/snort3/files/
head/www/chromium/files/extra-patch-libc++-new
head/www/chromium/files/extra-patch-libc++-old
Modified:
head/Mk/bsd.port.mk (contents, props changed)
head/cad/opencascade/Makefile (contents, props changed)
head/cad/openscad-devel/Makefile (contents, props changed)
head/devel/llvm-devel/Makefile (contents, props changed)
head/devel/llvm60/Makefile (contents, props changed)
head/devel/opendht/Makefile (contents, props changed)
head/dns/powerdns-recursor/Makefile (contents, props changed)
head/editors/libreoffice/Makefile (contents, props changed)
head/emulators/rpcs3/Makefile (contents, props changed)
head/games/gzdoom/Makefile (contents, props changed)
head/graphics/sekrit-twc-zimg/Makefile (contents, props changed)
head/math/SoPlex/Makefile (contents, props changed)
head/multimedia/cx88/Makefile (contents, props changed)
head/net-p2p/qbittorrent/Makefile (contents, props changed)
head/security/snort3/Makefile (contents, props changed)
head/sysutils/freefilesync/Makefile (contents, props changed)
head/www/chromium/Makefile (contents, props changed)
head/www/nghttp2/Makefile (contents, props changed)
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Mon May 7 22:01:29 2018 (r469337)
+++ head/Mk/bsd.port.mk Mon May 7 22:29:46 2018 (r469338)
@@ -1772,18 +1772,10 @@ INSTALL_TARGET:= ${INSTALL_TARGET:S/^install-strip$/in
# XXX PIE support to be added here
MAKE_ENV+= NO_PIE=yes
-# We prefer to pass MK_*=no but it was only supported after a certain
-# revision. Passing WITHOUT_* may conflict with a make.conf or src.conf's
-# WITH_* value. Note that ports *do* pull in src.conf.
-.if ${OSVERSION} >= 1003503
# We will control debug files. Don't let builds that use /usr/share/mk
# split out debug symbols since the plist won't know to expect it.
MAKE_ENV+= MK_DEBUG_FILES=no
MAKE_ENV+= MK_KERNEL_SYMBOLS=no
-.else
-MAKE_ENV+= WITHOUT_DEBUG_FILES=yes
-MAKE_ENV+= WITHOUT_KERNEL_SYMBOLS=yes
-.endif
CONFIGURE_SHELL?= ${SH}
MAKE_SHELL?= ${SH}
Modified: head/cad/opencascade/Makefile
==============================================================================
--- head/cad/opencascade/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/cad/opencascade/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -83,11 +83,6 @@ DOXYGEN_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.
.include <bsd.port.options.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003506
-# undefined reference to `__cxa_thread_atexit' - see PR 192320
-BROKEN= undefined reference to __cxa_thread_atexit
-.endif
-
.if ${ARCH} == "i386"
BITS= 32
.else
Modified: head/cad/openscad-devel/Makefile
==============================================================================
--- head/cad/openscad-devel/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/cad/openscad-devel/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -47,10 +47,4 @@ post-patch:
@${REINPLACE_CMD} -e 's,share/man,man,' \
${WRKSRC}/openscad.pro
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003506
-BROKEN= no __cxa_thread_atexit() support in FreeBSD libc < 10.4
-.endif
-
.include <bsd.port.mk>
Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/devel/llvm-devel/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -275,11 +275,6 @@ MAN1SRCS+= bugpoint.1 dsymutil.1 llc.1 lli.1 llvm-ar.1
.include <bsd.port.pre.mk>
-.if ${OPSYS} == FreeBSD && ${OSREL} == 10.3
-CFLAGS+= -D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1
-BROKEN= Missing __cxa_thread_atexit
-.endif
-
.if defined(WITH_DEBUG)
CMAKE_BUILD_TYPE= RelWithDebInfo
STRIP=
Modified: head/devel/llvm60/Makefile
==============================================================================
--- head/devel/llvm60/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/devel/llvm60/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -273,10 +273,6 @@ MAN1SRCS+= bugpoint.1 dsymutil.1 llc.1 lli.1 llvm-ar.1
.include <bsd.port.pre.mk>
-.if ${OPSYS} == FreeBSD && ${OSREL} == 10.3
-CFLAGS+= -D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1
-.endif
-
.if ${ARCH} == "amd64"
_COMPILER_RT_LIBS= \
libclang_rt.asan-preinit-x86_64.a \
Modified: head/devel/opendht/Makefile
==============================================================================
--- head/devel/opendht/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/devel/opendht/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -40,10 +40,4 @@ PROXY_SERVER_LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp
PORTDOCS= *
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003506
-BROKEN= no __cxa_thread_atexit() support in FreeBSD libc < 10.4
-.endif
-
.include <bsd.port.mk>
Modified: head/dns/powerdns-recursor/Makefile
==============================================================================
--- head/dns/powerdns-recursor/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/dns/powerdns-recursor/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -54,10 +54,4 @@ SETUID_VARS= USERS=pdns_recursor GROUPS=pdns
SUB_FILES= pkg-message
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1003506
-IGNORE= no _cxa_thread_atexit() support in FreeBSD libc < 10.4
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/editors/libreoffice/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -279,16 +279,6 @@ MAKE_ENV+= verbose=1
.include <bsd.port.pre.mk>
-.if ${OPSYS} == FreeBSD
-.if (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200003) || \
- (${OSVERSION} >= 1100500 && ${OSVERSION} < 1100501) || \
- (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100122) || \
- ${OSVERSION} < 1003506
-EXTRA_PATCHES= ${PATCHDIR}/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx \
- ${PATCHDIR}/extrapatch-vcl_unx_gtk_gtkinst.cxx
-.endif
-.endif # FreeBSD
-
.if ${COMPILER_TYPE} == "clang"
CXXFLAGS_WARN= -Woverloaded-virtual -Wno-unused-parameter
.if ${COMPILER_VERSION} >= 36
Modified: head/emulators/rpcs3/Makefile
==============================================================================
--- head/emulators/rpcs3/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/emulators/rpcs3/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -38,8 +38,6 @@ USES= cmake compiler:c++14-lang iconv:wchar_t localba
USE_GL= gl glew
USE_QT5= qmake_build buildtools_build core dbus gui network widgets qml
USE_XORG= x11
-EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL}}
-EXTRA_PATCHES_FreeBSD_10.3= ${PATCHDIR}/extra-patch-no-thread_local
CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
CMAKE_OFF= USE_NATIVE_INSTRUCTIONS
CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
Modified: head/games/gzdoom/Makefile
==============================================================================
--- head/games/gzdoom/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/games/gzdoom/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -40,12 +40,6 @@ PLIST_FILES= bin/${PORTNAME} \
${DATADIR}/${PORTNAME}.pk3 \
share/pixmaps/${PORTNAME}.xpm
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1004000
-BROKEN= Fails to link due to lack of thread_local
-.endif
-
.include "${.CURDIR}/../doom-data/Makefile.include"
do-install:
@@ -54,4 +48,4 @@ do-install:
${INSTALL_DATA} ${CONFIGURE_WRKSRC}/${PORTNAME}.pk3 ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/sekrit-twc-zimg/Makefile
==============================================================================
--- head/graphics/sekrit-twc-zimg/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/graphics/sekrit-twc-zimg/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -19,8 +19,6 @@ CONFLICTS_INSTALL= zimg-[0-9]* # include/zimg.h
USES= autoreconf compiler:c++11-lib gmake libtool pathfix
EXTRACT_AFTER_ARGS= --exclude test/extra
-EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL}}
-EXTRA_PATCHES_FreeBSD_10.3= ${PATCHDIR}/extra-patch-src_zimg_api_zimg.cpp
GNU_CONFIGURE= yes
CPPFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
Modified: head/math/SoPlex/Makefile
==============================================================================
--- head/math/SoPlex/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/math/SoPlex/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -17,15 +17,8 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept
LIB_DEPENDS= libgmp.so:math/gmp
-USES= cmake:outsource,noninja tar:tgz
+USES= cmake:outsource tar:tgz
USE_LDCONFIG= yes
PLIST_SUB= SHL4=${DISTVERSION}.0 SHL2=${DISTVERSION:R}
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
-CMAKE_ARGS= -DFREEBSD_NO_CXX_THREAD_LOCAL_BUG224581:BOOL=ON # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224581
-# This also necessitates noninja above for some reason
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/multimedia/cx88/Makefile
==============================================================================
--- head/multimedia/cx88/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/multimedia/cx88/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -45,10 +45,7 @@ MAKE_ARGS+= -D WITH_HAL
.endif
.endif
-.if (${OSVERSION} >= 1003500)
MAKE_ARGS+= -D CX88_USE_IIC
-.endif
-
MAKE_ARGS+= DEFAULT_XML_CONFIG="${EXAMPLESDIR}/cx88.xml.sample"
.include <bsd.port.mk>
Modified: head/net-p2p/qbittorrent/Makefile
==============================================================================
--- head/net-p2p/qbittorrent/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/net-p2p/qbittorrent/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -49,11 +49,6 @@ CONFIGURE_ARGS+= --disable-gui
CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-post-patch:
- @${REINPLACE_CMD} \
- -e 's/#ifdef Q_OS_MAC/#if defined(Q_OS_MAC) || (defined(__FreeBSD__) \&\& __FreeBSD_version < 1003506)/' \
- ${WRKSRC}/src/base/utils/string.cpp
-
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent${SUFFIX}
${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent${SUFFIX}.1 \
Modified: head/security/snort3/Makefile
==============================================================================
--- head/security/snort3/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/security/snort3/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -59,12 +59,6 @@ TSC_CMAKE_BOOL= ENABLE_TSC_CLOCK
# FLATBUFFERS_LIB_DEPENDS= libflatbuffers.so:devel/flatbuffers
HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1004000
-EXTRA_PATCHES= ${PATCHDIR}/freebsd103_patch-src_memory_memory__allocator.h
-.endif
-
CONFLICTS= snort-2*
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/sysutils/freefilesync/Makefile
==============================================================================
--- head/sysutils/freefilesync/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/sysutils/freefilesync/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -39,10 +39,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKDIR}/zen/shell_execute.h
@${REINPLACE_CMD} -e 's| noexcept;|;|' ${WRKDIR}/zen/scope_guard.h
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003506
-BROKEN= no __cxa_thread_atexit() support in FreeBSD libc < 10.4
-.endif
-
.include <bsd.port.mk>
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/www/chromium/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -211,14 +211,6 @@ TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${
MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \
CPLUS_INCLUDE_PATH=${LOCALBASE}/include
-# Work around base r261801
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1004000
-GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old
-.else
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
-.endif
-
.if !defined(GN_ONLY)
pre-everything::
@${ECHO_MSG}
Copied and modified: head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py (from r469336, head/www/chromium/files/extra-patch-libc++-new)
==============================================================================
Modified: head/www/nghttp2/Makefile
==============================================================================
--- head/www/nghttp2/Makefile Mon May 7 22:01:29 2018 (r469337)
+++ head/www/nghttp2/Makefile Mon May 7 22:29:46 2018 (r469338)
@@ -59,8 +59,6 @@ HPACK_BUILD_DEPENDS= jansson>=2.5:devel/jansson
HPACK_CONFIGURE_ENABLE= hpack-tools
HPACK_LIB_DEPENDS= libjansson.so:devel/jansson
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS = / s| lib||' ${WRKSRC}/Makefile.am
@${REINPLACE_CMD} -e 's|$$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' ${WRKSRC}/*/Makefile.am
@@ -71,11 +69,6 @@ post-configure:
@${MKDIR} ${WRKSRC}/lib/.libs/
@${CP} ${LOCALBASE}/lib/libnghttp2.so* ${WRKSRC}/lib/.libs/
@cd ${WRKSRC}/lib/.libs/ && ${AR} x ${LOCALBASE}/lib/libnghttp2.a
-# Disable thread_local support for hosts without __cxa_thread_atexit()
-# See PR/192320 for details
-.if ${OPSYS} == FreeBSD && ((${OSVERSION} < 1003506) || (${OSVERSION} == 1100500))
- @${REINPLACE_CMD} -e '/HAVE_THREAD_LOCAL/d' ${WRKSRC}/config.h
-.endif
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/
More information about the svn-ports-all
mailing list