diff options
| author | abs <abs> | 2002-01-03 11:54:47 +0000 |
|---|---|---|
| committer | abs <abs> | 2002-01-03 11:54:47 +0000 |
| commit | 928ea389cac99204359f1b41103b485650d3916f (patch) | |
| tree | 2aa13608042d18598c87b657e69ee686e857e698 /devel/cpuflags | |
| parent | 7300ded9e41b661f90eec90e11a4794bcf807b62 (diff) | |
| download | pkgsrc-928ea389cac99204359f1b41103b485650d3916f.tar.gz | |
Updated cpuflags to 0.17
Update MAKE_FLAGS so we can affect imake using packages
Diffstat (limited to 'devel/cpuflags')
| -rw-r--r-- | devel/cpuflags/Makefile | 4 | ||||
| -rw-r--r-- | devel/cpuflags/files/cpuflags.1 | 8 | ||||
| -rw-r--r-- | devel/cpuflags/files/cpuflags.mk | 13 |
3 files changed, 15 insertions, 10 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index 6d291b876d9..9768d2bab9d 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2002/01/01 17:01:26 abs Exp $ +# $NetBSD: Makefile,v 1.17 2002/01/03 11:54:47 abs Exp $ # -DISTNAME= cpuflags-0.16 +DISTNAME= cpuflags-0.17 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/cpuflags.1 b/devel/cpuflags/files/cpuflags.1 index 61bf0cab9b7..ce29546fc34 100644 --- a/devel/cpuflags/files/cpuflags.1 +++ b/devel/cpuflags/files/cpuflags.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: cpuflags.1,v 1.5 2001/12/24 13:25:47 abs Exp $ +.\" $NetBSD: cpuflags.1,v 1.6 2002/01/03 11:54:47 abs Exp $ .Dd May 31, 2001 .Dt CPUFLAGS 1 .Os @@ -19,7 +19,8 @@ The makefile fragment .Pa /usr/pkg/share/mk/cpuflags.mk will set the following .Xr make 1 -variables. The first two are explicitly added to MAKE_ENV. +variables. The first two are explicitly added to MAKE_ENV, while MAKE_FLAGS +will have CCOPTIONS=${CPU_FLAGS} .Bl -tag -width CPU_FLAGS -compact .It .It CPU_FLAGS @@ -49,8 +50,7 @@ kernel or userland by adding the following to /etc/mk.conf. .Ed .Sh BUGS .Nm -does not know about many cpu types yet - updates welcomed to <abs@netbsd.org>, -and does not affect packages using imake. +does not know about many cpu types yet - updates welcomed to <abs@netbsd.org>. .Pp Currently .Nm diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk index d332b4a0edb..2b3aaa37b98 100644 --- a/devel/cpuflags/files/cpuflags.mk +++ b/devel/cpuflags/files/cpuflags.mk @@ -1,9 +1,9 @@ -# $Id: cpuflags.mk,v 1.2 2001/12/24 13:25:47 abs Exp $ +# $Id: cpuflags.mk,v 1.3 2002/01/03 11:54:47 abs Exp $ # Makefile include fragment to simplify use of cpuflags in pkgsrc # abs@netbsd.org - freely distributable, no warrenties, stick no bills. # Try to optimise based on CPU -# Does not affect Imakefiles, and any package that overrides CFLAGS/CXXFLAGS +# Does not affect any package that overrides CFLAGS/CXXFLAGS/CCOPTIONS # Sets five variables: # # CPU_FLAGS The output of cpuflags @@ -12,13 +12,18 @@ # # CPU_DIR CPU_FLAGS with spaces stripped (eg: for use in PACKAGES) # LOWER_CPU_DIR As CPU_FLAGS but all lower case -# + .if ! defined(CPU_FLAGS) CPU_FLAGS!=/usr/pkg/bin/cpuflags CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //' LOWER_CPU_DIR!=echo ${CPU_DIR} | tr A-Z a-z -MAKE_ENV+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR=${CPU_DIR} CFLAGS+=${CPU_FLAGS} CXXFLAGS+=${CPU_FLAGS} + +# Make the flags available to make +MAKE_ENV+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR=${CPU_DIR} + +# Override CCOPTIONS for imake +MAKE_FLAGS+=CCOPTIONS=${CPU_FLAGS} .endif |