diff options
author | abs <abs> | 2004-03-17 00:26:55 +0000 |
---|---|---|
committer | abs <abs> | 2004-03-17 00:26:55 +0000 |
commit | 153603fed0524ca91e60eb361e7a759e21b8939d (patch) | |
tree | 6fd76d18529993929057840e038ce62820b9b4d5 | |
parent | e0c80712dd15c5cb7832996c4e6cfd36177c3d86 (diff) | |
download | pkgsrc-153603fed0524ca91e60eb361e7a759e21b8939d.tar.gz |
Update cpuflags to 0.63:
Make cpuflags ${PREFIX}-aware - based on patch from Karl Hammerschmidt
-rw-r--r-- | devel/cpuflags/Makefile | 18 | ||||
-rw-r--r-- | devel/cpuflags/files/cpuflags.1 | 22 | ||||
-rw-r--r-- | devel/cpuflags/files/cpuflags.mk | 6 | ||||
-rw-r--r-- | doc/CHANGES | 4 |
4 files changed, 30 insertions, 20 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index 22f1d3fa140..f0351f80ac3 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2004/02/20 00:37:46 dan Exp $ +# $NetBSD: Makefile,v 1.67 2004/03/17 00:26:55 abs Exp $ # -DISTNAME= cpuflags-0.62 +DISTNAME= cpuflags-0.63 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty @@ -15,12 +15,20 @@ EXTRACT_ONLY= # empty USE_LANGUAGES= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes -NO_BUILD= yes + +FILES_SUBST+= PREFIX="${PREFIX}" + +do-build: + ${MKDIR} ${WRKSRC} +.for FILE in cpuflags.1 cpuflags.mk + ${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/${FILE} \ + > ${WRKSRC}/${FILE} +.endfor do-install: ${INSTALL_SCRIPT} ${FILESDIR}/cpuflags.${OPSYS} ${PREFIX}/bin/cpuflags - ${INSTALL_DATA} ${FILESDIR}/cpuflags.mk ${PREFIX}/share/mk/cpuflags.mk ${INSTALL_DATA} ${FILESDIR}/optimize_gcc.mk ${PREFIX}/share/mk/optimize_gcc.mk - ${INSTALL_MAN} ${FILESDIR}/cpuflags.1 ${PREFIX}/man/man1/cpuflags.1 + ${INSTALL_DATA} ${WRKSRC}/cpuflags.mk ${PREFIX}/share/mk/cpuflags.mk + ${INSTALL_MAN} ${WRKSRC}/cpuflags.1 ${PREFIX}/man/man1/cpuflags.1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/cpuflags/files/cpuflags.1 b/devel/cpuflags/files/cpuflags.1 index fd78b015798..2c26bae8b06 100644 --- a/devel/cpuflags/files/cpuflags.1 +++ b/devel/cpuflags/files/cpuflags.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: cpuflags.1,v 1.12 2003/05/29 11:45:50 abs Exp $ +.\" $NetBSD: cpuflags.1,v 1.13 2004/03/17 00:26:55 abs Exp $ .Dd May 31, 2001 .Dt CPUFLAGS 1 .Os @@ -23,7 +23,7 @@ is not specified it defaults to the first found in the path. .Sh ENVIRONMENT The makefile fragment -.Pa /usr/pkg/share/mk/cpuflags.mk +.Pa @PREFIX@/share/mk/cpuflags.mk will set the following .Xr make 1 variables, plus add CPU_FLAGS and CPU_DIR to .MAKEFLAGS for sub-makes. @@ -39,12 +39,12 @@ Has CPU_FLAGS appended Has CPU_FLAGS appended .El .Sh FILES -.Bl -tag -width /usr/pkg/share/mk/optimize_gcc.mk -compact -.It /usr/pkg/share/mk/cpuflags.mk +.Bl -tag -width @PREFIX@/share/mk/optimize_gcc.mk -compact +.It @PREFIX@/share/mk/cpuflags.mk Set appropriate compiler flags based on the output from .Nm . Suitable for inclusion in /etc/mk.conf -.It /usr/pkg/share/mk/optimize_gcc.mk +.It @PREFIX@/share/mk/optimize_gcc.mk Attempt to set additional -mXXX gcc flags based on gcc version and packages being compiled. Note: This is experimental and not supported. .El @@ -56,7 +56,7 @@ and recompiling the kernel or userland by adding the following to .Pa /etc/mk.conf : .Bd -literal -offset indent - .sinclude "/usr/pkg/share/mk/cpuflags.mk" + .sinclude "@PREFIX@/share/mk/cpuflags.mk" .Ed .Pp Those desiring further optimisation can install the lang/gcc3 package, and @@ -64,17 +64,17 @@ add the following to .Pa /etc/mk.conf instead: .Bd -literal -offset indent - .sinclude "/usr/pkg/share/examples/gcc/mk.conf" - .sinclude "/usr/pkg/share/mk/cpuflags.mk" + .sinclude "@PREFIX@/share/examples/gcc/mk.conf" + .sinclude "@PREFIX@/share/mk/cpuflags.mk" .Ed .Pp To experiment with optimisations that can break generated code there is optimize_gcc.mk. This is unsupported, but for full effect add the following to .Pa /etc/mk.conf : .Bd -literal -offset indent - .sinclude "/usr/pkg/share/examples/gcc/mk.conf" - .sinclude "/usr/pkg/share/mk/cpuflags.mk" - .sinclude "/usr/pkg/share/mk/optimize_gcc.mk" + .sinclude "@PREFIX@/share/examples/gcc/mk.conf" + .sinclude "@PREFIX@/share/mk/cpuflags.mk" + .sinclude "@PREFIX@/share/mk/optimize_gcc.mk" .Ed .Pp On all except low memory machines compliation can be speeded up by adding the diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk index 5ab5c7539a2..76ea0195a9f 100644 --- a/devel/cpuflags/files/cpuflags.mk +++ b/devel/cpuflags/files/cpuflags.mk @@ -1,4 +1,4 @@ -# $Id: cpuflags.mk,v 1.14 2004/02/06 19:04:24 jlam Exp $ +# $Id: cpuflags.mk,v 1.15 2004/03/17 00:26:55 abs Exp $ # Makefile include fragment to simplify use of cpuflags in pkgsrc # abs@netbsd.org - freely distributable, no warrenties, stick no bills. @@ -14,9 +14,9 @@ .ifndef CPU_FLAGS . if defined(BSD_PKG_MK) || ${USETOOLS:Uyes} == "no" -CPU_FLAGS!=/usr/pkg/bin/cpuflags ${CC} +CPU_FLAGS!=@PREFIX@/bin/cpuflags ${CC} . else -CPU_FLAGS!=/usr/pkg/bin/cpuflags +CPU_FLAGS!=@PREFIX@/bin/cpuflags . endif .endif diff --git a/doc/CHANGES b/doc/CHANGES index 337163e0422..bef1cbfa13d 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.5269 2004/03/16 23:56:15 minskim Exp $ +$NetBSD: CHANGES,v 1.5270 2004/03/17 00:27:32 abs Exp $ Changes to the packages collection and infrastructure in 2004: @@ -1477,3 +1477,5 @@ Changes to the packages collection and infrastructure in 2004: Removed mew-xemacs [uebayasi 2004-03-16] Updated tk-Tix-8.2.0b1nb1 [minskim 2004-03-16] Updated ruby-tcltklib to 1.6.8nb3 [minskim 2004-03-16] + Updated cpuflags to 0.63 [abs 2004-03-17] + |