Now that we have a settled down workflow, I think this should work just
fine, and avoid regenerating that Makefile 30 times in php...

Specifically, that stuff only depends on static port information, it can't
be generated before fake because it lives in WRKINST, and it only needs
to be re-gen'd each time we run update-plist.

That's assuming you don't change PKG_ARGS, but then, it's likely lots of
other things will fail as well.

Index: bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1515
diff -u -p -r1.1515 bsd.port.mk
--- bsd.port.mk 26 Jan 2020 12:51:47 -0000      1.1515
+++ bsd.port.mk 20 Feb 2020 15:17:27 -0000
@@ -2531,6 +2530,7 @@ _internal-plist _internal-update-plist: 
        @mkdir -p ${PKGDIR}
        @${_MAKE} _internal-generate-readmes
        @${_update_plist}
+       @rm -f ${_WRKDEBUG}/Makefile
 
 update-patches:
        @toedit=`WRKDIST=${WRKDIST} PATCHDIR=${PATCHDIR} \
@@ -2982,9 +2982,11 @@ ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
        @${_check_wrkdir} ${WRKDIR} ${_TS_COOKIE} ${WRKDIR_CHANGES_OKAY} 
        @${_PBUILD} ${_MAKE_COOKIE} $@
 
-_copy-debug-info: ${_FAKE_COOKIE}
+${_WRKDEBUG}/Makefile: ${_FAKE_COOKIE}
        @mkdir -p ${_WRKDEBUG}
        @${_build_debug_info}
+
+_copy-debug-info: ${_FAKE_COOKIE} ${_WRKDEBUG}/Makefile
        @cd ${PREFIX} && \
                exec ${SETENV} ${MAKE} -r -f ${_WRKDEBUG}/Makefile \
                        INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' all

Reply via email to