diff options
| author | theraven <theraven@FreeBSD.org> | 2015-07-01 21:50:28 +0800 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2015-07-01 21:50:28 +0800 |
| commit | 904c17e098fd87d14c369a6777af92f88f3150ea (patch) | |
| tree | 768c0d7e8d779c0a07374b2216328f05189ef2df /Mk/Uses | |
| parent | c7b08070be2e3668771df19f5912e2373455f70c (diff) | |
| download | freebsd-ports-gnome-904c17e098fd87d14c369a6777af92f88f3150ea.tar.gz freebsd-ports-gnome-904c17e098fd87d14c369a6777af92f88f3150ea.tar.zst freebsd-ports-gnome-904c17e098fd87d14c369a6777af92f88f3150ea.zip | |
Update GNUstep ports to their latest versions.
Also fix a few bits of generic infrastructure along the way.
Approved by: bapt (mentor)
Differential Revision: https://reviews.freebsd.org/D2961
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/gnustep.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/iconv.mk | 1 | ||||
| -rw-r--r-- | Mk/Uses/objc.mk | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Mk/Uses/gnustep.mk b/Mk/Uses/gnustep.mk index 3029171fabfc..416605ce051c 100644 --- a/Mk/Uses/gnustep.mk +++ b/Mk/Uses/gnustep.mk @@ -33,9 +33,13 @@ GNUSTEP_LOCAL_TOOLS= ${GNUSTEP_LOCAL_ROOT}/Tools LIB_DIRS+= ${GNUSTEP_SYSTEM_LIBRARIES} \ ${GNUSTEP_LOCAL_LIBRARIES} -.for a in FLAGS CFLAGS CPPFLAGS OBJCFLAGS INCLUDE_DIRS LDFLAGS LIB_DIRS +.for a in CFLAGS CPPFLAGS CXXFLAGS OBJCCFLAGS OBJCFLAGS LDFLAGS +MAKE_ENV+= ADDITIONAL_${a}="${ADDITIONAL_${a}} ${${a}}" +.endfor +.for a in FLAGS INCLUDE_DIRS LIB_DIRS MAKE_ENV+= ADDITIONAL_${a}="${ADDITIONAL_${a}}" .endfor +MAKE_ARGS+=messages=yes MAKEFILE= GNUmakefile #MAKE_ENV+= GNUSTEP_CONFIG_FILE=${PORTSDIR}/devel/gnustep-make/files/GNUstep.conf diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk index 6e2af9462c1c..fa7a4598ff2c 100644 --- a/Mk/Uses/iconv.mk +++ b/Mk/Uses/iconv.mk @@ -44,6 +44,7 @@ BUILD_DEPENDS+= libiconv>=1.14_8:${PORTSDIR}/converters/libiconv CPPFLAGS+= -DLIBICONV_PLUG CFLAGS+= -DLIBICONV_PLUG CXXFLAGS+= -DLIBICONV_PLUG +OBJCFLAGS+= -DLIBICONV_PLUG .endif .endif diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index 41ec8914a4ce..96888a8ebd6b 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -10,8 +10,9 @@ .if !defined(_INCLUDE_USES_OBJC_MK) _INCLUDE_USES_OBJC_MK= yes -.if !empty(objc_ARGS) -IGNORE= USES=objc takes no arguments +objc_ARGS?= +.if !empty(objc_ARGS) && ! ${objc_ARGS:Mcompiler} +IGNORE= USES=objc only accepts no arguments or 'compiler' .endif _CCVERSION!= ${CC} --version @@ -56,9 +57,11 @@ LDFLAGS+= -B${LOCALBASE}/bin .endif .endif +.if ! ${objc_ARGS:Mcompiler} LIB_DEPENDS+= libobjc.so.4.6:${PORTSDIR}/lang/libobjc2 OBJCFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +.endif CONFIGURE_ENV+= OBJC="${CC}" OBJCFLAGS="${OBJCFLAGS}" MAKE_ENV+= OBJC="${CC}" OBJCFLAGS="${OBJCFLAGS}" |