CVS commit: pkgsrc/lang/gcc8

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar 30 15:28:58 UTC 2023

Modified Files:
        pkgsrc/lang/gcc8: Makefile options.mk

Log Message:
gcc8: fix some pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/gcc8/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc8/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc8/Makefile
diff -u pkgsrc/lang/gcc8/Makefile:1.34 pkgsrc/lang/gcc8/Makefile:1.35
--- pkgsrc/lang/gcc8/Makefile:1.34      Sun Jan 29 10:47:33 2023
+++ pkgsrc/lang/gcc8/Makefile   Thu Mar 30 15:28:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2023/01/29 10:47:33 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2023/03/30 15:28:58 wiz Exp $
 
 GCC_PKGNAME=           gcc8
 .include               "version.mk"
@@ -91,7 +91,7 @@ post-extract:
        ${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-*}
 # on NetBSD, use the native SSP code in libc
 CONFIGURE_ARGS+=       --disable-libssp
 # Match base libstdc++ major
@@ -131,15 +131,15 @@ MAKE_ENV.SunOS+=  ac_cv_func_mkostemp=no
 CONFIGURE_ARGS+=       --disable-bootstrap
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || ${MACHINE_PLATFORM:MLinux-*-i386}
 CONFIGURE_ARGS+=       --with-arch=i486 --with-tune=i486
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || ${MACHINE_PLATFORM:MLinux-*-x86_64}
 CONFIGURE_ARGS+=       --with-arch=nocona --with-tune=nocona --with-fpmath=sse
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
+.if ${MACHINE_PLATFORM:MDarwin-[0-8].*-*}
 CONFIGURE_ARGS+=       --with-dwarf2
 .endif
 
@@ -193,7 +193,7 @@ post-test:
 post-install:
        ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
                ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
-.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
+.if ${MACHINE_PLATFORM:MSunOS-*-*86*} && ${OS_VERSION} != "5.11"
        ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
        ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
 .endif

Index: pkgsrc/lang/gcc8/options.mk
diff -u pkgsrc/lang/gcc8/options.mk:1.6 pkgsrc/lang/gcc8/options.mk:1.7
--- pkgsrc/lang/gcc8/options.mk:1.6     Wed Mar 29 20:44:52 2023
+++ pkgsrc/lang/gcc8/options.mk Thu Mar 30 15:28:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2023/03/29 20:44:52 joerg Exp $
+# $NetBSD: options.mk,v 1.7 2023/03/30 15:28:58 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -27,7 +27,7 @@ PKG_SUGGESTED_OPTIONS+=                       always-libgcc
 ### Determine if multilib is avalible.
 ###
 MULTILIB_SUPPORTED?=   unknown
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+.if ${MACHINE_PLATFORM:MLinux-*-x86_64}
 .  if exists(/usr/include/x86_64-linux-gnu/gnu)
 _GNU_INCLUDE_DIR=      /usr/include/x86_64-linux-gnu/gnu
 .  else