Date: Fri, 09 Nov 2007 13:49:03 +0100 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: Luigi Rizzo <rizzo@icir.org> Cc: ports@freebsd.org, portmgr@freebsd.org Subject: Re: autoconf problem (with fix) Message-ID: <86hcjvk2io.fsf@ds4.des.no> In-Reply-To: <20071109040224.A44924@xorpc.icir.org> (Luigi Rizzo's message of "Fri\, 9 Nov 2007 04\:02\:24 -0800") References: <20071109040224.A44924@xorpc.icir.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Luigi Rizzo <rizzo@icir.org> writes:
> I think an easy fix is to replace, in the wrapper, sed and find with
> /usr/bin/sed and /usr/bin/find so that we have no surprises here, not
> just with openwrt but also with other packages which use autoconf on a
> non-standard environment.
Sounds fine, if portmgr (Cc:ed) approves. See attached patch.
DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=autoconf-wrapper.diff
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/autoconf-wrapper/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 25 Oct 2007 11:15:18 -0000 1.2
+++ Makefile 9 Nov 2007 12:46:05 -0000
@@ -6,7 +6,7 @@
#
PORTNAME?= autoconf-wrapper
-PORTVERSION= 20071025
+PORTVERSION= 20071109
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none
Index: files/autotools-wrapper.sh
===================================================================
RCS file: /home/pcvs/ports/devel/autoconf-wrapper/files/autotools-wrapper.sh,v
retrieving revision 1.2
diff -u -r1.2 autotools-wrapper.sh
--- files/autotools-wrapper.sh 25 Oct 2007 11:15:19 -0000 1.2
+++ files/autotools-wrapper.sh 9 Nov 2007 12:45:55 -0000
@@ -63,10 +63,10 @@
# is present both as "toolABC" and as "tool-A.BC". We take no special
# measures to handle this case.
#
-find ${bindir}/ -name "${tool}*[0-9]" | sed -E \
+/usr/bin/find ${bindir}/ -name "${tool}*[0-9]" | /usr/bin/sed -E \
-e "s@^.*/${tool}-([0-9])\\.([0-9]+)\$@\1 \2 -\1.\2@" \
-e "s@^.*/${tool}([0-9])([0-9]+)\$@\1 \2 \1\2@" | \
- sort -n -k1 | sort -n -s -k2 | {
+ /usr/bin/sort -n -k1 | /usr/bin/sort -n -s -k2 | {
while read maj min suffix ; do
selected_version="$maj$min"
selected_suffix=$suffix
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86hcjvk2io.fsf>