Date: Sun, 04 Jan 2004 07:32:22 +0300 From: Sergey Matveychuk <sem@ciam.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/60882: bsd.port.mk: resort configure target and split do-configure Message-ID: <E1Aczw6-000350-2C@Current.sem-home.ciam.ru> Resent-Message-ID: <200401040440.i044eJY9056069@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60882
>Category: ports
>Synopsis: bsd.port.mk: resort configure target and split do-configure
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 03 20:40:19 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Sergey Matveychuk
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD Current.sem-home.ciam.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Fri Nov 21 07:47:47 MSK 2003 root@Current.sem-home.ciam.ru:/usr/obj/usr/src/sys/CURRENT i386
>Description:
* Some ports want to run aclocal. The best place for this IMO
is pre-configure target. But it fails because of patch-libtool target
placed before pre-configure target. So ports maintainers have to
run aclocal in post-patch target. This patch resorts _CONFIGURE_SEQ
to run pre-configure target before patch-libtool.
* It's possible some maintainers can want run autotools with own
way. Now autotools is run in do-configure target. This patch split
do-configure onto run-autotools and do-configure where only configure
script runs.
>How-To-Repeat:
>Fix:
--- fix-configure.patch begins here ---
--- bsd.port.mk.local Sat Jan 3 23:07:27 2004
+++ bsd.port.mk Sun Jan 4 07:12:36 2004
@@ -3018,8 +3018,8 @@
# Configure
-.if !target(do-configure)
-do-configure:
+.if !target(run-autotools)
+run-autotools:
.if defined(USE_AUTOMAKE)
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${AUTOMAKE} \
${AUTOMAKE_ARGS})
@@ -3032,6 +3032,10 @@
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOHEADER_ENV} ${AUTOHEADER} \
${AUTOHEADER_ARGS})
.endif
+.endif
+
+.if !target(do-configure)
+do-configure:
@if [ -f ${SCRIPTDIR}/configure ]; then \
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
${SCRIPTDIR}/configure; \
@@ -3436,8 +3440,8 @@
do-patch post-patch post-patch-script
_CONFIGURE_DEP= patch
_CONFIGURE_SEQ= build-depends lib-depends misc-depends configure-message \
- patch-libtool pre-configure pre-configure-script \
- do-configure post-configure post-configure-script
+ pre-configure pre-configure-script patch-libtool \
+ run-autotools do-configure post-configure post-configure-script
_BUILD_DEP= configure
_BUILD_SEQ= build-message pre-build pre-build-script do-build \
post-build post-build-script
--- fix-configure.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Aczw6-000350-2C>