From owner-freebsd-ports@FreeBSD.ORG Sat Jul 5 17:55:12 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85A2F37B401 for ; Sat, 5 Jul 2003 17:55:12 -0700 (PDT) Received: from obsecurity.dyndns.org (adsl-64-169-104-32.dsl.lsan03.pacbell.net [64.169.104.32]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F79743FEC for ; Sat, 5 Jul 2003 17:55:11 -0700 (PDT) (envelope-from kris@obsecurity.org) Received: from rot13.obsecurity.org (rot13.obsecurity.org [10.0.0.5]) by obsecurity.dyndns.org (Postfix) with ESMTP id E9AD966CFA; Sat, 5 Jul 2003 17:55:08 -0700 (PDT) Received: by rot13.obsecurity.org (Postfix, from userid 1000) id 02EA8B77; Sat, 5 Jul 2003 17:55:08 -0700 (PDT) Date: Sat, 5 Jul 2003 17:55:08 -0700 From: Kris Kennaway To: Christian Weisgerber Message-ID: <20030706005508.GA8201@rot13.obsecurity.org> References: <200306190941.h5J9fIYL073911@repoman.freebsd.org> <20030619214555.GA34067@rot13.obsecurity.org> <20030620165635.GA53379@rot13.obsecurity.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="EVF5PPMfhYS0aIcm" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.1i cc: freebsd-ports@freebsd.org Subject: Re: config.guess (was: Re: cvs commit: ports/audio/libmikmod/files patch-config.sub) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2003 00:55:12 -0000 --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jun 21, 2003 at 12:00:16AM +0000, Christian Weisgerber wrote: > Kris Kennaway wrote: >=20 > > OK, I misunderstood the purpose of config.guess. This sounds like the > > right approach! >=20 > Fetch config.{guess,sub} from ftp://ftp.gnu.org/gnu/config/ and add > them to /usr/ports/Templates/. These still need editing for ia64 > and amd64. This patch works, but based on the initial amd64 package build with your patch in place there are quite a few ports out there that seem to require CONFIG_GUESS_DIRS. I wonder if it wouldn't be better to automatically replace all occurrences of config.{guess,sub} in the ${WRKSRC} tree. I haven't yet tested this on a full build: Kris Index: bsd.port.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /rot13/mnt2/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.454 diff -u -r1.454 bsd.port.mk --- bsd.port.mk 26 Jun 2003 22:58:21 -0000 1.454 +++ bsd.port.mk 6 Jul 2003 00:51:32 -0000 @@ -2794,6 +2794,16 @@ cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \ ${SCRIPTDIR}/configure; \ fi +.if defined(GNU_CONFIGURE) + @CONFIG_GUESS_DIRS=3D$$(${FIND} ${WRKSRC} -name config.guess -o -name con= fig.sub \ + | ${XARGS} -n 1 /usr/bin/dirname); \ + for _D in $${CONFIG_GUESS_DIRS}; do \ + ${CP} -f ${TEMPLATES}/config.guess $${_D}/config.guess; \ + ${CHMOD} a+rx $${_D}/config.guess; \ + ${CP} -f ${TEMPLATES}/config.sub $${_D}/config.sub; \ + ${CHMOD} a+rx $${_D}/config.sub; \ + done +.endif .if defined(HAS_CONFIGURE) @(cd ${CONFIGURE_WRKSRC} && \ if ! ${SETENV} CC=3D"${CC}" CXX=3D"${CXX}" \ --EVF5PPMfhYS0aIcm Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (FreeBSD) iD8DBQE/B3NsWry0BWjoQKURArmTAJ95PDc5BJNi9SEDFM0r9CHgLJdBkQCaAh+m iD6X9tlwcmGmClAbAAVc62s= =fnGj -----END PGP SIGNATURE----- --EVF5PPMfhYS0aIcm--