CVS commit: pkgsrc/lang/gcc6-aux

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr  2 16:30:09 UTC 2021

Modified Files:
        pkgsrc/lang/gcc6-aux: Makefile buildlink3.mk

Log Message:
gcc6-aux: copy iconv workaround from gcc5-aux

with this, i can build this package.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc6-aux/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc6-aux/buildlink3.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/gcc6-aux/Makefile
diff -u pkgsrc/lang/gcc6-aux/Makefile:1.7 pkgsrc/lang/gcc6-aux/Makefile:1.8
--- pkgsrc/lang/gcc6-aux/Makefile:1.7   Sun May  3 17:42:20 2020
+++ pkgsrc/lang/gcc6-aux/Makefile       Fri Apr  2 16:30:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/05/03 17:42:20 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/02 16:30:09 nia Exp $
 
 PKGNAME=       gcc6-aux-${SNAPSHOT}
 PKGREVISION=   ${MAIN_PR}
@@ -40,6 +40,9 @@ OS_LABEL4VERS=                [${OPSYS}${GARCH:M*64:S/
 FULL_GNATGCC=          NOT SET
 FULL_PATH=             /sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/gcc6-aux/bin:${PREFIX}/sbin:${PREFIX}/bin
 
+# avoid mysterious iconv failures
+EXTRA_CONFARGS+=       --disable-nls
+
 .if ${OPSYS} == DragonFly
 BOOTSTRAP_COMPILER=    ada-bootstrap.${GARCH}.dragonfly.41.tar.bz2
 .endif
@@ -329,4 +332,5 @@ create-bootstrap: stage-install
                ${TAR} -cf ${BSFILENAME} bootstrap; ${BZIP2} ${BSFILENAME})
 .endif
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/gcc6-aux/buildlink3.mk
diff -u pkgsrc/lang/gcc6-aux/buildlink3.mk:1.5 pkgsrc/lang/gcc6-aux/buildlink3.mk:1.6
--- pkgsrc/lang/gcc6-aux/buildlink3.mk:1.5      Wed Apr  8 09:12:46 2020
+++ pkgsrc/lang/gcc6-aux/buildlink3.mk  Fri Apr  2 16:30:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/04/08 09:12:46 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2021/04/02 16:30:09 nia Exp $
 
 BUILDLINK_TREE+=       gcc6-aux
 
@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.gcc6-aux?=      gcc6-au
 BUILDLINK_PKGSRCDIR.gcc6-aux?=         ../../lang/gcc6-aux
 BUILDLINK_DEPMETHOD.gcc6-aux?=         build
 
-.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
 .include "../../math/mpcomplex/buildlink3.mk"