diff options
| author | theraven <theraven@FreeBSD.org> | 2017-08-21 21:26:28 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 05:24:19 +0800 |
| commit | 2de08d6a702e836f67b7e49d7fc43934c374ad21 (patch) | |
| tree | 6fea2d414d61ef34ffe58c7583819a0f1a59ef97 /Mk | |
| parent | 17c98b42e8d5903f7b29a8664a4d747b42ffb91e (diff) | |
| download | freebsd-ports-gnome-2de08d6a702e836f67b7e49d7fc43934c374ad21.tar.gz freebsd-ports-gnome-2de08d6a702e836f67b7e49d7fc43934c374ad21.tar.zst freebsd-ports-gnome-2de08d6a702e836f67b7e49d7fc43934c374ad21.zip | |
Update GNUstep core libraries.
Update the default Objective-C compiler.
Fix various build failures in GNUstep ports from newer versions of the GNUstep
core libraries and from changes to GNUstep Make.
Update various ports that use GNUstep and bump the portrevision of the ones
that haven't had a new release.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/gnustep.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/objc.mk | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/Mk/Uses/gnustep.mk b/Mk/Uses/gnustep.mk index 9749ac5cadcf..225bf46b13be 100644 --- a/Mk/Uses/gnustep.mk +++ b/Mk/Uses/gnustep.mk @@ -63,12 +63,12 @@ LIB_DEPENDS+= libgnustep-base.so:lang/gnustep-base . if ${USE_GNUSTEP:Mbuild} PATH:= ${GNUSTEP_SYSTEM_TOOLS}:${GNUSTEP_LOCAL_TOOLS}:${PATH} -MAKE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" +MAKE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" # All GNUstep things installed from ports should be in the System domain. # Things installed from source can then freely live in the Local domain without # conflicts. MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM -CONFIGURE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" +CONFIGURE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" BUILD_DEPENDS+= gnustep-make>0:devel/gnustep-make .include "${USESDIR}/objc.mk" . endif diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index c055378a63bb..490e302a9e96 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -10,6 +10,8 @@ .if !defined(_INCLUDE_USES_OBJC_MK) _INCLUDE_USES_OBJC_MK= yes +OBJC_CLANG_VERSION=40 + objc_ARGS?= .if !empty(objc_ARGS) && ! ${objc_ARGS:Mcompiler} IGNORE= USES=objc only accepts no arguments or 'compiler' @@ -39,17 +41,17 @@ ALT_COMPILER_TYPE= clang ALT_COMPILER_TYPE= gcc .endif -# We do always need clang -.if ${COMPILER_TYPE} != clang -.if ${ALT_COMPILER_TYPE} == clang +# We do always need clang and prefer a recent version +.if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < ${OBJC_CLANG_VERSION}) || ${COMPILER_TYPE} != clang +.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= ${OJBC_CLANG_VERSION} CC= /usr/bin/clang CPP= /usr/bin/clang-cpp CXX= /usr/bin/clang++ .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34 -CPP= ${LOCALBASE}/bin/clang-cpp34 -CC= ${LOCALBASE}/bin/clang34 -CXX= ${LOCALBASE}/bin/clang++34 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${OBJC_CLANG_VERSION}:devel/llvm${OBJC_CLANG_VERSION} +CPP= ${LOCALBASE}/bin/clang-cpp${OBJC_CLANG_VERSION} +CC= ${LOCALBASE}/bin/clang${OBJC_CLANG_VERSION} +CXX= ${LOCALBASE}/bin/clang++${OBJC_CLANG_VERSION} .endif .endif |