CVS commit: pkgsrc/lang

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Mar 29 20:44:52 UTC 2023

Modified Files:
        pkgsrc/lang/gcc10: options.mk
        pkgsrc/lang/gcc6: options.mk
        pkgsrc/lang/gcc7: options.mk
        pkgsrc/lang/gcc8: options.mk
        pkgsrc/lang/gcc9: options.mk

Log Message:
Ignore unreadable directories when looking for libgcc_s.so


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc10/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc6/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc7/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc8/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc9/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/gcc10/options.mk
diff -u pkgsrc/lang/gcc10/options.mk:1.2 pkgsrc/lang/gcc10/options.mk:1.3
--- pkgsrc/lang/gcc10/options.mk:1.2    Fri Oct  1 11:56:13 2021
+++ pkgsrc/lang/gcc10/options.mk        Wed Mar 29 20:44:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/10/01 11:56:13 nia Exp $
+# $NetBSD: options.mk,v 1.3 2023/03/29 20:44:52 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -54,7 +54,7 @@ PKG_SUGGESTED_OPTIONS+=       gcc-multilib
 
 .  for _libdir_ in ${_OPSYS_LIB_DIRS}
 .    if exists(${_libdir_})
-BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so
+BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so 2> /dev/null
 BASE_LIBGCC_MATCH_STRING!=     ${ECHO} ${BASE_LIBGCC} ${GCC10_DIST_VERSION} | \
                                ${AWK} -f ../../mk/scripts/larger_symbol_version.awk
 .      if ${BASE_LIBGCC_MATCH_STRING:Mnewer}

Index: pkgsrc/lang/gcc6/options.mk
diff -u pkgsrc/lang/gcc6/options.mk:1.4 pkgsrc/lang/gcc6/options.mk:1.5
--- pkgsrc/lang/gcc6/options.mk:1.4     Fri Oct  1 11:56:14 2021
+++ pkgsrc/lang/gcc6/options.mk Wed Mar 29 20:44:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2021/10/01 11:56:14 nia Exp $
+# $NetBSD: options.mk,v 1.5 2023/03/29 20:44:52 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+=      --disable-multilib
 
 .  for _libdir_ in ${_OPSYS_LIB_DIRS}
 .    if exists(${_libdir_})
-BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so
+BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so 2> /dev/null
 BASE_LIBGCC_MATCH_STRING!=     ${ECHO} ${BASE_LIBGCC} ${GCC6_DIST_VERSION} | \
                                ${AWK} -f ../../mk/scripts/larger_symbol_version.awk
 .      if ${BASE_LIBGCC_MATCH_STRING:Mnewer}

Index: pkgsrc/lang/gcc7/options.mk
diff -u pkgsrc/lang/gcc7/options.mk:1.7 pkgsrc/lang/gcc7/options.mk:1.8
--- pkgsrc/lang/gcc7/options.mk:1.7     Fri Oct  1 11:56:14 2021
+++ pkgsrc/lang/gcc7/options.mk Wed Mar 29 20:44:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2021/10/01 11:56:14 nia Exp $
+# $NetBSD: options.mk,v 1.8 2023/03/29 20:44:52 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+=      --disable-multilib
 
 .  for _libdir_ in ${_OPSYS_LIB_DIRS}
 .    if exists(${_libdir_})
-BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so
+BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so 2> /dev/null
 BASE_LIBGCC_MATCH_STRING!=     ${ECHO} ${BASE_LIBGCC} ${GCC7_DIST_VERSION} | \
                                ${AWK} -f ../../mk/scripts/larger_symbol_version.awk
 .      if ${BASE_LIBGCC_MATCH_STRING:Mnewer}

Index: pkgsrc/lang/gcc8/options.mk
diff -u pkgsrc/lang/gcc8/options.mk:1.5 pkgsrc/lang/gcc8/options.mk:1.6
--- pkgsrc/lang/gcc8/options.mk:1.5     Fri Oct  1 11:56:14 2021
+++ pkgsrc/lang/gcc8/options.mk Wed Mar 29 20:44:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2021/10/01 11:56:14 nia Exp $
+# $NetBSD: options.mk,v 1.6 2023/03/29 20:44:52 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -54,7 +54,7 @@ PKG_SUGGESTED_OPTIONS+=       gcc-multilib
 
 .  for _libdir_ in ${_OPSYS_LIB_DIRS}
 .    if exists(${_libdir_})
-BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so
+BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so 2> /dev/null
 BASE_LIBGCC_MATCH_STRING!=     ${ECHO} ${BASE_LIBGCC} ${GCC8_DIST_VERSION} | \
                                ${AWK} -f ../../mk/scripts/larger_symbol_version.awk
 .      if ${BASE_LIBGCC_MATCH_STRING:Mnewer}

Index: pkgsrc/lang/gcc9/options.mk
diff -u pkgsrc/lang/gcc9/options.mk:1.6 pkgsrc/lang/gcc9/options.mk:1.7
--- pkgsrc/lang/gcc9/options.mk:1.6     Sun Jan 29 09:03:15 2023
+++ pkgsrc/lang/gcc9/options.mk Wed Mar 29 20:44:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2023/01/29 09:03:15 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2023/03/29 20:44:52 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc9
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -46,7 +46,7 @@ PKG_SUGGESTED_OPTIONS+=       gcc-multilib
 
 .  for dir in ${_OPSYS_LIB_DIRS}
 .    if exists(${dir})
-BASE_LIBGCC!=          find ${dir} -name libgcc_s.so
+BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so 2> /dev/null
 BASE_LIBGCC_MATCH_STRING!= \
                        ${ECHO} ${BASE_LIBGCC} ${GCC9_VERSION} \
                        | ${AWK} -f ../../mk/scripts/larger_symbol_version.awk