pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk sync comments with reality.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e03dc6e4ca6
branches:  trunk
changeset: 462217:7e03dc6e4ca6
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Sep 28 09:53:56 2003 +0000

description:
sync comments with reality.

note once again that USE_GCC2/USE_GCC3 must not be defined in package
Makefiles. also note CC_VERSION and provide a usage example.

diffstat:

 mk/compiler.mk |  26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r a9289f52abd3 -r 7e03dc6e4ca6 mk/compiler.mk
--- a/mk/compiler.mk    Sun Sep 28 09:48:00 2003 +0000
+++ b/mk/compiler.mk    Sun Sep 28 09:53:56 2003 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: compiler.mk,v 1.14 2003/09/28 09:48:00 grant Exp $
+# $NetBSD: compiler.mk,v 1.15 2003/09/28 09:53:56 grant Exp $
 
 # This Makefile fragment implements handling for supported
 # C/C++/fortran compilers.
 #
 # This file should NOT be included from pkg Makefiles, as it is
-# automatically included by bsd.pkg.mk.
+# automatically included by bsd.prefs.mk.
 #
 # The following variables are used:
 #
@@ -23,12 +23,12 @@
 #      register a runtime dependency on the compiler package.
 #
 # USE_GCC2
-#      Use pkgsrc gcc2 from lang/gcc. This overrides any GCC_REQD
-#      setting.
+#      Always use pkgsrc gcc2 from lang/gcc. This overrides any
+#      GCC_REQD setting. Must NOT be set in package Makefiles.
 #
 # USE_GCC3
-#      Use pkgsrc gcc3 from lang/gcc3. This overrides any GCC_REQD
-#      setting.
+#      Always use pkgsrc gcc3 from lang/gcc3. This overrides any
+#      GCC_REQD setting. Must NOT be set in package Makefiles.
 #
 # USE_PKGSRC_GCC
 #      Use the appropriate version of GCC from pkgsrc based on
@@ -41,6 +41,20 @@
 # USE_MIPSPRO
 #      Use the Silicon Graphics, Inc. MIPSpro compiler.
 #
+# The following variables are defined, and available for testing in
+# package Makefiles:
+#
+# CC_VERSION
+#      The compiler and version being used. For gcc, this is
+#      'gcc-<version>' and (currently) empty for other compilers.
+#
+#      e.g.
+#              .include "../../mk/bsd.prefs.mk"
+#
+#              .if !empty(CC_VERSION:Mgcc-3*)
+#              ...
+#              .endif
+#
 
 .if !defined(COMPILER_MK)
 COMPILER_MK=   # defined



Home | Main Index | Thread Index | Old Index