Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1680792793246450"
MIME-Version: 1.0
Date: Thu, 6 Apr 2023 14:53:13 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/lang/gcc10
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20230406145313.8F0FBFA81@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1680792793246450
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu Apr  6 14:53:13 UTC 2023

Modified Files:
	pkgsrc/lang/gcc10: Makefile
Added Files:
	pkgsrc/lang/gcc10: Makefile.common

Log Message:
gcc10: split off some parts of the Makefile into Makefile.common


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/gcc10/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc10/Makefile.common

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


--_----------=_1680792793246450
Content-Disposition: inline
Content-Length: 10198
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.19 pkgsrc/lang/gcc10/Makefile:1.20
--- pkgsrc/lang/gcc10/Makefile:1.19	Sun Jul  3 15:59:17 2022
+++ pkgsrc/lang/gcc10/Makefile	Thu Apr  6 14:53:13 2023
@@ -1,53 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2022/07/03 15:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2023/04/06 14:53:13 wiz Exp $
 
-GCC_PKGNAME=		gcc10
-.include		"version.mk"
+.include "Makefile.common"
 
-DISTNAME=	gcc-${GCC10_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-${GCC10_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc10-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
-CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC10_DIST_VERSION}/}
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://gcc.gnu.org/
 COMMENT=	The GNU Compiler Collection (GCC) - 10.0 Release Series
-LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
-
-DISTFILES=		${DEFAULT_DISTFILES}
-EXTRACT_ONLY=		${DEFAULT_DISTFILES}
-
-# Relocations result in a linker error on AArch64, but not x86.
-MKPIE_SUPPORTED=	no
-CHECK_RELRO_SKIP+=	${GCC_PKGNAME}/lib/*
-
-NOT_FOR_PLATFORM=	Interix-*-*
-
-USE_LANGUAGES=		c99 c++
-USE_TOOLS+=		gmake makeinfo sed:run tar:build
-USE_TOOLS.NetBSD+=	gsed
-
-GNU_CONFIGURE=		yes
-GNU_CONFIGURE_STRICT=	no
-## Build outside ${WRKSRC}
-OBJDIR=			../build
-CONFIGURE_DIRS=		${OBJDIR}
-CONFIGURE_SCRIPT=	../${DISTNAME}/configure
-GCC_SUBPREFIX=		${GCC_PKGNAME}
-GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
-GNU_CONFIGURE_PREFIX=	${GCC_PREFIX}
-INFO_FILES=		yes
-CONFIGURE_ARGS+=	--disable-libstdcxx-pch
-
-UNLIMIT_RESOURCES+=	datasize
-UNLIMIT_RESOURCES+=	stacksize
-
-CHECK_PORTABILITY_SKIP+=	contrib/*
-
-.include "../../mk/bsd.prefs.mk"
 
 LANGS=			c
 
@@ -75,16 +35,6 @@ SUBST_FILES.fixinc=	gcc/Makefile.in
 SUBST_SED.fixinc=	-e "s,\./fixinc.sh,-c true,"
 .endif
 
-.include "options.mk"
-
-## For graphite support.
-.if !empty(PKG_OPTIONS:Mgcc-graphite)
-
-post-extract:
-	${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
-	${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
-.endif
-
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
 # on NetBSD, use the native SSP code in libc
 CONFIGURE_ARGS+=	--disable-libssp
@@ -103,82 +53,9 @@ CONFIGURE_ENV+=		LDFLAGS_FOR_TARGET=${LD
 
 CONFIGURE_ARGS+=	--enable-languages=${LANGS:Q}
 CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ARGS+=	--enable-long-long
-CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
-CONFIGURE_ARGS+=	--enable-threads=posix
-CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
-CONFIGURE_ARGS+=	--without-zstd
-# causes build errors even when using lang/gcc10 to self-host.
-CONFIGURE_ARGS.SunOS+=	--disable-libsanitizer
-# multilib on Darwin requires fat-binaries
-CONFIGURE_ARGS.Darwin+=	--disable-multilib
-.if !empty(OSX_SDK_PATH)
-CONFIGURE_ARGS.Darwin+=	--with-sysroot=${OSX_SDK_PATH}
-.endif
-CONFIGURE_ARGS.NetBSD+=	--with-gnu-ld --with-ld=/usr/bin/ld
-CONFIGURE_ARGS.NetBSD+=	--with-gnu-as --with-as=/usr/bin/as
-MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
-MAKE_ENV.NetBSD+=	ac_cv_func_gethostbyname_r=no
-MAKE_ENV.NetBSD+=	ac_cv_func_freelocale=no
-MAKE_ENV.NetBSD+=	ac_cv_func_newlocale=no
-MAKE_ENV.NetBSD+=	ac_cv_func_uselocale=no
-MAKE_ENV.SunOS+=	ac_cv_func_mkostemp=no
-
-.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-bootstrap
-.endif
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(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)
-CONFIGURE_ARGS+=	--with-arch=nocona --with-tune=nocona --with-fpmath=sse
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
-CONFIGURE_ARGS+=	--with-dwarf2
-.endif
-
-# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
-# a binary so we need to make sure we give it the installed sed and not
-# the tool wrapped one.
-MAKE_ENV+=		ac_cv_path_SED=${TOOLS_SED}
-MAKE_ENV+=		lt_cv_path_SED=${TOOLS_SED}
-
-# Determine whether to use binutils
-.if ${OPSYS} == "SunOS"
-.  if exists(/usr/sfw/bin/gobjdump)
-CONFIGURE_ENV+=		OBJDUMP=/usr/sfw/bin/gobjdump
-.  endif
-.  if exists(/usr/bin/ld)
-CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/bin/ld
-.  else
-CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/ccs/bin/ld
-.  endif
-.  if exists(/usr/sfw/bin/gas)
-CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/sfw/bin/gas
-.  elif exists(/usr/ccs/bin/as)
-CONFIGURE_ARGS+=	--without-gnu-as --with-as=/usr/ccs/bin/as
-.  else
-BUILDLINK_DEPMETHOD.binutils=	full
-.    include "../../devel/binutils/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gnu-as --with-as=${PREFIX}/bin/gas
-.  endif
-.endif
-
-.if ${OS_VARIANT} == "SmartOS"
-SUBST_CLASSES+=		ccs
-SUBST_STAGE.ccs=	pre-configure
-SUBST_FILES.ccs=	contrib/make_sunver.pl
-SUBST_SED.ccs=		-e 's,/usr/ccs/bin,/usr/bin,g'
-.endif
 
 CTF_FILES_SKIP+=	*/gengtype	# CPU limit exceeded
 
-pre-configure:
-	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
-
 TEST_TARGET=	-j ${MAKE_JOBS} -k check || ${TRUE}
 TEST_DEPENDS+=	dejagnu-[0-9]*:../../devel/dejagnu
 
@@ -199,14 +76,4 @@ GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
 	${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT};
 
-CHECK_BUILTIN.zlib:= yes
-.include "../../devel/zlib/builtin.mk"
-CHECK_BUILTIN.zlib:= no
-.if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
-CONFIGURE_ARGS+=	--with-system-zlib
-.else
-CONFIGURE_ARGS+=	--without-system-zlib
-.endif
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/lang/gcc10/Makefile.common
diff -u /dev/null pkgsrc/lang/gcc10/Makefile.common:1.1
--- /dev/null	Thu Apr  6 14:53:13 2023
+++ pkgsrc/lang/gcc10/Makefile.common	Thu Apr  6 14:53:13 2023
@@ -0,0 +1,138 @@
+# $NetBSD: Makefile.common,v 1.1 2023/04/06 14:53:13 wiz Exp $
+
+GCC_PKGNAME=		gcc10
+.include		"version.mk"
+
+DISTNAME=	gcc-${GCC10_DIST_VERSION}
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC10_DIST_VERSION}/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://gcc.gnu.org/
+LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
+
+DISTFILES=		${DEFAULT_DISTFILES}
+EXTRACT_ONLY=		${DEFAULT_DISTFILES}
+
+# Relocations result in a linker error on AArch64, but not x86.
+MKPIE_SUPPORTED=	no
+CHECK_RELRO_SKIP+=	${GCC_PKGNAME}/lib/*
+
+NOT_FOR_PLATFORM=	Interix-*-*
+
+USE_LANGUAGES=		c99 c++
+USE_TOOLS+=		gmake makeinfo sed:run tar:build
+USE_TOOLS.NetBSD+=	gsed
+
+GNU_CONFIGURE=		yes
+GNU_CONFIGURE_STRICT=	no
+## Build outside ${WRKSRC}
+OBJDIR=			../build
+CONFIGURE_DIRS=		${OBJDIR}
+CONFIGURE_SCRIPT=	../${DISTNAME}/configure
+GCC_SUBPREFIX=		${GCC_PKGNAME}
+GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
+GNU_CONFIGURE_PREFIX=	${GCC_PREFIX}
+INFO_FILES=		yes
+CONFIGURE_ARGS+=	--disable-libstdcxx-pch
+
+UNLIMIT_RESOURCES+=	datasize
+UNLIMIT_RESOURCES+=	stacksize
+
+CHECK_PORTABILITY_SKIP+=	contrib/*
+
+.include "options.mk"
+
+## For graphite support.
+.if !empty(PKG_OPTIONS:Mgcc-graphite)
+
+post-extract:
+	${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
+	${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
+.endif
+
+CONFIGURE_ARGS+=	--enable-long-long
+CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
+CONFIGURE_ARGS+=	--enable-threads=posix
+CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
+CONFIGURE_ARGS+=	--without-zstd
+# causes build errors even when using lang/gcc10 to self-host.
+CONFIGURE_ARGS.SunOS+=	--disable-libsanitizer
+# multilib on Darwin requires fat-binaries
+CONFIGURE_ARGS.Darwin+=	--disable-multilib
+.if !empty(OSX_SDK_PATH)
+CONFIGURE_ARGS.Darwin+=	--with-sysroot=${OSX_SDK_PATH}
+.endif
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
+MAKE_ENV.NetBSD+=	ac_cv_func_gethostbyname_r=no
+MAKE_ENV.NetBSD+=	ac_cv_func_freelocale=no
+MAKE_ENV.NetBSD+=	ac_cv_func_newlocale=no
+MAKE_ENV.NetBSD+=	ac_cv_func_uselocale=no
+MAKE_ENV.SunOS+=	ac_cv_func_mkostemp=no
+
+.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+=	--disable-bootstrap
+.endif
+
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || ${MACHINE_PLATFORM:MLinux-*-i386}
+CONFIGURE_ARGS+=	--with-arch=i486 --with-tune=i486
+.endif
+
+.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || ${MACHINE_PLATFORM:MLinux-*-x86_64}
+CONFIGURE_ARGS+=	--with-arch=nocona --with-tune=nocona --with-fpmath=sse
+.endif
+
+.if ${MACHINE_PLATFORM:MDarwin-[0-8].*-*}
+CONFIGURE_ARGS+=	--with-dwarf2
+.endif
+
+# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
+# a binary so we need to make sure we give it the installed sed and not
+# the tool wrapped one.
+MAKE_ENV+=		ac_cv_path_SED=${TOOLS_SED}
+MAKE_ENV+=		lt_cv_path_SED=${TOOLS_SED}
+
+# Determine whether to use binutils
+.if ${OPSYS} == "SunOS"
+.  if exists(/usr/sfw/bin/gobjdump)
+CONFIGURE_ENV+=		OBJDUMP=/usr/sfw/bin/gobjdump
+.  endif
+.  if exists(/usr/bin/ld)
+CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/bin/ld
+.  else
+CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/ccs/bin/ld
+.  endif
+.  if exists(/usr/sfw/bin/gas)
+CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/sfw/bin/gas
+.  elif exists(/usr/ccs/bin/as)
+CONFIGURE_ARGS+=	--without-gnu-as --with-as=/usr/ccs/bin/as
+.  else
+BUILDLINK_DEPMETHOD.binutils=	full
+.    include "../../devel/binutils/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gnu-as --with-as=${PREFIX}/bin/gas
+.  endif
+.endif
+
+.if ${OS_VARIANT} == "SmartOS"
+SUBST_CLASSES+=		ccs
+SUBST_STAGE.ccs=	pre-configure
+SUBST_FILES.ccs=	contrib/make_sunver.pl
+SUBST_SED.ccs=		-e 's,/usr/ccs/bin,/usr/bin,g'
+.endif
+
+pre-configure:
+	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
+
+CHECK_BUILTIN.zlib:= yes
+.include "../../devel/zlib/builtin.mk"
+CHECK_BUILTIN.zlib:= no
+.if ${USE_BUILTIN.zlib:tl} == yes
+CONFIGURE_ARGS+=	--with-system-zlib
+.else
+CONFIGURE_ARGS+=	--without-system-zlib
+.endif
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"


--_----------=_1680792793246450--