diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-03-26 20:07:11 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-03-26 20:07:11 +0000 |
| commit | 578bdcd05da29322cc413194e5b3f4ef863886ff (patch) | |
| tree | 0a98a3aba6b4e9ea80b4ad5eee48021882ede48f /Mk | |
| parent | devel/ocaml-react: Upgrade version 0.9.2 -> 0.9.4 and stage (diff) | |
Make bsd.ocaml.mk more stage friendly
Reviewed by: bapt
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=349286
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.ocaml.mk | 26 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
2 files changed, 21 insertions, 9 deletions
diff --git a/Mk/bsd.ocaml.mk b/Mk/bsd.ocaml.mk index 1900453f9b79..b098b2c8dfb9 100644 --- a/Mk/bsd.ocaml.mk +++ b/Mk/bsd.ocaml.mk @@ -108,25 +108,19 @@ post-install-script: ocaml-findlib ocaml-ldconfig ocaml-wash # BUILD_DEPENDS+= ${OCAMLFIND_DEPEND} RUN_DEPENDS+= ${OCAMLFIND_DEPEND} -MAKE_ENV+= OCAMLFIND_DESTDIR="${OCAMLFIND_DESTDIR}" \ +MAKE_ENV+= OCAMLFIND_DESTDIR="${STAGEDIR}${OCAMLFIND_DESTDIR}" \ OCAMLFIND_LDCONF="${OCAMLFIND_LDCONF}" # # Directories under site-lib to process automatically # OCAML_PKGDIRS?= ${PORTNAME} -. if !target(pre-install-script) -pre-install-script: -.if !exists(${OCAMLFIND_DESTDIR}) - @${MKDIR} "${PREFIX}/${OCAML_SITELIBDIR}" -.endif -. endif . if !target(ocaml-findlib) ocaml-findlib: . for DIR in ${OCAML_PKGDIRS} . if defined(USE_OCAMLFIND_PLIST) - @${FIND} ${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \ - 's,^${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \ + 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} . endif @${ECHO_CMD} "@unexec rmdir %D/${OCAML_SITELIBDIR}/${DIR} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \ @@ -143,7 +137,9 @@ OCAML_LDLIBS?= ${OCAML_SITELIBDIR}/${PORTNAME} . if !target(ocaml-ldconfig) ocaml-ldconfig: . for LIB in ${OCAML_LDLIBS} +. if defined(NO_STAGE) @${ECHO_CMD} "${PREFIX}/${LIB}" >> "${PREFIX}/${OCAML_LDCONF}" +. endif @${ECHO_CMD} "@exec ${ECHO_CMD} "%D/${LIB}" >> %D/${OCAML_LDCONF}" \ >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${SED} -i \"\" -e '/${LIB:S#/#\/#g}/d' %D/${OCAML_LDCONF}" >> ${TMPPLIST} @@ -199,3 +195,15 @@ add-plist-post: .endif .endif #!defined(OCAML_include) + +.if defined(_POSTMKINCLUDED) + +.if defined(USE_OCAML_FINDLIB) + +pre-install: ${STAGEDIR}${OCAMLFIND_DESTDIR} +${STAGEDIR}${OCAMLFIND_DESTDIR}: + @${MKDIR} ${.TARGET} + +.endif + +.endif # _POSTMKINCLUDED diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4b125429bba5..711ea8bc0259 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1845,6 +1845,10 @@ IGNORE= Do not define STAGEDIR in command line .include "${PORTSDIR}/Mk/bsd.java.mk" .endif +.if defined(USE_OCAML) +.include "${PORTSDIR}/Mk/bsd.ocaml.mk" +.endif + .if defined(USE_LINUX_RPM) .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" .endif |