diff options
| author | rakuco <rakuco@FreeBSD.org> | 2015-08-18 18:51:01 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2015-08-18 18:51:01 +0800 |
| commit | 4f4c3f4858e41faac2d9b5883898c35afbe1c327 (patch) | |
| tree | ce0de1d0b7bda5eb762e64fe58300177d350898c /www | |
| parent | 8a49f8f056abc122912107313fddc7b1ea728c39 (diff) | |
| download | freebsd-ports-gnome-4f4c3f4858e41faac2d9b5883898c35afbe1c327.tar.gz freebsd-ports-gnome-4f4c3f4858e41faac2d9b5883898c35afbe1c327.tar.zst freebsd-ports-gnome-4f4c3f4858e41faac2d9b5883898c35afbe1c327.zip | |
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
Diffstat (limited to 'www')
| -rw-r--r-- | www/webkit2-gtk3/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index 3fc7af4294f0..c27616c2b0b0 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -47,10 +47,10 @@ BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/cmake #../../../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 \ |