Date: Tue, 18 Aug 2015 10:51:02 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394572 - in head: Mk/Uses comms/gnuradio databases/sqliteman devel/freeocl devel/qca devel/qca-qt5 emulators/tpm-emulator games/opensonic graphics/cegui graphics/luxrender graphics/ope... Message-ID: <201508181051.t7IAp28c071038@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue Aug 18 10:51:01 2015 New Revision: 394572 URL: https://svnweb.freebsd.org/changeset/ports/394572 Log: Uses/cmake.mk: Replace CMAKE_ENV with CONFIGURE_ENV. Instead of defining a variable that is almost always based on CONFIGURE_ENV, just use CONFIGURE_ENV directly. This also matches the behavior of other ports that do not use autotools (so most ports can just worry about CONFIGURE_ENV). Additionally, the fact that we do not use ?= means we do not have problems if another file in Uses/ needs to set CONFIGURE_ENV (with CMAKE_ENV, the order of the arguments to USES would matter). Ports which set CMAKE_ENV have been adjusted accordingly. In most cases, CMAKE_ENV was just replaced with CONFIGURE_ENV, the exceptions being: * databases/sqliteman: CMAKE_ENV line removed; setting QMAKESPEC there has no effect on the build system. * devel/freeocl: CMAKE_ENV line removed; FREEOCL_CXX_COMPILER is already retrieved from the CMAKE_CXX_COMPILER variable in the build system. * graphics/openimageio: CMAKE_ENV line removed; setting Qt variables there has no effect on the build system. Reviewed by: makc Differential Revision: https://reviews.freebsd.org/D3403 Modified: head/Mk/Uses/cmake.mk head/comms/gnuradio/Makefile head/databases/sqliteman/Makefile head/devel/freeocl/Makefile head/devel/qca-qt5/Makefile head/devel/qca/Makefile head/emulators/tpm-emulator/Makefile head/games/opensonic/Makefile head/graphics/cegui/Makefile head/graphics/luxrender/Makefile head/graphics/opencv/Makefile head/graphics/openimageio/Makefile head/graphics/rawtherapee/Makefile head/math/eigen3/Makefile head/math/metis/Makefile head/math/scalapack/Makefile head/sysutils/osquery/Makefile head/www/webkit2-gtk3/Makefile Modified: head/Mk/Uses/cmake.mk ============================================================================== --- head/Mk/Uses/cmake.mk Tue Aug 18 10:46:30 2015 (r394571) +++ head/Mk/Uses/cmake.mk Tue Aug 18 10:51:01 2015 (r394572) @@ -19,8 +19,6 @@ # CMAKE_NINJA - Use ninja instead of make(1) # # Variables for ports: -# CMAKE_ENV - Environment passed to cmake. -# Default: ${CONFIGURE_ENV} # CMAKE_ARGS - Arguments passed to cmake # Default: see below # CMAKE_BUILD_TYPE - Type of build (cmake predefined build types). @@ -68,7 +66,6 @@ PLIST_SUB+= CMAKE_BUILD_TYPE="${CMAKE_B INSTALL_TARGET?= install/strip .endif -CMAKE_ENV?= ${CONFIGURE_ENV} CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \ -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ @@ -117,7 +114,7 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} do-configure: @${ECHO_MSG} ${_CMAKE_MSG} ${MKDIR} ${CONFIGURE_WRKSRC} - @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} + @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} .endif .endif #!defined(_INCLUDE_USES_CMAKE_MK) Modified: head/comms/gnuradio/Makefile ============================================================================== --- head/comms/gnuradio/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/comms/gnuradio/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -35,7 +35,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= cmake:outsource iconv perl5 python:2.7 shebangfix SHEBANG_FILES= grc/freedesktop/grc_setup_freedesktop.in -CMAKE_ENV+= LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1" +CONFIGURE_ENV+= LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1" CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0" CMAKE_ARGS+= -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \ -DICONV_LIB:STRING="X${ICONV_LIB}" \ Modified: head/databases/sqliteman/Makefile ============================================================================== --- head/databases/sqliteman/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/databases/sqliteman/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -14,7 +14,6 @@ LIB_DEPENDS= libqscintilla2.so:${PORTSDI USES= cmake USE_SQLITE= yes -CMAKE_ENV+= QMAKESPEC=${QMAKESPEC} USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql GNU_CONFIGURE= yes Modified: head/devel/freeocl/Makefile ============================================================================== --- head/devel/freeocl/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/devel/freeocl/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -25,7 +25,6 @@ USES= cmake compiler:c++11-lib USE_LDCONFIG= yes CXXFLAGS+= -pthread -std=gnu++0x -CMAKE_ENV+= FREEOCL_CXX_COMPILER="${CXX}" CFLAGS_i386= -msse Modified: head/devel/qca-qt5/Makefile ============================================================================== --- head/devel/qca-qt5/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/devel/qca-qt5/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -19,7 +19,7 @@ CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \ -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man \ -DQCA_SUFFIX=qt5 -CMAKE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt +CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt USE_LDCONFIG= yes USE_QT5= buildtools_build core network qmake_build Modified: head/devel/qca/Makefile ============================================================================== --- head/devel/qca/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/devel/qca/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -18,7 +18,7 @@ CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD -DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \ -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \ -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man -CMAKE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt +CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt USE_LDCONFIG= yes USE_QT4= corelib moc_build qmake_build rcc_build Modified: head/emulators/tpm-emulator/Makefile ============================================================================== --- head/emulators/tpm-emulator/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/emulators/tpm-emulator/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -18,7 +18,7 @@ CONFLICTS= trousers-tddl-[0-9]* USES= cmake:outsource USE_RC_SUBR= tpmd -CMAKE_ENV= PREFIX="${PREFIX}" +CONFIGURE_ENV= PREFIX="${PREFIX}" CMAKE_ARGS= -DTPM_INCLUDE_DIRS:STRING="${LOCALBASE}/include" \ -DTPM_LIBRARY_DIRS:STRING="${LOCALBASE}/lib" USE_LDCONFIG= yes Modified: head/games/opensonic/Makefile ============================================================================== --- head/games/opensonic/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/games/opensonic/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -24,7 +24,7 @@ DESKTOP_ENTRIES="${PORTNAME}" \ false USES= cmake -CMAKE_ENV+= _ALLEGRO_LIBS="`allegro-config --libs`" \ +CONFIGURE_ENV+= _ALLEGRO_LIBS="`allegro-config --libs`" \ _ALLEGRO_VERSION="`allegro-config --version`" CFLAGS+= -I${LOCALBASE}/include Modified: head/graphics/cegui/Makefile ============================================================================== --- head/graphics/cegui/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/graphics/cegui/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -14,7 +14,7 @@ LICENSE= MIT LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo WRKSRC= ${WRKDIR}/${DISTNAME:S/2b/2/} -CMAKE_ENV+= TOLUA_INC="${LUA_INCDIR}" +CONFIGURE_ENV+= TOLUA_INC="${LUA_INCDIR}" CMAKE_ARGS= -DCEGUI_SAMPLES_ENABLED:BOOL=OFF \ -DCEGUI_BUILD_TESTS=OFF USE_LDCONFIG= yes Modified: head/graphics/luxrender/Makefile ============================================================================== --- head/graphics/luxrender/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/graphics/luxrender/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -58,7 +58,7 @@ post-patch: ${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake pre-configure: - cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} \ + cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ ${CMAKE_ARGS} . ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} -C ${LUXRAYS_WRKSRC} Modified: head/graphics/opencv/Makefile ============================================================================== --- head/graphics/opencv/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/graphics/opencv/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -243,7 +243,7 @@ CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=On . for module in apps python stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off . endfor -CMAKE_ENV+= JAVA_HOME="${JAVA_HOME}" +CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" INSTALL_WRKSRC= ${WRKSRC}/modules/java .else LIB_DEPENDS+= libopencv_core.so:${PORTSDIR}/graphics/opencv-core Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/graphics/openimageio/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -86,7 +86,6 @@ CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -DUSE_ USE_GL= glew USE_QT4= corelib gui opengl qmake_build moc_build rcc_build uic_build CMAKE_ARGS+= -DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON -CMAKE_ENV+= QTDIR=${QT_PREFIX} QT_INCLUDES=${QT_INCDIR} .else CMAKE_ARGS+= -DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF .endif Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/graphics/rawtherapee/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -29,7 +29,7 @@ USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include -fPIC CXXFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS+= -lpthread -L${LOCALBASE}/lib -CMAKE_ENV= CFLAGS="${CFLAGS}" \ +CONFIGURE_ENV= CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ -DCREDITSDIR="${DOCSDIR}" \ Modified: head/math/eigen3/Makefile ============================================================================== --- head/math/eigen3/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/math/eigen3/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -15,7 +15,7 @@ LICENSE= LGPL21 MPL LICENSE_COMB= multi USES= cmake:outsource tar:bzip2 -CMAKE_ENV+= PKG_CONFIG_LIBDIR="${PREFIX}/libdata" +CONFIGURE_ENV+= PKG_CONFIG_LIBDIR="${PREFIX}/libdata" NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-1306d75b4a21 Modified: head/math/metis/Makefile ============================================================================== --- head/math/metis/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/math/metis/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -91,7 +91,7 @@ do-configure: .for o in SHARED STATIC #PROFILE .if ${PORT_OPTIONS:M${o}} @${PRINTF} "\n\nConfiguring ${o}:\n\n\n" - @cd ${WRKSRC_${o}}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} \ + @cd ${WRKSRC_${o}}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ ${CMAKE_ARGS:C|${CFLAGS}|& ${${o}_FLAGS}|g} ${CMAKE_ARGS_${o}} \ -DGKLIB_PATH="${WRKSRC_${o}}/GKlib" ${CMAKE_SOURCE_PATH} .endif Modified: head/math/scalapack/Makefile ============================================================================== --- head/math/scalapack/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/math/scalapack/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -112,7 +112,7 @@ post-build: ${RM} -rf ${WRKSRC}/CMakeFiles ${WRKSRC}/CMakeCache.txt ${CP} -p ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile (cd ${WRKSRC} && \ - ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH}) + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH}) (cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET}) post-install: Modified: head/sysutils/osquery/Makefile ============================================================================== --- head/sysutils/osquery/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/sysutils/osquery/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -29,7 +29,7 @@ LIB_DEPENDS= libboost_regex.so:${PORTSDI libicuuc.so:${PORTSDIR}/devel/icu USES= cmake:outsource gmake libtool python:build compiler:c++11-lib -CMAKE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \ +CONFIGURE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \ SKIP_TESTS="yes" CC="${CC}" CXX="${CXX}" CMAKE_ARGS+= -DFREEBSD=awesome -DCMAKE_SYSTEM_NAME="FreeBSD" BLDDIR= ${WRKDIR}/.build/${PORTNAME} Modified: head/www/webkit2-gtk3/Makefile ============================================================================== --- head/www/webkit2-gtk3/Makefile Tue Aug 18 10:46:30 2015 (r394571) +++ head/www/webkit2-gtk3/Makefile Tue Aug 18 10:51:01 2015 (r394572) @@ -47,10 +47,10 @@ BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/ #../../../lib/libjavascriptcoregtk-4.0.so.18.0.8: undefined reference to `JSC::JSCell::structure() const' #c++: error: linker command failed with exit code 1 (use -v to see invocation) #Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/build.make:94: recipe for target 'bin/jsc' failed -# there is something in CMAKE_ENV that cause this ... but what. +# there is something in CONFIGURE_ENV that cause this ... but what. CMAKE_ARGS+= -DPORT=GTK -CMAKE_ENV+= XDG_CACHE_HOME=${WRKDIR} \ +CONFIGURE_ENV+= XDG_CACHE_HOME=${WRKDIR} \ CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ CC="${CC}" CXX="${CXX}" CPP="${CPP}" @@ -92,7 +92,7 @@ pre-configure: do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" \ - ${CMAKE_ENV} cmake -DPORT=GTK ${CMAKE_ARGS} + ${CONFIGURE_ENV} cmake -DPORT=GTK ${CMAKE_ARGS} post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/jsc \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508181051.t7IAp28c071038>