diff options
author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-09-01 13:23:08 +0000 |
---|---|---|
committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-09-01 13:23:08 +0000 |
commit | 2299656dc85e8913973644394da364c6e688b2d3 (patch) | |
tree | 7f15dd99507cc3168eefed0ad1b121026e8925dd /www/chromium/Makefile | |
parent | 77277fb2c0a412155617cbcf784ab458629fffd3 (diff) | |
download | ports-2299656dc85e8913973644394da364c6e688b2d3.tar.gz ports-2299656dc85e8913973644394da364c6e688b2d3.zip |
- USE_GNOME also requires USES=gnome
- Switch to USES=localbase:ldflags
- Revert Makefile.tests and include more *_unittests
- Update patch file with missing WEBRTC_BSD macro
- Apply several patches from devel/googletest (thanks to jbeich@)
- Bump PORTREVISION
Notes
Notes:
svn path=/head/; revision=478691
Diffstat (limited to 'www/chromium/Makefile')
-rw-r--r-- | www/chromium/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index e248d37833cc..3a8945465b8a 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -3,7 +3,7 @@ PORTNAME= chromium PORTVERSION= 68.0.3440.106 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts @@ -69,10 +69,11 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386 .endif .if defined(GN_ONLY) -USES= compiler:c++14-lang ninja pkgconfig python:2.7,build shebangfix tar:xz -.else -USES= bison cpe desktop-file-utils jpeg ninja perl5 pkgconfig \ +USES= compiler:c++14-lang localbase:ldflags ninja pkgconfig \ python:2.7,build shebangfix tar:xz +.else +USES= bison cpe desktop-file-utils gnome jpeg localbase:ldflags \ + ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz .endif MAKE_ARGS= -C out/${BUILDTYPE} BINARY_ALIAS= python=${PYTHON_CMD} @@ -120,8 +121,8 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ - extra_cxxflags="-I${LOCALBASE}/include" \ - extra_ldflags="-L${LOCALBASE}/lib" + extra_cxxflags="${CXXFLAGS}" \ + extra_ldflags="${LDFLAGS}" # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild @@ -196,7 +197,8 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .endif -TEST_ALL_TARGET= base_unittests +.include "Makefile.tests" +TEST_ALL_TARGET= ${TEST_TARGETS} TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts${EXTRACT_SUFX}:fonts |