diff options
114 files changed, 250 insertions, 121 deletions
@@ -10,6 +10,20 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20170625: +AUTHOR: kde@FreeBSD.org + + The default generator for USES=cmake ports has been switched to ninja. + + Previously it was possible to opt-in to using ninja instead of make(1) + by setting CMAKE_NINJA, now ports need to opt-out. + + Ports that do not build with ninja must switch from + USES=cmake:<args> + to + USES=cmake:<args>,noninja + + 20170417: AUTHOR: kwm@FreeBSD.org diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index e880100d9d08..80bf800561f4 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -4,9 +4,18 @@ # # Feature: cmake # Usage: USES=cmake or USES=cmake:ARGS -# Valid ARGS: outsource +# Valid ARGS: outsource, run, noninja # ARGS description: # outsource perform an out-of-source build +# noninja don't use ninja instead of make +# Setting this should be an exception, and hints to an issue +# inside the ports build system. +# A few corner cases never use ninja, and are handled, to reduce +# the usage of 'noninja'.: +# 1) fortran ports +# 2) ports that set BUILD_- or INSTALL_WRKSRC to +# something different than CONFIGURE_WRKSRC +# run add a runtime dependency on cmake # # # Additional variables that affect cmake behaviour: @@ -14,7 +23,6 @@ # User defined variables: # CMAKE_NOCOLOR - Disable colour build output # Default: not set, unless BATCH or PACKAGE_BUILDING is defined -# CMAKE_NINJA - Use ninja instead of make(1) # # Variables for ports: # CMAKE_ARGS - Arguments passed to cmake @@ -36,7 +44,7 @@ .if !defined(_INCLUDE_USES_CMAKE_MK) _INCLUDE_USES_CMAKE_MK= yes -_valid_ARGS= outsource run +_valid_ARGS= outsource run noninja # Sanity check .for arg in ${cmake_ARGS} @@ -91,10 +99,6 @@ CMAKE_NOCOLOR= yes CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=OFF .endif -.if defined(CMAKE_NINJA) -.include "${USESDIR}/ninja.mk" -.endif - _CMAKE_MSG= "===> Performing in-source build" CMAKE_SOURCE_PATH?= ${WRKSRC} @@ -106,6 +110,20 @@ INSTALL_WRKSRC?= ${CONFIGURE_WRKSRC} TEST_WRKSRC?= ${CONFIGURE_WRKSRC} .endif +# By default we use the ninja generator. +# Except, if cmake:run is set (cmake not wanted as generator) +# fortran is used, as the ninja-generator does not handle it. +# or if CONFIGURE_WRKSRC does not match BUILD_WRKSRC or INSTALL_WRKSRC +# as the build.ninja file won't be where ninja expects it. +.if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran) +. if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}" +. if ! empty(USES:Mgmake) +BROKEN= USES=gmake is incompatible with cmake's ninja-generator +. endif +. include "${USESDIR}/ninja.mk" +. endif +.endif + .if !target(do-configure) do-configure: @${ECHO_MSG} ${_CMAKE_MSG} diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index b22ee91e360b..185314f0e114 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -181,7 +181,7 @@ SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS \ USE_MYSQL WANT_MYSQL_VER \ USE_PHPIZE WANT_PHP_CLI WANT_PHP_CGI WANT_PHP_MOD \ WANT_PHP_WEB WANT_PHP_EMB -SANITY_NOTNEEDED= WX_UNICODE +SANITY_NOTNEEDED= CMAKE_NINJA WX_UNICODE USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes USE_OPENAL_ALT= USES=openal @@ -217,6 +217,7 @@ PYTHON_PKGNAMESUFFIX_ALT= PYTHON_PKGNAMEPREFIX NO_INSTALL_MANPAGES_ALT= USES=imake:noman UNIQUENAME_ALT= PKGBASE LATEST_LINK_ALT= PKGBASE +CMAKE_NINJA_REASON= Now the ninja generator is the default WX_UNICODE_REASON= Now no-op as only unicode is supported now PLIST_DIRSTRY_ALT= PLIST_DIRS USE_SQLITE_ALT= USES=sqlite diff --git a/astro/marble/Makefile b/astro/marble/Makefile index 28762f1f4af9..42c9be58da24 100644 --- a/astro/marble/Makefile +++ b/astro/marble/Makefile @@ -10,7 +10,7 @@ COMMENT= Virtual globe and world atlas for KDE LIB_DEPENDS= libquazip.so:archivers/quazip -USES= cmake:outsource gmake kde:4 shared-mime-info tar:xz +USES= cmake:outsource kde:4 shared-mime-info tar:xz USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus declarative designer_build gui network phonon \ qtestlib script sql svg webkit xml \ diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile index 7975916ae21e..0aa21380ccf9 100644 --- a/audio/csound6/Makefile +++ b/audio/csound6/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ LIB_DEPENDS= libsamplerate.so:audio/libsamplerate \ libsndfile.so:audio/libsndfile -USES= alias bison cmake:outsource localbase python:2 +USES= alias bison cmake:outsource,noninja localbase python:2 # math/gmm++ requires c++11 USE_CXXSTD= c++11 CMAKE_ARGS= -DBUILD_CSOUNDVST:BOOL=OFF \ diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile index 961335ca7ec3..4e7d5a616a3e 100644 --- a/audio/fluidsynth/Makefile +++ b/audio/fluidsynth/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO READLINE \ OPTIONS_DEFAULT= JACK READLINE USE_GNOME= glib20 -USES= cmake pkgconfig ninja tar:bzip2 +USES= cmake pkgconfig tar:bzip2 CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \ -Denable-midishare:BOOL=FALSE USE_LDCONFIG= yes diff --git a/audio/libgme/Makefile b/audio/libgme/Makefile index fe1bdb7f2b6b..3039db11e8c9 100644 --- a/audio/libgme/Makefile +++ b/audio/libgme/Makefile @@ -11,7 +11,7 @@ COMMENT= Collection of video game music emulators LICENSE= LGPL21+ -USES= cmake dos2unix ninja tar:bzip2 +USES= cmake dos2unix tar:bzip2 USE_LDCONFIG= yes PORTDOCS= changes.txt design.txt gme.txt readme.txt diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index ff0aca5f42d4..d06d1a29c293 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= xpdf:graphics/xpdf CONFLICTS= kicad-devel* -USES= cmake compiler:gcc-c++11-lib desktop-file-utils dos2unix \ +USES= cmake:noninja compiler:gcc-c++11-lib desktop-file-utils dos2unix \ shared-mime-info tar:xz DOS2UNIX_GLOB= *.cmake sch_bus_entry.h sch_line.h sch_no_connect.h diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index b715090cc6e0..20d3d23bf7b0 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= bash:shells/bash # Check ${WRKSRC}/dox/overview/Overview.md # and ${WRKSRC}/dox/dev_guides/building -USES= alias:10 bison cmake compiler:c++11-lib dos2unix gmake \ +USES= alias:10 bison cmake compiler:c++11-lib dos2unix \ shebangfix tk tar:tgz USE_XORG= xmu DOS2UNIX_FILES= adm/templates/* diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index e5b2ff66c3cb..ca4ad55c44e2 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -32,7 +32,7 @@ GH_ACCOUNT= ${GH_PROJECT} CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} -USES= cmake:outsource compiler:gcc-c++11-lib jpeg +USES= cmake:outsource,noninja compiler:gcc-c++11-lib jpeg CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \ diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index fc1c6c4d2c5d..c23744f75f30 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -39,7 +39,7 @@ USE_GNOME= pango intltool libxml2 introspection USE_KDE= ecm USE_XORG= x11 xext xkbfile sm ice USE_LDCONFIG= yes -USES= tar:xz cmake desktop-file-utils execinfo \ +USES= tar:xz cmake:noninja desktop-file-utils execinfo \ gettext-tools:build,run gettext-runtime iconv:wchar_t \ kde:5 pkgconfig shared-mime-info INSTALLS_ICONS= yes diff --git a/chinese/ibus-chewing/Makefile b/chinese/ibus-chewing/Makefile index 91e914f0edf5..207c153cc2af 100644 --- a/chinese/ibus-chewing/Makefile +++ b/chinese/ibus-chewing/Makefile @@ -20,7 +20,7 @@ CMAKE_ARGS= -DSYSCONF_INSTALL_DIR=${PREFIX}/etc \ -DLIB_DIR=${PREFIX}/lib LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.freedesktop.IBus.Chewing.gschema.xml -USES= cmake gettext pkgconfig +USES= cmake:noninja gettext pkgconfig USE_GNOME= gtk20 USE_XORG= xtst diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index 2e2f4c9b3757..eb32cfdcc59b 100644 --- a/comms/uhd/Makefile +++ b/comms/uhd/Makefile @@ -26,7 +26,7 @@ CONFLICTS= usrp-[0-9]* BROKEN_powerpc64= fails to link: undefined reference to boost function -USES= compiler:c++0x cmake:outsource gmake ncurses pkgconfig \ +USES= compiler:c++0x cmake:outsource ncurses pkgconfig \ dos2unix python:2.7 shebangfix USE_LDCONFIG= yes CMAKE_SOURCE_PATH= ${WRKSRC}/host diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile index c82ef1eb09bf..e1f0b3311872 100644 --- a/comms/usrp/Makefile +++ b/comms/usrp/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \ orcc:devel/orc \ sdcc:lang/sdcc -USES= compiler:c++0x cmake:outsource gmake pkgconfig python:run \ +USES= compiler:c++0x cmake:outsource,noninja gmake pkgconfig python:run \ dos2unix shebangfix COMPILER_FEATURES= libc++ USE_LDCONFIG= yes diff --git a/databases/cppdb/Makefile b/databases/cppdb/Makefile index e94e27c3bc20..0a6abbf4a660 100644 --- a/databases/cppdb/Makefile +++ b/databases/cppdb/Makefile @@ -41,7 +41,7 @@ SQLITE3_INTERNAL_DESC= Link SQLite 3 backend into CppDB SQLITE3_MODULE_DESC= Build SQLite 3 backend as a CppDB module USE_LDCONFIG= yes -USES= cmake:outsource ninja tar:bzip2 +USES= cmake:outsource tar:bzip2 .include <bsd.port.options.mk> diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 0270146787d6..328676545037 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -30,7 +30,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ PORTSCOUT= limitw:1,even USES= bdb:5 cmake compiler:c++11-lib gettext gnome gperf \ - iconv localbase ninja pathfix pkgconfig python:3.3+,build\ + iconv localbase pathfix pkgconfig python:3.3+,build\ sqlite tar:xz USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2 USE_LDCONFIG= yes diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 1a6734be87fa..6f72d893fc78 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -29,7 +29,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb100-client -USES= bison:build cmake compiler:c++11-lib cpe execinfo \ +USES= bison:build cmake:noninja compiler:c++11-lib cpe execinfo \ ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin SHEBANG_FILES= scripts/*.sh diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index 78c7e5a9fe3c..e4a20c849031 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -24,7 +24,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb55-client -USES= cmake execinfo shebangfix ssl +USES= cmake:noninja execinfo shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh sql-bench/[a-km-z]* diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index f8ced7135c45..ff396d5b00ec 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -14,7 +14,7 @@ COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 SLAVEDIRS= databases/mysql55-client -USES= cmake readline shebangfix +USES= cmake:noninja readline shebangfix CXXFLAGS+= ${CPPFLAGS} NO_OPTIONS_SORT=yes diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index c0f814289e0c..875aca26eb42 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -13,7 +13,7 @@ COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 SLAVEDIRS= databases/mysql56-client -USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ +USES= bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix ssl USE_PERL5= run diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index f7b58be324f3..3f2466a5d0d5 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} SLAVEDIRS= databases/mysql57-client -USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ +USES= bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix ssl USE_PERL5= run diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index d31550cd03b3..8a131b3ab81d 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -18,7 +18,7 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} SLAVEDIRS= databases/mysql80-client -USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ +USES= bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix ssl USE_PERL5= run diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index 4909d5aafd92..6fc7cdf36cd7 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -22,7 +22,7 @@ DATADIR= ${PREFIX}/share/mysql NOT_FOR_ARCHS= aarch64 armv6 powerpc64 NOT_FOR_ARCHS_REASON= error: Unsupported platform -USES= cmake:outsource libedit shebangfix perl5 +USES= cmake:outsource,noninja libedit shebangfix perl5 USE_PERL5= run USE_LDCONFIG= yes diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index f0d0861b58da..50c28e8c1545 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -12,7 +12,7 @@ MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona55-client -USES= bison cmake readline shebangfix +USES= bison cmake:noninja readline shebangfix CXXFLAGS+= ${CPPFLAGS} diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index a0df827b0a4d..0e532f9fc872 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -17,7 +17,7 @@ NOT_FOR_ARCHS_REASON= unsupported platform SLAVEDIRS= databases/percona56-client \ databases/percona-pam-for-mysql -USES= bison cmake perl5 shebangfix +USES= bison cmake:noninja perl5 shebangfix OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile index c4ab19025fd4..31ab44835982 100644 --- a/databases/percona57-server/Makefile +++ b/databases/percona57-server/Makefile @@ -24,7 +24,7 @@ BROKEN_powerpc64= Does not build SLAVEDIRS= databases/percona57-client \ databases/percona57-pam-for-mysql -USES= bison:build cmake compiler:c11 compiler:c++11-lib \ +USES= bison:build cmake:noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix MY_DBDIR= /var/db/mysql diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile index f09ad003a7c3..37e5e422abeb 100644 --- a/databases/tarantool/Makefile +++ b/databases/tarantool/Makefile @@ -15,7 +15,7 @@ NOT_FOR_ARCHS= armv6 powerpc64 sparc64 NOT_FOR_ARCHS_REASON= fails to build: Unsupported architecture MAKE_JOBS_UNSAFE=yes -USES= cmake compiler:c++11-lang gettext gmake perl5 readline +USES= cmake:noninja compiler:c++11-lang gettext gmake perl5 readline USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile index 4f0278477e07..e74790b1fdcf 100644 --- a/databases/xtrabackup/Makefile +++ b/databases/xtrabackup/Makefile @@ -29,7 +29,7 @@ BROKEN_mips64= fails to compile: 'fpsetmask' was not declared in this scope BROKEN_powerpc64= fails to link: ld: final link failed: Bad value # autotool is in use for 5.1 builds -USES= alias autoreconf:build cpe gettext cmake libtool perl5 shebangfix +USES= alias autoreconf:build cpe gettext cmake:noninja libtool perl5 shebangfix CPE_VENDOR= percona SHEBANG_FILES= storage/innobase/xtrabackup/xbcloud_osenv.sh diff --git a/deskutils/kdeconnect/Makefile b/deskutils/kdeconnect/Makefile index e88828fcebe0..59e13050e6dc 100644 --- a/deskutils/kdeconnect/Makefile +++ b/deskutils/kdeconnect/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= KDE/unstable/kdeconnect/${PORTVERSION}/src/ MAINTAINER= yurkis@gmail.com COMMENT= Support for KDE to interface between your phone and your computer -USES= cmake compiler:c++0x gettext kde:4 tar:xz +USES= cmake:noninja compiler:c++0x gettext kde:4 tar:xz USE_KDE= kdelibs automoc4 workspace runtime USE_QT4= corelib gui moc_build qmake_build uic_build rcc_build USE_LDCONFIG= yes diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 1a1330bc654e..5d0f75566ba1 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -24,7 +24,7 @@ CONFLICTS_INSTALL= kdepim44-4.* USE_GNOME= libxml2 libxslt:build USE_KDE= kdelibs pimlibs kactivities \ akonadi automoc4 soprano nepomuk-widgets baloo -USES= cmake:outsource gmake grantlee:4 iconv kde:4 shebangfix tar:xz +USES= cmake:outsource grantlee:4 iconv kde:4 shebangfix tar:xz SHEBANG_FILES= agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \ kalarm/*.pl kmail/kconf_update/*.pl \ libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile index f601483aff42..b2ef38db8842 100644 --- a/deskutils/owncloudclient/Makefile +++ b/deskutils/owncloudclient/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libinotify.so:devel/libinotify \ libqt5keychain.so:security/qtkeychain-qt5 -USES= cmake:outsource compiler:c++11-lib gmake iconv \ +USES= cmake:outsource,noninja compiler:c++11-lib gmake iconv \ localbase:ldflags pkgconfig sqlite ssl USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \ qmake_build sql webkit widgets xml diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile index 21e924f1ca13..9a79646dd3c4 100644 --- a/devel/bullet/Makefile +++ b/devel/bullet/Makefile @@ -22,6 +22,7 @@ USE_LDCONFIG= yes USE_XORG= x11 CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \ + -DINSTALL_LIBS:BOOL=ON \ -DBUILD_BULLET2_DEMOS:BOOL=OFF PORTDOCS= * diff --git a/devel/compiler-rt/Makefile b/devel/compiler-rt/Makefile index d606b2ecf52e..bb7b482d933e 100644 --- a/devel/compiler-rt/Makefile +++ b/devel/compiler-rt/Makefile @@ -21,7 +21,6 @@ CMAKE_SOURCE_PATH= ${WRKSRC} USES= cmake tar:bzip2 USE_LDCONFIG= yes -MAKE_ARGS= VERBOSE=1 LLVM_SVN= http://llvm.org/svn/llvm-project diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 55158b648341..da0ac85274d6 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -15,7 +15,7 @@ COMMENT= Documentation system for C, C++, and other languages LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= bison cmake:outsource iconv python:2 shebangfix +USES= bison cmake:outsource,noninja iconv python:2 shebangfix ALL_TARGET= all CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} # Parallel jobs breaks when the DOCS option is on diff --git a/devel/flang-clang/Makefile b/devel/flang-clang/Makefile index 7480d0b34a86..523c6b3f6450 100644 --- a/devel/flang-clang/Makefile +++ b/devel/flang-clang/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= llvm39>=0:devel/llvm39 \ openmp>=0:devel/openmp USE_LDCONFIG= ${PREFIX}/flang/lib -USES= cmake:outsource compiler:c++11-lib libedit ninja tar:xz perl5 \ +USES= cmake:outsource compiler:c++11-lib libedit tar:xz perl5 \ python shebangfix USE_GNOME+= libxml2 diff --git a/devel/flang/Makefile b/devel/flang/Makefile index fe0801cc9c38..a7a153873588 100644 --- a/devel/flang/Makefile +++ b/devel/flang/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= TESTS TESTS_DESC= build unit tests for flang USE_LDCONFIG= ${PREFIX}/flang/lib -USES= cmake:outsource compiler:c++11-lib libedit perl5 tar:xz \ +USES= cmake:outsource,noninja compiler:c++11-lib libedit perl5 tar:xz \ shebangfix _USES_PYTHON?= python:build USES+= ${_USES_PYTHON} diff --git a/devel/kapptemplate/Makefile b/devel/kapptemplate/Makefile index 810f1c91965f..77999afd7bc1 100644 --- a/devel/kapptemplate/Makefile +++ b/devel/kapptemplate/Makefile @@ -8,7 +8,7 @@ CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE template generator -USES= cmake:outsource gmake kde:4 tar:xz +USES= cmake:outsource kde:4 tar:xz USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build \ corelib dbus declarative diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile index 2a8943fe781c..1a1bfc63dbf7 100644 --- a/devel/kdevelop-kde4/Makefile +++ b/devel/kdevelop-kde4/Makefile @@ -14,7 +14,7 @@ COMMENT= Plugin extensible IDE for KDE LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform RUN_DEPENDS= gmake:devel/gmake -USES= cmake:outsource compiler:c++11-lib gmake kde:4 \ +USES= cmake:outsource compiler:c++11-lib kde:4 \ shared-mime-info tar:xz USE_KDE= kdelibs workspace automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile index c7fa4ce0f91b..ef4fe53b89b5 100644 --- a/devel/kdevelop-php/Makefile +++ b/devel/kdevelop-php/Makefile @@ -13,7 +13,7 @@ COMMENT= PHP support for KDevelop LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform BUILD_DEPENDS= ${KDE_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt -USES= cmake:outsource compiler:c++11-lib gmake kde:4 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile index 0ef1ed6de370..69049ae9e563 100644 --- a/devel/libzrtpcpp/Makefile +++ b/devel/libzrtpcpp/Makefile @@ -13,7 +13,7 @@ COMMENT= ZRTP extension for GNU ccRTP LIB_DEPENDS= libccrtp.so:devel/ccrtp \ libgcrypt.so:security/libgcrypt -USES= cmake pkgconfig ssl +USES= cmake:noninja pkgconfig ssl CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON \ -DOPENSSL_INCLUDE_DIRS="${OPENSSLINC}" \ diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 4f938d9814c6..b4764a88998c 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -17,7 +17,7 @@ COMMAND_SUFFIX= ${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 \ +USES= cmake:outsource compiler:c++11-lib libedit perl5 \ shebangfix USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 39520d23766a..047dc9045edc 100644 --- a/devel/llvm-devel/Makefile +++ b/ |