Date: Fri, 5 Jul 2013 13:32:32 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322324 - in head/Mk: . Uses Message-ID: <201307051332.r65DWWq3041135@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Jul 5 13:32:31 2013 New Revision: 322324 URL: http://svnweb.freebsd.org/changeset/ports/322324 Log: Import new gmake.mk and rip out USE_GMAKE from bsd.port.mk A USE_GMAKE stub as be created to help migration please now use USES=gmake Reviewed by: bdrewery Exp-run by: bdrewery Added: head/Mk/Uses/gmake.mk (contents, props changed) Modified: head/Mk/bsd.port.mk Added: head/Mk/Uses/gmake.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/gmake.mk Fri Jul 5 13:32:31 2013 (r322324) @@ -0,0 +1,42 @@ +# $FreeBSD$ +# +# Provide support to use the GNU make +# +# MAINTAINER: portmgr@FreeBSD.org +# +# Feature: gmake +# Usage: USES=gmake +# + +.if !defined(_INCLUDE_USES_GMAKE_MK) +_INCLUDE_USES_GMAKE_MK= yes + +.if defined(gmake_ARGS) +IGNORE= Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments +.endif + +BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake +CONFIGURE_ENV+= MAKE=${GMAKE} +_USES_POST+= gmake +.endif + +.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GMAKE_MK_POST) +_INCLUDE_USES_GMAKE_MK_POST= yes + +.if !target(do-build) +do-build: + @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ + if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ + ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ + (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + fi; \ + ${FALSE}; \ + fi) +.endif + +.if !target(do-install) +do-install: + @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) +.endif + +.endif Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Jul 5 13:21:07 2013 (r322323) +++ head/Mk/bsd.port.mk Fri Jul 5 13:32:31 2013 (r322324) @@ -320,9 +320,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # the system or installed from a port. # USE_CSTD - Override the default C language standard (gnu89, gnu99) # USE_BINUTILS - Use binutils suite from port instead of the version in base. -# USE_GMAKE - If set, this port uses gmake. -# GMAKE - Set to path of GNU make if not in $PATH. -# Default: gmake ## # USE_GHOSTSCRIPT # - If set, this port needs ghostscript to both @@ -1501,6 +1498,10 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/ .include "${PORTSDIR}/Mk/bsd.pbi.mk" +.if defined(USE_GMAKE) +USES+= gmake +.endif + # Loading features .for f in ${USES} _f=${f:C/\:.*//g} @@ -1545,7 +1546,7 @@ _POSTMKINCLUDED= yes .for f in ${_USES_POST} _f=${f:C/\:.*//g} .if ${_f} != ${f} -${_f}_ARGS:= ${f:C/^[^\:]*\://g} +${_f}_ARGS:= ${f:C/^[^\:]*\://g} .endif .include "${USESDIR}/${_f}.mk" .endfor @@ -1696,10 +1697,6 @@ EXTRACT_DEPENDS+= ${LOCALBASE}/bin/xz:${ .if defined(USE_MAKESELF) EXTRACT_DEPENDS+= unmakeself:${PORTSDIR}/archivers/unmakeself .endif -.if defined(USE_GMAKE) -BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake -CONFIGURE_ENV+= MAKE=${GMAKE} -.endif .if defined(USE_GCC) || defined(USE_FORTRAN) .include "${PORTSDIR}/Mk/bsd.gcc.mk" @@ -3710,24 +3707,14 @@ do-configure: .if !target(do-build) do-build: -.if defined(USE_GMAKE) - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ - if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ - ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ - (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ - fi; \ - ${FALSE}; \ - fi) -.else @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ - if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ + if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ fi; \ ${FALSE}; \ fi) .endif -.endif # Check conflicts @@ -3847,12 +3834,8 @@ check-install-conflicts: .if !target(do-install) do-install: -.if defined(USE_GMAKE) - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.else # !defined(USE_GMAKE) @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endif -.endif # Package
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307051332.r65DWWq3041135>