pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/gcc6-aux gcc6-aux: copy iconv workaround from gcc...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9e239c6f8035
branches:  trunk
changeset: 449626:9e239c6f8035
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Apr 02 16:30:09 2021 +0000

description:
gcc6-aux: copy iconv workaround from gcc5-aux

with this, i can build this package.

diffstat:

 lang/gcc6-aux/Makefile      |  6 +++++-
 lang/gcc6-aux/buildlink3.mk |  3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r d41ad13dcd7b -r 9e239c6f8035 lang/gcc6-aux/Makefile
--- a/lang/gcc6-aux/Makefile    Fri Apr 02 16:21:05 2021 +0000
+++ b/lang/gcc6-aux/Makefile    Fri Apr 02 16:30:09 2021 +0000
@@ -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 @@
 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 @@
                ${TAR} -cf ${BSFILENAME} bootstrap; ${BZIP2} ${BSFILENAME})
 .endif
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d41ad13dcd7b -r 9e239c6f8035 lang/gcc6-aux/buildlink3.mk
--- a/lang/gcc6-aux/buildlink3.mk       Fri Apr 02 16:21:05 2021 +0000
+++ b/lang/gcc6-aux/buildlink3.mk       Fri Apr 02 16:30:09 2021 +0000
@@ -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_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"



Home | Main Index | Thread Index | Old Index