[pkgsrc/trunk]: pkgsrc We no longer need to explicitly call ${BUILDLINK_*} fo...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc We no longer need to explicitly call ${BUILDLINK_*} fo...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:29:49 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a283691bc381
branches:  trunk
changeset: 467907:a283691bc381
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Feb 08 04:03:14 2004 +0000

description:
We no longer need to explicitly call ${BUILDLINK_*} for CC, CXX, LIBTOOL,
etc. because the bare variables will point to the correct executables.

diffstat:

 archivers/bicom/Makefile     |   6 +++---
 archivers/bunzip/Makefile    |   4 ++--
 archivers/bzip2/Makefile     |   4 ++--
 archivers/ppunpack/Makefile  |   4 ++--
 archivers/undms/Makefile     |   4 ++--
 archivers/unlzx/Makefile     |   4 ++--
 archivers/xbin/Makefile      |   4 ++--
 editors/pico/Makefile        |   4 ++--
 games/bridge-hands/Makefile  |   4 ++--
 graphics/gimp-base/Makefile  |   4 ++--
 graphics/png/Makefile        |   4 ++--
 lang/f2c/buildlink2.mk       |  10 +++++-----
 lang/nawk/Makefile           |   4 ++--
 mail/elm/Makefile            |   4 ++--
 mail/pine/Makefile           |   4 ++--
 pkgtools/rpm2pkg/Makefile    |   4 ++--
 wm/wm2/Makefile              |   4 ++--
 x11/qt3-libs/Makefile.common |   8 ++++----
 18 files changed, 42 insertions(+), 42 deletions(-)

diffs (truncated from 340 to 300 lines):

diff -r abb6fbe34492 -r a283691bc381 archivers/bicom/Makefile
--- a/archivers/bicom/Makefile  Sun Feb 08 03:50:43 2004 +0000
+++ b/archivers/bicom/Makefile  Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/08 04:03:14 jlam Exp $
 #
 
 DISTNAME=              bicom101
@@ -21,12 +21,12 @@
        for i in bialib bicom; do                                       \
                cd ${WRKSRC}/$$i &&                                     \
                for file in *.cpp; do                                   \
-                       ${BUILDLINK_CXX} ${CXXFLAGS} -I./ -I../bialib   \
+                       ${CXX} ${CXXFLAGS} -I./ -I../bialib             \
                                -c $$file;                              \
                done;                                                   \
        done
        cd ${WRKSRC}/bicom &&                                           \
-               ${BUILDLINK_CXX} ${CXXFLAGS} ${LDFLAGS}                 \
+               ${CXX} ${CXXFLAGS} ${LDFLAGS}                           \
                        -o bicom *.o ../bialib/*.o
 
 do-install:
diff -r abb6fbe34492 -r a283691bc381 archivers/bunzip/Makefile
--- a/archivers/bunzip/Makefile Sun Feb 08 03:50:43 2004 +0000
+++ b/archivers/bunzip/Makefile Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=      bunzip021.c
 PKGNAME=       bunzip-0.21
@@ -14,7 +14,7 @@
 USE_BUILDLINK2=        # defined
 
 do-build:
-       cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o bunzip ${DISTNAME}
+       cd ${WRKSRC} && ${CC} ${CFLAGS} -o bunzip ${DISTNAME}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/bunzip ${PREFIX}/bin/bunzip
diff -r abb6fbe34492 -r a283691bc381 archivers/bzip2/Makefile
--- a/archivers/bzip2/Makefile  Sun Feb 08 03:50:43 2004 +0000
+++ b/archivers/bzip2/Makefile  Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/02/08 03:00:29 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/08 04:03:15 jlam Exp $
 #
 
 DISTNAME=      bzip2-1.0.2
@@ -13,7 +13,7 @@
 
 USE_BUILDLINK3=                yes
 USE_LIBTOOL=           yes
-MAKE_ENV+=             REALCC="${BUILDLINK_CC}"
+MAKE_ENV+=             REALCC="${CC}"
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r abb6fbe34492 -r a283691bc381 archivers/ppunpack/Makefile
--- a/archivers/ppunpack/Makefile       Sun Feb 08 03:50:43 2004 +0000
+++ b/archivers/ppunpack/Makefile       Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=      ppsmall-1.0
 PKGNAME=       ppunpack-1.0
@@ -13,7 +13,7 @@
 WRKSRC=                ${WRKDIR}/PPUnpack
 USE_BUILDLINK2=        # defined
 
-MAKE_FLAGS=    CC="${BUILDLINK_CC}" COPTS="${CFLAGS}"
+MAKE_FLAGS=    CC="${CC}" COPTS="${CFLAGS}"
 ALL_TARGET=    ppunpack
 LICENSE=       no-commercial-use
 
diff -r abb6fbe34492 -r a283691bc381 archivers/undms/Makefile
--- a/archivers/undms/Makefile  Sun Feb 08 03:50:43 2004 +0000
+++ b/archivers/undms/Makefile  Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=      undms-1.3.c
 PKGNAME=       undms-1.3
@@ -14,7 +14,7 @@
 USE_BUILDLINK2=        # defined
 
 do-build:
-       cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o undms undms-1.3.c
+       cd ${WRKSRC} && ${CC} ${CFLAGS} -o undms undms-1.3.c
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/undms ${PREFIX}/bin/
diff -r abb6fbe34492 -r a283691bc381 archivers/unlzx/Makefile
--- a/archivers/unlzx/Makefile  Sun Feb 08 03:50:43 2004 +0000
+++ b/archivers/unlzx/Makefile  Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=      unlzx.c
 PKGNAME=       unlzx-1.1
@@ -14,7 +14,7 @@
 USE_BUILDLINK2=        # defined
 
 do-build:
-       cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o unlzx unlzx.c
+       cd ${WRKSRC} && ${CC} ${CFLAGS} -o unlzx unlzx.c
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/unlzx ${PREFIX}/bin
diff -r abb6fbe34492 -r a283691bc381 archivers/xbin/Makefile
--- a/archivers/xbin/Makefile   Sun Feb 08 03:50:43 2004 +0000
+++ b/archivers/xbin/Makefile   Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/08 04:03:15 jlam Exp $
 #
 
 DISTNAME=      ${PRGNAME}unix
@@ -27,7 +27,7 @@
 
 do-build:
        cd ${WRKSRC} && \
-       ${BUILDLINK_CC} ${CFLAGS} -DBSD -o ${PRGNAME} ${DISTNAME}.c -lcompat
+       ${CC} ${CFLAGS} -DBSD -o ${PRGNAME} ${DISTNAME}.c -lcompat
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/${PRGNAME} ${PREFIX}/bin
diff -r abb6fbe34492 -r a283691bc381 editors/pico/Makefile
--- a/editors/pico/Makefile     Sun Feb 08 03:50:43 2004 +0000
+++ b/editors/pico/Makefile     Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2004/02/08 03:00:29 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=      pine4.58
 PKGNAME=       pico-4.6
@@ -33,7 +33,7 @@
 do-build:
        cd ${WRKSRC} && \
        ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \
-         CC="${LIBTOOL} ${BUILDLINK_CC}" \
+         CC="${LIBTOOL} ${CC}" \
          PREFIX=${PREFIX} OPTIMIZE="${CFLAGS}"
 
 do-install:
diff -r abb6fbe34492 -r a283691bc381 games/bridge-hands/Makefile
--- a/games/bridge-hands/Makefile       Sun Feb 08 03:50:43 2004 +0000
+++ b/games/bridge-hands/Makefile       Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:39 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=      hands-2.0.bsd386
 PKGNAME=       bridge-hands-2.0
@@ -15,7 +15,7 @@
 USE_BUILDLINK2=                # defined
 
 do-build:
-       cd ${WRKSRC}; ${BUILDLINK_CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}  \
+       cd ${WRKSRC}; ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}            \
                -o hands hands.c ${LIBS}
 
 do-install:
diff -r abb6fbe34492 -r a283691bc381 graphics/gimp-base/Makefile
--- a/graphics/gimp-base/Makefile       Sun Feb 08 03:50:43 2004 +0000
+++ b/graphics/gimp-base/Makefile       Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/08 04:03:15 jlam Exp $
 #
 
 DISTNAME=              gimp-1.2.5
@@ -64,7 +64,7 @@
 
 pre-build:
        cd ${WRKSRC} &&                                                 \
-       ${BUILDLINK_CC} -o ${WRKSRC}/docs/pdb_self_doc                  \
+       ${CC} -o ${WRKSRC}/docs/pdb_self_doc                            \
                ${FILESDIR}/pdb_self_doc.c
 
 post-install:
diff -r abb6fbe34492 -r a283691bc381 graphics/png/Makefile
--- a/graphics/png/Makefile     Sun Feb 08 03:50:43 2004 +0000
+++ b/graphics/png/Makefile     Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2004/01/15 21:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2004/02/08 04:03:15 jlam Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
@@ -27,7 +27,7 @@
 LIBPNG_SO_MINOR=       1
 
 MAKEFILE=      scripts/makefile.std
-MAKE_ENV+=     REALCC="${BUILDLINK_CC}"
+MAKE_ENV+=     REALCC="${CC}"
 MAKE_ENV+=     LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR}
 MAKE_ENV+=     LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR}
 PLIST_SUBST+=  LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR}
diff -r abb6fbe34492 -r a283691bc381 lang/f2c/buildlink2.mk
--- a/lang/f2c/buildlink2.mk    Sun Feb 08 03:50:43 2004 +0000
+++ b/lang/f2c/buildlink2.mk    Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/08/27 17:31:58 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/08 04:03:15 jlam Exp $
 
 .if !defined(F2C_BUILDLINK2_MK)
 F2C_BUILDLINK2_MK=     # defined
@@ -27,10 +27,10 @@
 # The f2c-f77 script takes some environment variables to override hardcoded
 # values for the compiler and C preprocessor.
 #
-CONFIGURE_ENV+=                CC_f2c="${BUILDLINK_CC}"
-CONFIGURE_ENV+=                CPP="${BUILDLINK_CPP}"
-MAKE_ENV+=             CC_f2c="${BUILDLINK_CC}"
-MAKE_ENV+=             CPP="${BUILDLINK_CPP}"
+CONFIGURE_ENV+=                CC_f2c="${CC}"
+CONFIGURE_ENV+=                CPP="${CPP}"
+MAKE_ENV+=             CC_f2c="${CC}"
+MAKE_ENV+=             CPP="${CPP}"
 
 f2c-buildlink: _BUILDLINK_USE
 
diff -r abb6fbe34492 -r a283691bc381 lang/nawk/Makefile
--- a/lang/nawk/Makefile        Sun Feb 08 03:50:43 2004 +0000
+++ b/lang/nawk/Makefile        Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/08 04:03:15 jlam Exp $
 #
 
 DISTNAME=       awk
@@ -17,7 +17,7 @@
 
 USE_BUILDLINK3=        yes
 MAKEFILE=      makefile
-MAKE_FLAGS+=   CC=${BUILDLINK_CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=   CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
 ALL_TARGET=    a.out
 
 INSTALLATION_DIRS=     bin man/man1
diff -r abb6fbe34492 -r a283691bc381 mail/elm/Makefile
--- a/mail/elm/Makefile Sun Feb 08 03:50:43 2004 +0000
+++ b/mail/elm/Makefile Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 21:45:54 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=              elm2.5.5
 PKGREVISION=           2
@@ -26,7 +26,7 @@
                ${WRKSRC}/config.sh.orig > ${WRKSRC}/config.sh.tmp
        ${SED} -e 's:LOCALBASE:'${LOCALBASE}':g' \
                ${WRKSRC}/config.sh.tmp > ${WRKSRC}/config.sh.tmp2
-       ${SED} -e 's:@CC@:'${BUILDLINK_CC}':g' \
+       ${SED} -e 's:@CC@:'${CC}':g' \
                ${WRKSRC}/config.sh.tmp2 > ${WRKSRC}/config.sh
        ${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
        ${SED} -e 's:__PREFIX:'${PREFIX}':g' < ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
diff -r abb6fbe34492 -r a283691bc381 mail/pine/Makefile
--- a/mail/pine/Makefile        Sun Feb 08 03:50:43 2004 +0000
+++ b/mail/pine/Makefile        Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2004/01/20 10:16:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.83 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=       pine4.58
 PKGNAME=        pine-4.58
@@ -60,7 +60,7 @@
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME}      \
                ${LDAPCFLAGS} ${LDAPLIBS}                               \
                PREFIX=${PREFIX}                                        \
-               CC="${BUILDLINK_CC} ${CFLAGS} ${LDFLAGS}"
+               CC="${CC} ${CFLAGS} ${LDFLAGS}"
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/
diff -r abb6fbe34492 -r a283691bc381 pkgtools/rpm2pkg/Makefile
--- a/pkgtools/rpm2pkg/Makefile Sun Feb 08 03:50:43 2004 +0000
+++ b/pkgtools/rpm2pkg/Makefile Sun Feb 08 04:03:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/20 12:23:58 agc Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/08 04:03:15 jlam Exp $
 
 DISTNAME=      rpm2pkg-1.3
 PKGREVISION=                   1
@@ -20,7 +20,7 @@
 LIBS=          -lrpm -lintl -lz
 
 do-build:
-       ${BUILDLINK_CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/rpm2pkg \
+       ${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/rpm2pkg \
                ${FILESDIR}/rpm2pkg.c ${LIBS}
 
 do-install:
Prev by Date: [pkgsrc/trunk]: pkgsrc/databases/db3 Override config.sub and config.guess. F...
Next by Date: [pkgsrc/trunk]: pkgsrc/mk/bulk include the total number of binary pkgs create...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/databases/db3 Override config.sub and config.guess. F...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk/bulk include the total number of binary pkgs create...
Indexes:
Home | Main Index | Thread Index | Old Index