[pkgsrc/trunk]: pkgsrc Now that no package uses USE_GCC_SHLIB any longer, rem...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Now that no package uses USE_GCC_SHLIB any longer, rem...
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:52:49 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/26584d72fa5b
branches:  trunk
changeset: 483962:26584d72fa5b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Nov 22 22:24:46 2004 +0000

description:
Now that no package uses USE_GCC_SHLIB any longer, remove support
for it from compiler.mk.

Move the variable of the same name used by compiler/gcc.mk and
the gcc* buildlink3 files into private namespace (_USE_GCC_SHLIB).

diffstat:

 lang/gcc/buildlink3.mk       |   4 ++--
 lang/gcc3-c++/buildlink3.mk  |   4 ++--
 lang/gcc3-c/buildlink3.mk    |   4 ++--
 lang/gcc3-f77/buildlink3.mk  |   4 ++--
 lang/gcc3-java/buildlink3.mk |   4 ++--
 lang/gcc3-objc/buildlink3.mk |   4 ++--
 lang/gcc34-ada/buildlink3.mk |   4 ++--
 lang/gcc34/buildlink3.mk     |   4 ++--
 mk/compiler.mk               |  15 +--------------
 mk/compiler/gcc.mk           |  14 +++++++-------
 10 files changed, 24 insertions(+), 37 deletions(-)

diffs (243 lines):

diff -r a052304737b2 -r 26584d72fa5b lang/gcc/buildlink3.mk
--- a/lang/gcc/buildlink3.mk    Mon Nov 22 22:19:35 2004 +0000
+++ b/lang/gcc/buildlink3.mk    Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/06/29 13:24:31 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/11/22 22:24:46 wiz Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC_BUILDLINK3_MK:=    ${GCC_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@
        ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.  if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc+=      full
 .  else
 BUILDLINK_DEPMETHOD.gcc?=      build
diff -r a052304737b2 -r 26584d72fa5b lang/gcc3-c++/buildlink3.mk
--- a/lang/gcc3-c++/buildlink3.mk       Mon Nov 22 22:19:35 2004 +0000
+++ b/lang/gcc3-c++/buildlink3.mk       Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/11/22 22:24:46 wiz Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GCC3_CXX_BUILDLINK3_MK:=       ${GCC3_CXX_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@
        lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.  if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-cxx+= full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-cxx?= build
diff -r a052304737b2 -r 26584d72fa5b lang/gcc3-c/buildlink3.mk
--- a/lang/gcc3-c/buildlink3.mk Mon Nov 22 22:19:35 2004 +0000
+++ b/lang/gcc3-c/buildlink3.mk Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/08/13 18:30:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/11/22 22:24:46 wiz Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC3_C_BUILDLINK3_MK:= ${GCC3_C_BUILDLINK3_MK}+
@@ -34,7 +34,7 @@
 BUILDLINK_LIBDIRS.gcc3-c?=     ${BUILDLINK_GCC3_LIBDIRS}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.  if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-c+=   full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-c?=   build
diff -r a052304737b2 -r 26584d72fa5b lang/gcc3-f77/buildlink3.mk
--- a/lang/gcc3-f77/buildlink3.mk       Mon Nov 22 22:19:35 2004 +0000
+++ b/lang/gcc3-f77/buildlink3.mk       Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/11/22 22:24:47 wiz Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GCC3_F77_BUILDLINK3_MK:=       ${GCC3_F77_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@
        lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.  if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-f77+= full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-f77?= build
diff -r a052304737b2 -r 26584d72fa5b lang/gcc3-java/buildlink3.mk
--- a/lang/gcc3-java/buildlink3.mk      Mon Nov 22 22:19:35 2004 +0000
+++ b/lang/gcc3-java/buildlink3.mk      Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/11/22 22:24:47 wiz Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GCC3_JAVA_BUILDLINK3_MK:=      ${GCC3_JAVA_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@
        lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-java}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.  if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-java+=        full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-java?=        build
diff -r a052304737b2 -r 26584d72fa5b lang/gcc3-objc/buildlink3.mk
--- a/lang/gcc3-objc/buildlink3.mk      Mon Nov 22 22:19:35 2004 +0000
+++ b/lang/gcc3-objc/buildlink3.mk      Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/11/22 22:24:47 wiz Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GCC3_OBJC_BUILDLINK3_MK:=      ${GCC3_OBJC_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@
        lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.  if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-objc+=        full
 .  else
 BUILDLINK_DEPMETHOD.gcc3-objc?=        build
diff -r a052304737b2 -r 26584d72fa5b lang/gcc34-ada/buildlink3.mk
--- a/lang/gcc34-ada/buildlink3.mk      Mon Nov 22 22:19:35 2004 +0000
+++ b/lang/gcc34-ada/buildlink3.mk      Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/08/01 10:20:30 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/11/22 22:24:47 wiz Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCCADA_BUILDLINK3_MK:= ${GCCADA_BUILDLINK3_MK}+
@@ -30,7 +30,7 @@
 BUILDLINK_TRANSFORM.gcc34-ada= -e s:\buildlink:buildlink/gcc34-ada:
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.  if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc34-ada?=        full
 .  else
 BUILDLINK_DEPMETHOD.gcc34-ada?=        build
diff -r a052304737b2 -r 26584d72fa5b lang/gcc34/buildlink3.mk
--- a/lang/gcc34/buildlink3.mk  Mon Nov 22 22:19:35 2004 +0000
+++ b/lang/gcc34/buildlink3.mk  Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/11/08 16:44:34 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/11/22 22:24:47 wiz Exp $
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
 GCC34_BUILDLINK3_MK:=  ${GCC34_BUILDLINK3_MK}+
@@ -37,7 +37,7 @@
 BUILDLINK_TRANSFORM.gcc34=     -e s:\buildlink:buildlink/gcc34:
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.  if defined(_USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc+=      full
 .  else
 BUILDLINK_DEPMETHOD.gcc?=      build
diff -r a052304737b2 -r 26584d72fa5b mk/compiler.mk
--- a/mk/compiler.mk    Mon Nov 22 22:19:35 2004 +0000
+++ b/mk/compiler.mk    Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.37 2004/11/20 04:37:08 grant Exp $
+# $NetBSD: compiler.mk,v 1.38 2004/11/22 22:24:47 wiz Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -40,9 +40,6 @@
 #      GCC_REQD instead of the native compiler.  Should only be set in
 #      /etc/mk.conf.
 #
-# USE_GCC_SHLIB
-#      Indicates that a package uses GCC shared libraries, so we
-#      register a runtime dependency on the compiler package.
 #
 # USE_LANGUAGES
 #      Lists the languages used in the source code of the package,
@@ -68,16 +65,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX Add this gross and completely inaccurate hack.  Packages that
-# XXX set USE_GCC_SHLIB should be adjusted to set USE_LANGUAGES
-# XXX correctly (most likely by saying it needs either "c++" or
-# XXX "c c++").  This is here for now so that ~85 packages won't
-# XXX suddenly break.
-#
-.if defined(USE_GCC_SHLIB)
-USE_LANGUAGES?=        c c++
-.endif
-
 # By default, assume that the package requires a C compiler.
 USE_LANGUAGES?=        c
 
diff -r a052304737b2 -r 26584d72fa5b mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Mon Nov 22 22:19:35 2004 +0000
+++ b/mk/compiler/gcc.mk        Mon Nov 22 22:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.73 2004/11/10 12:04:59 shannonjr Exp $
+# $NetBSD: gcc.mk,v 1.74 2004/11/22 22:24:47 wiz Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=       defined
@@ -159,7 +159,7 @@
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
         !empty(_LANGUAGES.gcc:Mfortran) || \
         !empty(_LANGUAGES.gcc:Mobjc)
-USE_GCC_SHLIB?=                yes
+_USE_GCC_SHLIB?=       yes
 .    endif
 .  endif
 .elif !empty(_NEED_GCC3:M[yY][eE][sS])
@@ -190,7 +190,7 @@
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
         !empty(_LANGUAGES.gcc:Mfortran) || \
         !empty(_LANGUAGES.gcc:Mobjc)
-USE_GCC_SHLIB?=                yes
+_USE_GCC_SHLIB?=       yes
 .    endif
 .  endif
 .endif
@@ -204,7 +204,7 @@
 .  if !defined(_IGNORE_GCC3CXX) && !empty(_LANGUAGES.gcc:Mc++)
 _GCC_PKGSRCDIR+=       ../../lang/gcc3-c++
 _GCC_DEPENDENCY+=      gcc3-c++>=${_GCC_REQD}:../../lang/gcc3-c++
-USE_GCC_SHLIB?=                yes
+_USE_GCC_SHLIB?=       yes
 .  endif
 .  if !empty(PKGPATH:Mlang/gcc3-f77)
 _IGNORE_GCC3F77=       yes
@@ -213,7 +213,7 @@
 .  if !defined(_IGNORE_GCC3F77) && !empty(_LANGUAGES.gcc:Mfortran)
 _GCC_PKGSRCDIR+=       ../../lang/gcc3-f77
 _GCC_DEPENDENCY+=      gcc3-f77>=${_GCC_REQD}:../../lang/gcc3-f77
-USE_GCC_SHLIB?=                yes
+_USE_GCC_SHLIB?=       yes
 .  endif
 .  if !empty(PKGPATH:Mlang/gcc3-objc)
 _IGNORE_GCC3OBJC=      yes
@@ -222,7 +222,7 @@
 .  if !defined(_IGNORE_GCC3OBJC) && !empty(_LANGUAGES.gcc:Mobjc)
 _GCC_PKGSRCDIR+=       ../../lang/gcc3-objc
 _GCC_DEPENDENCY+=      gcc3-objc>=${_GCC_REQD}:../../lang/gcc3-objc
-USE_GCC_SHLIB?=                yes
+_USE_GCC_SHLIB?=       yes
 .  endif
 .endif
 
@@ -403,7 +403,7 @@
 .      include "${_dir_}/buildlink3.mk"
 .    endfor
 .  else
-.    if defined(USE_GCC_SHLIB)
+.    if defined(_USE_GCC_SHLIB)
 DEPENDS+=      ${_GCC_DEPENDENCY}
 .    else
 BUILD_DEPENDS+=        ${_GCC_DEPENDENCY}
Prev by Date: [pkgsrc/trunk]: pkgsrc/www Remove apache6 -- there have been no updates since...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Removed apache6.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www Remove apache6 -- there have been no updates since...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Removed apache6.
Indexes:
Home | Main Index | Thread Index | Old Index