[pkgsrc/trunk]: pkgsrc Move the INCOMPAT_FOO checks to a more natural locatio...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Move the INCOMPAT_FOO checks to a more natural locatio...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:31:26 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1f6630e35d64
branches:  trunk
changeset: 468228:1f6630e35d64
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Feb 11 11:30:49 2004 +0000

description:
Move the INCOMPAT_FOO checks to a more natural location within the
block that decides whether package FOO is built-in or not.  If the
platform is listed in IMCOMPAT_FOO, then treat FOO as being not
built-in.

diffstat:

 archivers/bzip2/buildlink3.mk     |  23 +++++++++----------
 converters/libiconv/buildlink3.mk |  15 +++++------
 devel/binutils/buildlink3.mk      |  38 ++++++++++++++++----------------
 devel/gettext-lib/buildlink3.mk   |  28 +++++++++++-----------
 devel/ncurses/buildlink3.mk       |  46 +++++++++++++++++++-------------------
 devel/readline/buildlink3.mk      |  27 +++++++++++-----------
 6 files changed, 87 insertions(+), 90 deletions(-)

diffs (truncated from 306 to 300 lines):

diff -r d8ab4c97dcc7 -r 1f6630e35d64 archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk     Wed Feb 11 10:57:46 2004 +0000
+++ b/archivers/bzip2/buildlink3.mk     Wed Feb 11 11:30:49 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/11 11:30:49 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 BZIP2_BUILDLINK3_MK:=  ${BZIP2_BUILDLINK3_MK}+
@@ -23,6 +23,16 @@
                ${ECHO} "NO";                                           \
        fi
 .  endif
+#
+# Solaris 9 has bzip2 1.0.1, build it on older versions.
+# Darwin only has static libbz2.a, which can't be buildlinked.
+#
+_INCOMPAT_BZIP2?=      SunOS-5.[678]-* Darwin-*
+.  for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2}
+.    if !empty(MACHINE_PLATFORM:M${_pattern_})
+BUILDLINK_IS_BUILTIN.bzip2=    NO
+.    endif
+.  endfor
 MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.bzip2=${BUILDLINK_IS_BUILTIN.bzip2}
 .endif
 
@@ -44,17 +54,6 @@
 BUILDLINK_USE_BUILTIN.bzip2=   NO
 .  else
 BUILDLINK_USE_BUILTIN.bzip2=   YES
-#
-# Solaris 9 has bzip2 1.0.1, build it on older versions.
-# Darwin only has static libbz2.a, which can't be buildlinked.
-#
-_INCOMPAT_BZIP2=       SunOS-5.[678]-* Darwin-*
-INCOMPAT_BZIP2?=       # empty
-.    for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2}
-.      if !empty(MACHINE_PLATFORM:M${_pattern_})
-BUILDLINK_USE_BUILTIN.bzip2=   NO
-.      endif
-.    endfor
 .  endif
 MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.bzip2=${BUILDLINK_USE_BUILTIN.bzip2}
 .endif
diff -r d8ab4c97dcc7 -r 1f6630e35d64 converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Wed Feb 11 10:57:46 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Wed Feb 11 11:30:49 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/11 11:30:49 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=  ${ICONV_BUILDLINK3_MK}+
@@ -18,6 +18,12 @@
 .  if exists(/usr/include/iconv.h)
 BUILDLINK_IS_BUILTIN.iconv=    YES
 .  endif
+_INCOMPAT_ICONV?=      # should be set from defs.${OPSYS}.mk
+.  for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV}
+.    if !empty(MACHINE_PLATFORM:M${_pattern_})
+BUILDLINK_IS_BUILTIN.iconv=    NO
+.    endif
+.  endfor
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -38,13 +44,6 @@
 BUILDLINK_USE_BUILTIN.iconv=   NO
 .  else
 BUILDLINK_USE_BUILTIN.iconv=   YES
-_INCOMPAT_ICONV?=      # should be set from defs.${OPSYS}.mk
-INCOMPAT_ICONV?=       # empty
-.    for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV}
-.      if !empty(MACHINE_PLATFORM:M${_pattern_})
-BUILDLINK_USE_BUILTIN.iconv=   NO
-.      endif
-.    endfor
 .  endif
 MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.iconv=${BUILDLINK_USE_BUILTIN.iconv}
 .endif
diff -r d8ab4c97dcc7 -r 1f6630e35d64 devel/binutils/buildlink3.mk
--- a/devel/binutils/buildlink3.mk      Wed Feb 11 10:57:46 2004 +0000
+++ b/devel/binutils/buildlink3.mk      Wed Feb 11 11:30:49 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/06 19:04:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/11 11:30:49 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=       ${BINUTILS_BUILDLINK3_MK}+
@@ -16,6 +16,23 @@
 
 .if !defined(BUILDLINK_IS_BUILTIN.binutils)
 BUILDLINK_IS_BUILTIN.binutils= YES
+#
+# These versions of NetBSD didn't have a toolchain that was capable of
+# replacing binutils.
+#
+_INCOMPAT_BINUTILS=    NetBSD-0.*-* NetBSD-1.[01234]*-*
+_INCOMPAT_BINUTILS+=   NetBSD-1.5.*-* NetBSD-1.5[A-X]-*
+#
+# XXX: _INCOMPAT_BINUTILS settings for other operating systems possibly
+# XXX: needed here
+#
+INCOMPAT_BINUTILS?=       # empty
+.  for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
+.    if !empty(MACHINE_PLATFORM:M${_pattern_})
+BUILDLINK_IS_BUILTIN.binutils= NO
+.    endif
+.  endfor
+MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.binutils=${BUILDLINK_IS_BUILTIN.binutils}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -36,25 +53,8 @@
 BUILDLINK_USE_BUILTIN.binutils=        NO
 .  else
 BUILDLINK_USE_BUILTIN.binutils=        YES
-#
-# These versions of NetBSD didn't have a toolchain that was capable of
-# replacing binutils.
-#
-_INCOMPAT_BINUTILS=    NetBSD-0.*-* NetBSD-1.[01234]*-*
-_INCOMPAT_BINUTILS+=   NetBSD-1.5.*-* NetBSD-1.5[A-X]-*
-#
-# XXX: _INCOMPAT_BINUTILS settings for other operating systems possibly
-# XXX: needed here
-#
-INCOMPAT_BINUTILS?=       # empty
-.    for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
-.      if !empty(MACHINE_PLATFORM:M${_pattern_})
-BUILDLINK_USE_BUILTIN.binutils=        NO
-.      endif
-.    endfor
 .  endif
-MAKEFLAGS+=    \
-       BUILDLINK_USE_BUILTIN.binutils=${BUILDLINK_USE_BUILTIN.binutils}
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.binutils=${BUILDLINK_USE_BUILTIN.binutils}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
diff -r d8ab4c97dcc7 -r 1f6630e35d64 devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Wed Feb 11 10:57:46 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Wed Feb 11 11:30:49 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/06 19:04:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/02/11 11:30:49 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=        ${GETTEXT_BUILDLINK3_MK}+
@@ -18,6 +18,18 @@
 .  if exists(/usr/include/libintl.h)
 BUILDLINK_IS_BUILTIN.gettext=  YES
 .  endif
+#
+# The listed platforms have a broken (for the purposes of pkgsrc) version
+# of gettext-lib.  
+#
+_INCOMPAT_GETTEXT=     SunOS-*-*
+INCOMPAT_GETTEXT?=     # empty
+.  for _pattern_ in ${_INCOMPAT_GETTEXT} ${INCOMPAT_GETTEXT}
+.    if !empty(MACHINE_PLATFORM:M${_pattern_})
+BUILDLINK_IS_BUILTIN.gettext=  NO
+.    endif
+.  endfor
+MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.gettext=${BUILDLINK_IS_BUILTIN.gettext}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -52,20 +64,8 @@
        fi
 .      endif
 .    endfor
-#
-# The listed platforms have a broken (for the purposes of pkgsrc) version
-# of gettext-lib.  
-#
-_INCOMPAT_GETTEXT=     SunOS-*-*
-INCOMPAT_GETTEXT?=     # empty
-.    for _pattern_ in ${_INCOMPAT_GETTEXT} ${INCOMPAT_GETTEXT}
-.      if !empty(MACHINE_PLATFORM:M${_pattern_})
-BUILDLINK_USE_BUILTIN.gettext= NO
-.      endif
-.    endfor
 .  endif
-MAKEFLAGS+=    \
-       BUILDLINK_USE_BUILTIN.gettext=${BUILDLINK_USE_BUILTIN.gettext}
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.gettext=${BUILDLINK_USE_BUILTIN.gettext}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO])
diff -r d8ab4c97dcc7 -r 1f6630e35d64 devel/ncurses/buildlink3.mk
--- a/devel/ncurses/buildlink3.mk       Wed Feb 11 10:57:46 2004 +0000
+++ b/devel/ncurses/buildlink3.mk       Wed Feb 11 11:30:49 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2004/02/11 11:30:50 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=        ${NCURSES_BUILDLINK3_MK}+
@@ -37,6 +37,28 @@
                ${ECHO} "NO";                                           \
        fi
 .  endif
+#
+# XXX By default, assume that the builtin curses on NetBSD systems
+# XXX supports ncurses.
+#
+.  if ${OPSYS} == "NetBSD"
+BUILDLINK_USE_BUILTIN.ncurses= YES
+#
+# These versions of NetBSD didn't have a curses library that was
+# capable of replacing ncurses.
+#
+# XXX In reality, no version of NetBSD has a curses library that can
+# XXX completely replace ncurses; however, some version implement
+# XXX enough of ncurses that some packages are happy.
+#
+_INCOMPAT_CURSES=      NetBSD-0.*-* NetBSD-1.[0123]*-*
+_INCOMPAT_CURSES+=     NetBSD-1.4.*-* NetBSD-1.4[A-X]-*
+.    for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
+.      if !empty(MACHINE_PLATFORM:M${_pattern_})
+BUILDLINK_IS_BUILTIN.ncurses=  NO
+.      endif
+.    endfor
+.  endif
 MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses}
 .endif
 
@@ -56,28 +78,6 @@
 .if !defined(BUILDLINK_USE_BUILTIN.ncurses)
 .  if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[nN][oO])
 BUILDLINK_USE_BUILTIN.ncurses= NO
-#
-# XXX By default, assume that the builtin curses on NetBSD systems
-# XXX supports ncurses.
-#
-.    if ${OPSYS} == "NetBSD"
-BUILDLINK_USE_BUILTIN.ncurses= YES
-#
-# These versions of NetBSD didn't have a curses library that was
-# capable of replacing ncurses.
-#
-# XXX In reality, no version of NetBSD has a curses library that can
-# XXX completely replace ncurses; however, some version implement
-# XXX enough of ncurses that some packages are happy.
-#
-_INCOMPAT_CURSES=      NetBSD-0.*-* NetBSD-1.[0123]*-*
-_INCOMPAT_CURSES+=     NetBSD-1.4.*-* NetBSD-1.4[A-X]-*
-.      for _pattern_ in ${_INCOMPAT_CURSES}
-.        if !empty(MACHINE_PLATFORM:M${_pattern_})
-BUILDLINK_USE_BUILTIN.ncurses= NO
-.        endif
-.      endfor
-.    endif
 .  else
 BUILDLINK_USE_BUILTIN.ncurses= YES
 #
diff -r d8ab4c97dcc7 -r 1f6630e35d64 devel/readline/buildlink3.mk
--- a/devel/readline/buildlink3.mk      Wed Feb 11 10:57:46 2004 +0000
+++ b/devel/readline/buildlink3.mk      Wed Feb 11 11:30:49 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/11 11:30:50 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -24,6 +24,17 @@
       exists(/usr/include/readline/readline.h)
 BUILDLINK_IS_BUILTIN.readline= YES
 .  endif
+#
+# These catch-alls are probably too broad, but better to err on the safe
+# side.  We can narrow down the match when we have better information.
+#
+_INCOMPAT_READLINE?=   SunOS-*-*
+.  for _pattern_ in ${_INCOMPAT_READLINE} ${INCOMPAT_READLINE}
+.    if !empty(MACHINE_PLATFORM:M${_pattern_})
+BUILDLINK_IS_BUILTIN.readline= NO
+.    endif
+.  endfor
+MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.readline=${BUILDLINK_IS_BUILTIN.readline}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -44,20 +55,8 @@
 BUILDLINK_USE_BUILTIN.readline=        NO
 .  else
 BUILDLINK_USE_BUILTIN.readline=        YES
-#
-# These catch-alls are probably too broad, but better to err on the safe
-# side.  We can narrow down the match when we have better information.
-#
-_INCOMPAT_READLINE=    SunOS-*-*
-INCOMPAT_READLINE?=    # empty
-.    for _pattern_ in ${_INCOMPAT_READLINE} ${INCOMPAT_READLINE}
-.      if !empty(MACHINE_PLATFORM:M${_pattern_})
-BUILDLINK_USE_BUILTIN.readline=        NO
-.      endif
-.    endfor
 .  endif
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Add wxmozilla as suggested new package.
Next by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install pass OPSYS and MACHINE_ARCH in th...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Add wxmozilla as suggested new package.
Next by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install pass OPSYS and MACHINE_ARCH in th...
Indexes:
Home | Main Index | Thread Index | Old Index