Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Convert to USES=compiler:c++11-lang and remove the now-obsolete GCC o…

…ption.

This also means that on systems where /usr/bin/cc is clang 3.3 or higher,
there is no option to compile this port with GCC (since it is new enough
for C++11).  On older systems FAVORITE_COMPILER=gcc can be set.

While here use a few more option helpers.
  • Loading branch information...
commit e6be42893ff18a78748d5928794aecd67f262e5a 1 parent a8f9cbc
rene authored

Showing 1 changed file with 14 additions and 24 deletions. Show diff stats Hide diff stats

  1. +14 24 www/chromium/Makefile
38 www/chromium/Makefile
@@ -46,7 +46,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a
46 46
47 47 ONLY_FOR_ARCHS= i386 amd64
48 48 USE_XZ= yes
49   -USES= bison desktop-file-utils pkgconfig perl5 shebangfix
  49 +USES= bison compiler:c++11-lang desktop-file-utils pkgconfig \
  50 + perl5 shebangfix
50 51 USE_PERL5= build
51 52 USE_PYTHON_BUILD= 2.6-2.7
52 53 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst
@@ -91,10 +92,8 @@ SUB_FILES= chromium-browser.desktop
91 92 SUB_LIST= COMMENT="${COMMENT}" \
92 93 DATADIR=${DATADIR}
93 94
94   -OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO GCC TEST DEBUG
95   -
  95 +OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST DEBUG
96 96 CODECS_DESC= Compile and enable patented codecs like H.264
97   -GCC_DESC= Build Chromium with GCC 4.6+
98 97
99 98 OPTIONS_DEFAULT= CODECS GCONF
100 99
@@ -125,24 +124,6 @@ GYP_DEFINES+= use_pulseaudio=0
125 124 GYP_DEFINES+= disable_sse2=1
126 125 .endif
127 126
128   -.if ${PORT_OPTIONS:MGCC}
129   -USE_GCC?= yes
130   -GYP_DEFINES+= gcc_version=${CXX:S/g++//}
131   -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc
132   -.else
133   -.if ${OSVERSION} < 902000
134   -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang32:${PORTSDIR}/lang/clang32
135   -CC= ${LOCALBASE}/bin/clang32
136   -CXX= ${LOCALBASE}/bin/clang++32
137   -.else
138   -CC= clang
139   -CXX= clang++
140   -.endif
141   -GYP_DEFINES+= clang=1
142   -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
143   -CONFIGURE_ENV+= AR=/usr/bin/ar
144   -.endif
145   -
146 127 .if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h)
147 128 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo
148 129 .endif
@@ -163,11 +144,11 @@ TEST_TARGETS= base_unittests \
163 144 content_unittests
164 145 EXCLUDED_TESTS= GpuDriverBugListTest.CurrentDriverBugListValidation
165 146 NINJA_TARGETS+= ${TEST_TARGETS}
166   -DISTFILES+= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata
167 147 .endif
  148 +TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata
168 149
  150 +DEBUG_MAKE_ENV= V=1
169 151 .if ${PORT_OPTIONS:MDEBUG}
170   -MAKE_ENV+= V=1
171 152 BUILDTYPE= Debug
172 153 GYP_DEFINES+= remove_webcore_debug_symbols=1
173 154 .else
@@ -190,6 +171,15 @@ MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \
190 171
191 172 .include <bsd.port.pre.mk>
192 173
  174 +.if ${CHOSEN_COMPILER_TYPE} == gcc
  175 +GYP_DEFINES+= gcc_version=${CXX:S/g++//}
  176 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc
  177 +.else
  178 +GYP_DEFINES+= clang=1
  179 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
  180 +CONFIGURE_ENV+= AR=/usr/bin/ar
  181 +.endif
  182 +
193 183 pre-everything::
194 184 @${ECHO_MSG}
195 185 @${ECHO_MSG} "To build Chromium, you should have around 1 GB of memory"

0 comments on commit e6be428

Please sign in to comment.
Something went wrong with that request. Please try again.