pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Remove '-' from the version part of _GCC_IN_USE so...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9ad6489e6ed
branches:  trunk
changeset: 463014:a9ad6489e6ed
user:      cube <cube%pkgsrc.org@localhost>
date:      Fri Oct 24 12:07:14 2003 +0000

description:
Remove '-' from the version part of _GCC_IN_USE  so that pkg_admin can deal
with the installed gcc when it has a localized version (such as our
gcc-3.3.2-nb1).

diffstat:

 mk/compiler.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 2393a5f1b179 -r a9ad6489e6ed mk/compiler.mk
--- a/mk/compiler.mk    Fri Oct 24 04:55:49 2003 +0000
+++ b/mk/compiler.mk    Fri Oct 24 12:07:14 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.21 2003/10/18 09:14:47 grant Exp $
+# $NetBSD: compiler.mk,v 1.22 2003/10/24 12:07:14 cube Exp $
 
 # This Makefile fragment implements handling for supported
 # C/C++/fortran compilers.
@@ -102,7 +102,7 @@
 GCC_REQD=              2.95.3
 _NEED_PKGSRC_GCC=      YES
 .    else
-_GCC_IN_USE=           gcc-${_CC_VERSION}
+_GCC_IN_USE=           gcc-${_CC_VERSION:S/-//g}
 _NEED_PKGSRC_GCC!=     \
        if ${PKG_ADMIN} pmatch '${_GCC_VERSION_REQD}' ${_GCC_IN_USE}; then \
                ${ECHO} "NO"; \



Home | Main Index | Thread Index | Old Index