diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2012-09-04 20:56:27 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2012-09-04 20:56:27 +0000 |
| commit | d89b327207228e35fc46f32a95e58449e73366b1 (patch) | |
| tree | 83ceb15a11e0b43141979f010eadb5d3b7412969 /multimedia/mplayer/Makefile.options | |
| parent | cd2051d0946f3d7c064bc0c96a93d8a1c9676654 (diff) | |
- Only default to clang on amd64 and when /usr/bin/clang exists.
- Set CPP= clang-cpp in that case too.
- Fix windows codecs dir configure arg.
- Bump PORTREVISIONs.
PR: ports/171249
Submitted by: "Herbert J. Skuhra" <h.skuhra@gmail.com>
Submitted by: Thomas Zander <thomas.e.zander@googlemail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=303671
Diffstat (limited to 'multimedia/mplayer/Makefile.options')
| -rw-r--r-- | multimedia/mplayer/Makefile.options | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index 0db7acfe46be..b6f249be0fe7 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -51,17 +51,25 @@ CFLAGS+= -O3 -fomit-frame-pointer -ffast-math .endif .endif #WITH_DEBUG +#Supported architectures for clang +.if ${ARCH} == "amd64" +MPLAYER_CLANG_SUPPORTED_ARCH= yes +.endif + .if !defined(WITHOUT_RTCPU) CONFIGURE_ARGS+=--enable-runtime-cpudetection .endif -.if ${OSVERSION} >= 900033 +.if ${OSVERSION} >= 900033 \ + && exists(/usr/bin/clang) \ + && defined(MPLAYER_CLANG_SUPPORTED_ARCH) WITH_BASE_CLANG=yes .endif .if defined(WITH_BASE_CLANG) CC= clang CXX= clang++ +CPP= clang-cpp .else .if defined(WITH_OTCHAIN) USE_GCC?= 4.6+ @@ -232,7 +240,7 @@ DEFAULT_CDROM_DEVICE=/dev/acd0 .if ${ARCH} == "i386" || ${ARCH} == "amd64" .if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386" RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} -CONFIGURE_ARGS+= --win32codecsdir=${LOCALBASE}/lib/win32 +CONFIGURE_ARGS+= --codecsdir=${LOCALBASE}/lib/win32 CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE .else |