Date: Fri, 2 May 2014 16:41:58 +0200 (CEST) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/189243: [exp-run] Mk/bsd.autotools.mk: fix running order Message-ID: <201405021441.s42EfwIq018466@kalimero.tijl.coosemans.org> Resent-Message-ID: <201405021450.s42Eo1Sa035664@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189243
>Category: ports
>Synopsis: [exp-run] Mk/bsd.autotools.mk: fix running order
>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: Fri May 02 14:50:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
The attached patch changes the order in which various autotools are
executed to match what autoreconf does. The order used by autoreconf
is: libtoolize, aclocal, autoconf, autoheader, automake.
This should allow removing custom pre-configure and run-autotools
targets that some ports have.
The patch also sets default LIBTOOLIZE_ARGS:
-i: install missing files.
-c: copy files instead of linking them. This is needed for USES=libtool
to be able to patch them.
-f: force replacement of existing files. This ensures all files belong
to the same version.
These should work for most if not all ports.
>How-To-Repeat:
>Fix:
--- bsd.autotools.mk.patch begins here ---
Index: Mk/bsd.autotools.mk
===================================================================
--- Mk/bsd.autotools.mk (revision 352745)
+++ Mk/bsd.autotools.mk (working copy)
@@ -308,6 +308,8 @@ LIBTOOLFILES?= aclocal.m4
LIBTOOLFILES?= ${CONFIGURE_SCRIPT}
. endif
+LIBTOOLIZE_ARGS?= -i -c -f
+
LIBTOOL_DEPENDS= libtool>=2.4:${PORTSDIR}/${LIBTOOL_PORT}
BUILD_DEPENDS+= ${LIBTOOL_DEPENDS}
.endif
@@ -329,15 +331,13 @@ ${var:U}_ENV+= ${AUTOTOOLS_VARS}
#---------------------------------------------------------------------------
.if !target(run-autotools)
-.ORDER: run-autotools run-autotools-aclocal \
- patch-autotools-libtool run-autotools-autoheader \
- run-autotools-libtoolize run-autotools-autoconf \
- run-autotools-automake
+.ORDER: run-autotools run-autotools-libtoolize run-autotools-aclocal \
+ patch-autotools-libtool run-autotools-autoconf \
+ run-autotools-autoheader run-autotools-automake
-run-autotools:: run-autotools-aclocal \
- patch-autotools-libtool run-autotools-autoheader \
- run-autotools-libtoolize run-autotools-autoconf \
- run-autotools-automake
+run-autotools:: run-autotools-libtoolize run-autotools-aclocal \
+ patch-autotools-libtool run-autotools-autoconf \
+ run-autotools-autoheader run-autotools-automake
.endif
.if !target(run-autotools-aclocal)
--- bsd.autotools.mk.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?201405021441.s42EfwIq018466>