diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2004-04-13 11:29:00 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2004-04-13 11:29:00 +0000 |
| commit | c4401fe51001bdd46a302a780fc21666a10d0907 (patch) | |
| tree | 8070bd953a4e9317de598c6faa3f128d8a76cf3e /Mk | |
| parent | slave port of gcc32 (diff) | |
- Fix dependency problem in CURRENT
- drop LIB_DEPENDS in favor of BUILD_DEPENDS and RUN_DEPENDS
- new internel option GNUSTEP_WITHOUT_LIBOBJC
Notes
Notes:
svn path=/head/; revision=106896
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnustep.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk index d7c222be6c2b..33a247488419 100644 --- a/Mk/bsd.gnustep.mk +++ b/Mk/bsd.gnustep.mk @@ -43,10 +43,17 @@ GNUstep_Include_MAINTAINER= dinoex@FreeBSD.org BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall +.if !defined(GNUSTEP_WITHOUT_LIBOBJC) .if !defined(GNUSTEP_WITH_BASE_GCC) -LIB_DEPENDS+= objc:${PORTSDIR}/${GNUSTEP_OBJC_PORT} +BUILD_DEPENDS+= ${TARGLIB}/libobjc.so:${PORTSDIR}/${GNUSTEP_GCC_PORT} +RUN_DEPENDS+= ${TARGLIB}/libobjc.so:${PORTSDIR}/${GNUSTEP_GCC_PORT} +.else +BUILD_DEPENDS+= ${COMBOLIBDIR}/libobjc.so:${PORTSDIR}/${GNUSTEP_OBJC_PORT} +RUN_DEPENDS+= ${COMBOLIBDIR}/libobjc.so:${PORTSDIR}/${GNUSTEP_OBJC_PORT} +.endif .endif +GNUSTEP_GCC_PORT?= lang/gcc-objc GNUSTEP_MAKE_PORT?= devel/gnustep-make GNUSTEP_OBJC_PORT?= lang/gnustep-objc GNUSTEP_BASE_PORT?= lang/gnustep-base @@ -200,6 +207,10 @@ do-install: .endif +.if !defined(GNUSTEP_WITH_BASE_GCC) +TARGLIB!= (cd ${PORTSDIR}/${GNUSTEP_GCC_PORT} && make -V TARGLIB) +.endif + .endif # eof |