Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2929C84EA7 for ; Sat, 3 Jun 2023 13:22:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 6hjFujiDKUPx for ; Sat, 3 Jun 2023 13:22:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 49A4484CF2 for ; Sat, 3 Jun 2023 13:22:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 46B0BFA88; Sat, 3 Jun 2023 13:22:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168579852579130" MIME-Version: 1.0 Date: Sat, 3 Jun 2023 13:22:05 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230603132205.46B0BFA88@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168579852579130 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Sat Jun 3 13:22:05 UTC 2023 Modified Files: pkgsrc/lang/gcc10: Makefile pkgsrc/lang/gcc12: Makefile pkgsrc/lang/gcc13: Makefile pkgsrc/lang/gcc6: Makefile pkgsrc/lang/gcc7: Makefile pkgsrc/lang/gcc8: Makefile pkgsrc/lang/gcc9: Makefile Log Message: lang/gcc*: Set CC_FOR_BUILD and CXX_FOR_BUILD if cross-compiling. Verified gcc6 and gcc7 cross-compile on NetBSD, at least if the gcc-fortran option is disabled. gcc8 and gcc9 have trouble because of python (why do these have a full dependency on python?); gcc10 and gcc12 are missing gcc/config/mips/netbsd64.h; gcc12 and gcc13 have a cross-compile bug with missing __LIBGCC_*__ macros -- but in any case, setting CC_FOR_BUILD and CXX_FOR_BUILD is obviously necessary for cross-compilation. Conditional on USE_CROSS_COMPILE, so no harm to native builds. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/gcc10/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc12/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc13/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/gcc6/Makefile cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/gcc7/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/gcc8/Makefile cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/gcc9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168579852579130 Content-Disposition: inline Content-Length: 5913 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/gcc10/Makefile diff -u pkgsrc/lang/gcc10/Makefile:1.21 pkgsrc/lang/gcc10/Makefile:1.22 --- pkgsrc/lang/gcc10/Makefile:1.21 Thu Apr 6 22:28:59 2023 +++ pkgsrc/lang/gcc10/Makefile Sat Jun 3 13:22:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2023/04/06 22:28:59 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2023/06/03 13:22:04 riastradh Exp $ PKGNAME= ${GCC_PKGNAME}-${GCC10_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of @@ -51,6 +51,11 @@ CONFIGURE_ARGS+= --enable-libssp ## For target librarys and libjava programs. CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} +.if ${USE_CROSS_COMPILE:U:tl} == "yes" +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +CONFIGURE_ENV+= CXX_FOR_BUILD=${NATIVE_CXX:Q} +.endif + CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --enable-shared Index: pkgsrc/lang/gcc12/Makefile diff -u pkgsrc/lang/gcc12/Makefile:1.5 pkgsrc/lang/gcc12/Makefile:1.6 --- pkgsrc/lang/gcc12/Makefile:1.5 Fri Apr 7 06:48:27 2023 +++ pkgsrc/lang/gcc12/Makefile Sat Jun 3 13:22:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/04/07 06:48:27 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2023/06/03 13:22:04 riastradh Exp $ PKGNAME= ${GCC_PKGNAME}-${GCC12_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of @@ -50,6 +50,11 @@ CONFIGURE_ARGS+= --enable-libssp ## For target librarys and libjava programs. CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} +.if ${USE_CROSS_COMPILE:U:tl} == "yes" +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +CONFIGURE_ENV+= CXX_FOR_BUILD=${NATIVE_CXX:Q} +.endif + CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --enable-shared Index: pkgsrc/lang/gcc13/Makefile diff -u pkgsrc/lang/gcc13/Makefile:1.1 pkgsrc/lang/gcc13/Makefile:1.2 --- pkgsrc/lang/gcc13/Makefile:1.1 Wed May 3 20:03:09 2023 +++ pkgsrc/lang/gcc13/Makefile Sat Jun 3 13:22:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2023/05/03 20:03:09 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2023/06/03 13:22:04 riastradh Exp $ PKGNAME= ${GCC_PKGNAME}-${GCC13_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of @@ -50,6 +50,11 @@ CONFIGURE_ARGS+= --enable-libssp ## For target librarys and libjava programs. CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} +.if ${USE_CROSS_COMPILE:U:tl} == "yes" +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +CONFIGURE_ENV+= CXX_FOR_BUILD=${NATIVE_CXX:Q} +.endif + CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --enable-shared Index: pkgsrc/lang/gcc6/Makefile diff -u pkgsrc/lang/gcc6/Makefile:1.37 pkgsrc/lang/gcc6/Makefile:1.38 --- pkgsrc/lang/gcc6/Makefile:1.37 Tue Jun 28 11:34:11 2022 +++ pkgsrc/lang/gcc6/Makefile Sat Jun 3 13:22:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2022/06/28 11:34:11 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2023/06/03 13:22:04 riastradh Exp $ GCC_PKGNAME= gcc6 .include "version.mk" @@ -101,6 +101,11 @@ post-extract: ## For target librarys and libjava programs. CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} +.if ${USE_CROSS_COMPILE:U:tl} == "yes" +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +CONFIGURE_ENV+= CXX_FOR_BUILD=${NATIVE_CXX:Q} +.endif + CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-long-long Index: pkgsrc/lang/gcc7/Makefile diff -u pkgsrc/lang/gcc7/Makefile:1.45 pkgsrc/lang/gcc7/Makefile:1.46 --- pkgsrc/lang/gcc7/Makefile:1.45 Wed Aug 10 21:54:46 2022 +++ pkgsrc/lang/gcc7/Makefile Sat Jun 3 13:22:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2022/08/10 21:54:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.46 2023/06/03 13:22:04 riastradh Exp $ GCC_PKGNAME= gcc7 .include "version.mk" @@ -103,6 +103,11 @@ CONFIGURE_ARGS+= --enable-libssp ## For target librarys and libjava programs. CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} +.if ${USE_CROSS_COMPILE:U:tl} == "yes" +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +CONFIGURE_ENV+= CXX_FOR_BUILD=${NATIVE_CXX:Q} +.endif + CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-long-long Index: pkgsrc/lang/gcc8/Makefile diff -u pkgsrc/lang/gcc8/Makefile:1.35 pkgsrc/lang/gcc8/Makefile:1.36 --- pkgsrc/lang/gcc8/Makefile:1.35 Thu Mar 30 15:28:58 2023 +++ pkgsrc/lang/gcc8/Makefile Sat Jun 3 13:22:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2023/03/30 15:28:58 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2023/06/03 13:22:04 riastradh Exp $ GCC_PKGNAME= gcc8 .include "version.mk" @@ -107,6 +107,11 @@ CONFIGURE_ARGS+= --enable-libssp ## For target librarys and libjava programs. CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} +.if ${USE_CROSS_COMPILE:U:tl} == "yes" +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +CONFIGURE_ENV+= CXX_FOR_BUILD=${NATIVE_CXX:Q} +.endif + CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-long-long Index: pkgsrc/lang/gcc9/Makefile diff -u pkgsrc/lang/gcc9/Makefile:1.42 pkgsrc/lang/gcc9/Makefile:1.43 --- pkgsrc/lang/gcc9/Makefile:1.42 Sun Jan 29 09:03:15 2023 +++ pkgsrc/lang/gcc9/Makefile Sat Jun 3 13:22:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2023/01/29 09:03:15 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2023/06/03 13:22:04 riastradh Exp $ GCC_PKGNAME= gcc9 .include "version.mk" @@ -101,6 +101,11 @@ CONFIGURE_ARGS+= --enable-libssp ## For target librarys and libjava programs. CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} +.if ${USE_CROSS_COMPILE:U:tl} == "yes" +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} +CONFIGURE_ENV+= CXX_FOR_BUILD=${NATIVE_CXX:Q} +.endif + CONFIGURE_ARGS+= --enable-languages=${LANGS:M*:Q} CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-long-long --_----------=_168579852579130--