Index: branches/2020Q2/devel/libclc/Makefile =================================================================== --- branches/2020Q2/devel/libclc/Makefile (revision 535351) +++ branches/2020Q2/devel/libclc/Makefile (revision 535352) @@ -1,51 +1,51 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= libclc DISTVERSION= 0.4.0.20190527 PORTREVISION= 2 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org COMMENT= Required library functions for OpenCL C programming language LICENSE= LLVM LICENSE_NAME= LLVM Release License LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_powerpc64= fails to compile: /usr/local/llvm80/include/llvm-c/DataTypes.h:28:10: fatal error: 'cmath' file not found BUILD_DEPENDS= llvm${LLVM_DEFAULT}>=4.0:devel/llvm${LLVM_DEFAULT} \ libedit>=0:devel/libedit USE_GITHUB= yes GH_ACCOUNT= llvm-mirror GH_TAGNAME= 9f6204e # ninja based build is broken since commit 598792bc (16 sep 2016) USES= gmake python:2.7,build gmake USE_LDCONFIG= yes MAKE_ENV= MAKE=${GMAKE} DESTDIR=${STAGEDIR} ALL_TARGET= post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \ -e 's|"python |"${PYTHON_VERSION} |g' \ ${WRKSRC}/build/ninja_syntax.py \ ${WRKSRC}/configure.py do-configure: @cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g make \ --with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \ --pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --prefix=${PREFIX} .include # Keep in sync with lang/clover -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif .include Index: branches/2020Q2/devel/oclgrind/Makefile =================================================================== --- branches/2020Q2/devel/oclgrind/Makefile (revision 535351) +++ branches/2020Q2/devel/oclgrind/Makefile (revision 535352) @@ -1,40 +1,40 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= oclgrind PORTVERSION= 20190907 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jmd@FreeBSD.org COMMENT= SPIR interpreter and virtual OpenCL device simulator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= opencl>=0:devel/opencl \ llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} LIB_DEPENDS= libOpenCL.so:devel/ocl-icd RUN_DEPENDS= opencl>=0:devel/opencl USES= cmake USE_GITHUB= yes GH_ACCOUNT= jrprice GH_PROJECT= Oclgrind GH_TAGNAME= e7c87b0 USE_LDCONFIG= yes CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} CPP= clang-cpp${LLVM_DEFAULT} CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm .include -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif .include Index: branches/2020Q2/devel/py-llvmlite/Makefile =================================================================== --- branches/2020Q2/devel/py-llvmlite/Makefile (revision 535351) +++ branches/2020Q2/devel/py-llvmlite/Makefile (revision 535352) @@ -1,44 +1,44 @@ # Created by: David Kalliecharan # $FreeBSD$ PORTNAME= llvmlite DISTVERSION= 0.31.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= dave@dal.ca COMMENT= Lightweight LLVM python binding for writing JIT compilers LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_ENUM34} \ llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} RUN_DEPENDS= ${PY_ENUM34} \ llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} USES= compiler:c++11-lib python fortran USE_PYTHON= distutils autoplist CXXFLAGS= -fPIC MAKE_ENV= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} # compatible LLVM versions for llvmlite versions 0.29.0 - ... LLVM_SUPPORTED_MIN= 70 LLVM_SUPPORTED_MAX= 80 .include -.if ${LLVM_DEFAULT:S,-devel,990,} < ${LLVM_SUPPORTED_MIN} +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} < ${LLVM_SUPPORTED_MIN} LLVM_VER= ${LLVM_SUPPORTED_MIN} -.elif ${LLVM_DEFAULT:S,-devel,990,} > ${LLVM_SUPPORTED_MAX} +.elif ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} > ${LLVM_SUPPORTED_MAX} LLVM_VER= ${LLVM_SUPPORTED_MAX} .else LLVM_VER= ${LLVM_DEFAULT} .endif post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/llvmlite/binding/libllvmlite.so .include Index: branches/2020Q2/devel/qtcreator/Makefile =================================================================== --- branches/2020Q2/devel/qtcreator/Makefile (revision 535351) +++ branches/2020Q2/devel/qtcreator/Makefile (revision 535352) @@ -1,114 +1,114 @@ # Created by: Kris Moore # $FreeBSD$ PORTNAME= qtcreator DISTVERSION= 4.11.1 CATEGORIES= devel MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION} DISTNAME= qt-creator-opensource-src-${DISTVERSION} DIST_SUBDIR= KDE/Qt/qtcreator MAINTAINER= kde@FreeBSD.org COMMENT= C++ and QML IDE for Qt development # depend on the split out qbs LIB_DEPENDS= libqbscore.so:devel/qbs BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} RUN_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} USES= compiler:c++14-lang gl python qmake qt:5 shebangfix tar:xz USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} USE_GL= gl USE_QT= buildtools concurrent core declarative designer gui help \ linguist location network printsupport qdoc qmake \ quickcontrols script script serialport sql svg webchannel \ widgets xml xmlpatterns CXXFLAGS_powerpc= -maltivec CXXFLAGS_powerpc64= -maltivec # be paranoid and do not extract qbs (devel/qbs) copy from source tree EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/src/shared/qbs' # Set QBS_INSTALL_DIR for QBS plugin build and set config parameter to build # the qbsprojectmanager plugin without compile error QMAKE_ARGS+= QBS_INSTALL_DIR=${PREFIX} CONFIG+=qbs_enable_project_file_updates # Enforce installation to ${PREFIX}. QMAKE_ARGS+= QTC_PREFIX=${PREFIX} LLVM_INSTALL_DIR=${PREFIX}/llvm${LLVM_DEFAULT} DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" \ "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true PORTDOCS= * OPTIONS_DEFINE= DOCS EXAMPLES QTWEBENGINE OPTIONS_SUB= yes DOCS_DESC= Install the Qt5 api documentation DOCS_USE= QT=doc_run EXAMPLES_DESC= Install the Qt5 example projects EXAMPLES_USE= QT=examples_run OPTIONS_DEFAULT= DOCS EXAMPLES OPTIONS_DEFAULT_amd64= QTWEBENGINE OPTIONS_DEFAULT_i386= QTWEBENGINE OPTIONS_DEFAULT_powerpc64= ${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPTIONS_DEFAULT_powerpc64_13= QTWEBENGINE QTWEBENGINE_DESC= Add dependency on qt5-webengine QTWEBENGINE_USE= qt=webengine QTWEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine ALL_TARGET= all INSTALL_TARGET= install DOCS_ALL_TARGET= docs DOCS_INSTALL_TARGET= install_docs PLIST_SUB= SHLIB_VER="${PORTVERSION}" SHEBANG_FILES= tests/system/tools/objectsToTable.py \ tests/system/tools/findUnusedObjects.py \ share/qtcreator/templates/wizards/files/python/file.py \ share/qtcreator/scripts/openTerminal.py \ src/libs/qmljs/parser/changeLicense.py \ src/libs/qt-breakpad/qtbreakpadsymbols \ src/tools/icons/export.py \ scripts/packagePlugins.py \ scripts/ninjawrapper.py \ scripts/checkInstalledFiles.py \ scripts/generateClangTidyChecks.py \ scripts/createDistPackage.py \ scripts/createDevPackage.py \ scripts/deployqt.py \ scripts/dependencyinfo.py \ scripts/createSourcePackages.py \ scripts/uichanges.py \ scripts/makedmg.py .include -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif post-patch: # Fix paths for gnuplot and ant. ${REINPLACE_CMD} -e 's|/usr/bin/gnuplot|${LOCALBASE}/bin/gnuplot|' \ ${WRKSRC}/share/qtcreator/debugger/dumper.py ${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/bin/ant|' \ ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp # Fix python binary in pro file. ${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' \ ${WRKSRC}/qtcreator.pro pre-configure: # We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to # the linker before -L/usr/local/lib. By default, the opposite happens, which # is a problem when a Qt port is being upgraded, since an existing library # would end up being picked up instead of those built in ${WRKSRC}/lib. Since # qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the # latter to get the linker path order right. qmake is smart enough to strip # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them. # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${WRKSRC}/lib' >> ${WRKSRC}/.qmake.cache .include Index: branches/2020Q2/graphics/mesa-dri/Makefile.common =================================================================== --- branches/2020Q2/graphics/mesa-dri/Makefile.common (revision 535351) +++ branches/2020Q2/graphics/mesa-dri/Makefile.common (revision 535352) @@ -1,108 +1,108 @@ # Makefile.common - shared code between MesaLib ports. # # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION: # # - graphics/libosmesa # - graphics/mesa-dri # - graphics/mesa-libs # - lang/clover # # $FreeBSD$ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} MESABASEVERSION= 18.3.2 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= MASTER_SITES= https://mesa.freedesktop.org/archive/ \ https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \ ftp://ftp.freedesktop.org/pub/mesa/ \ ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs LIB_DEPENDS+= libexpat.so:textproc/expat2 .if ${COMPONENT} != clover USES+= xorg .endif .if ${COMPONENT} != osmesa LIB_DEPENDS+= libdrm.so:graphics/libdrm .endif .if ${COMPONENT} != libs LIB_DEPENDS+= libglapi.so:graphics/mesa-libs .endif .if ${ARCH} == amd64 || ${ARCH} == i386 LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${OPSYS} == DragonFly LIB_DEPENDS+= libelf.so:devel/libelf .endif USES+= compiler:c++11-lib bison gettext-tools gmake libtool \ localbase pathfix pkgconfig python:2.7,build shebangfix tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes # only have one port to check with portscout. .if ${PORTNAME} != mesa-dri PORTSCOUT= ignore:1 .endif python_OLD_CMD= /usr/bin/env[[:space:]]python2 /usr/bin/python2 /bin/env[[:space:]]python SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ src/gallium/drivers/svga/svgadump/svga_dump.py \ src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \ src/util/xmlpool/gen_xmlpool.py \ src/mesa/main/get_*.py src/util/format_srgb.py \ src/amd/*/*.py src/intel/genxml/gen_pack_header.py MASTERDIR= ${.CURDIR:H:H}/graphics/mesa-dri PATCHDIR= ${MASTERDIR}/files WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist PKGHELP= ${.CURDIR}/pkg-help PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall INSTALL_TARGET= install-strip .include .if ${ARCH} == powerpc64 LLVM_DEFAULT= 90 -.elif ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.elif ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT} .if ${COMPONENT} != libs RUN_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT} .endif CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib CONFIGURE_ARGS+= --enable-llvm .else CONFIGURE_ARGS+= --disable-llvm .endif # There are issues that need to be fixed to use TLS model "initial-exec" # So stick with "global-dynamic"'s model for now. kan@ is working on a # patch for rtld. We might want to backport global-dynamic or # pthread_setspecific which it uses now by default. But since this # configure switch is going away ... # https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html CONFIGURE_ARGS+= --disable-glx-tls # we don't care about GLes v1 CONFIGURE_ARGS+= --disable-gles1 Index: branches/2020Q2/security/afl/Makefile =================================================================== --- branches/2020Q2/security/afl/Makefile (revision 535351) +++ branches/2020Q2/security/afl/Makefile (revision 535352) @@ -1,92 +1,92 @@ # Created by: Fabian Keil # $FreeBSD$ PORTNAME= afl PORTVERSION= 2.52 DISTVERSIONSUFFIX= b PORTREVISION= 4 CATEGORIES= security MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/ MAINTAINER= tobik@FreeBSD.org COMMENT= Fast instrumented fuzzer LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/docs/COPYING # In theory afl supports other architectures with the LLVM plugin. # It has to be compiled with AFL_NO_X86=1 in that case. ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Uses binary instrumentation USES= gmake tar:tgz ALL_TARGET= all libdislocator TEST_TARGET= test_build CONFLICTS_INSTALL= afl++ OPTIONS_DEFINE= DEBUG DOCS LLVM OPTIONS_DEFAULT= LLVM OPTIONS_SUB= yes LLVM_DESC= LLVM-based instrumentation LLVM_BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} LLVM_RUN_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} LLVM_MAKE_ARGS= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} LLVM_ALL_TARGET= llvm_mode LLVM_TEST_TARGET= test_llvm_mode LLVM_VARS= CC=clang${LLVM_DEFAULT} \ CXX=clang++${LLVM_DEFAULT} .include -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif .if ${ARCH} == "i386" # Clang i386 emits .cfi_sections which base as(1) doesn't understand BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils .endif post-patch: # Disable the instrumentation tests to make sure building packages in # jails works by default. afl needs shmget() which usually isn't # available in jails. @${REINPLACE_CMD} 's@^\(all.*\) test_build@\1@' \ ${WRKSRC}/Makefile ${WRKSRC}/llvm_mode/Makefile .if ${ARCH} == "i386" @${REINPLACE_CMD} 's@\( as_params\[0\] = afl_as ? afl_as : \)\(.*\)@\1(u8*)"${LOCALBASE}/bin/as";@' \ ${WRKSRC}/afl-as.c .endif @${CAT} ${FILESDIR}/Makefile.extra >> ${WRKSRC}/Makefile post-patch-LLVM-on: @${REINPLACE_CMD} \ -e 's|"clang"|"clang${LLVM_DEFAULT}"|g' \ -e 's|"clang\+\+"|"clang\+\+${LLVM_DEFAULT}"|g' \ ${WRKSRC}/llvm_mode/afl-clang-fast.c post-install: .for script in afl-cmin afl-plot afl-whatsup ${INSTALL_SCRIPT} ${WRKSRC}/${script} ${STAGEDIR}${PREFIX}/bin .endfor @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/afl/afl-as .for prog in afl-analyze afl-fuzz afl-gcc afl-gotcpu afl-showmap afl-tmin @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${prog} .endfor ${INSTALL_LIB} ${WRKSRC}/libdislocator/libdislocator.so \ ${STAGEDIR}${PREFIX}/lib/afl ${INSTALL_DATA} ${WRKSRC}/libdislocator/README.dislocator \ ${STAGEDIR}${DOCSDIR} post-install-LLVM-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/afl/afl-llvm-pass.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/afl-clang-fast ${INSTALL_DATA} ${WRKSRC}/llvm_mode/README.llvm \ ${STAGEDIR}${DOCSDIR} .include Index: branches/2020Q2 =================================================================== --- branches/2020Q2 (revision 535351) +++ branches/2020Q2 (revision 535352) Property changes on: branches/2020Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r534936