Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1649891349216430"
MIME-Version: 1.0
Date: Wed, 13 Apr 2022 23:09:09 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/cross/xtensa-esp32-elf-binutils
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20220413230909.C6C13FB24@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	tnn
Date:		Wed Apr 13 23:09:09 UTC 2022

Modified Files:
	pkgsrc/cross/xtensa-esp32-elf-binutils: Makefile
Added Files:
	pkgsrc/cross/xtensa-esp32-elf-binutils: Makefile.common

Log Message:
xtensa-esp32-elf-binutils: convert to Makefile.common

so we can target esp32s2 and esp32s3 in companion packages


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile.common

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


--_----------=_1649891349216430
Content-Disposition: inline
Content-Length: 3956
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile
diff -u pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile:1.4 pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile:1.5
--- pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile:1.4	Wed Apr 13 21:02:33 2022
+++ pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile	Wed Apr 13 23:09:09 2022
@@ -1,42 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2022/04/13 21:02:33 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/13 23:09:09 tnn Exp $
 
-DISTNAME=	binutils-2.35.2
-PKGNAME=	${DISTNAME:C/.*binutils(-gdb)?/xtensa-esp32-elf-binutils/}
-CATEGORIES=	cross
-MASTER_SITES=	${MASTER_SITE_GNU:=binutils/}
-EXTRACT_SUFX=	.tar.xz
-# Espressif overlays
-DISTFILES=	${DEFAULT_DISTFILES}
-DISTFILES+=	crosstool-NG-esp-2021r2-patch3.tar.gz
-SITES.crosstool-NG-esp-2021r2-patch3.tar.gz=	-https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/crosstool-NG-esp-2021r2-patch3.tar.gz
+ESP32_TYPE=	esp32
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/espressif/binutils-gdb
-COMMENT=	Cross binutils for Espressif ESP32 bare metal environment
-LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
-
-INFO_FILES=		yes
-GNU_CONFIGURE=		yes
-GNU_CONFIGURE_STRICT=	no # several sub-configures know --enable-nls
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake makeinfo
-
-OBJDIR=			../build
-CONFIGURE_DIRS=		${OBJDIR}
-CONFIGURE_SCRIPT=	${WRKSRC}/configure
-GNU_CONFIGURE_PREFIX=	${PREFIX}/xtensa-esp32-elf
-
-CONFIGURE_ARGS+=	--disable-werror
-CONFIGURE_ARGS+=	--target=xtensa-esp32-elf
-CONFIGURE_ARGS+=	--enable-multilib
-CONFIGURE_ARGS+=	--disable-nls
-CONFIGURE_ARGS+=	--disable-gdb
-
-post-extract:
-	${CP} -r ${WRKDIR}/overlays/xtensa_esp32/binutils/. \
-	    ${WRKSRC}/.
-
-pre-configure:
-	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
+.include "Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile.common
diff -u /dev/null pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile.common:1.1
--- /dev/null	Wed Apr 13 23:09:09 2022
+++ pkgsrc/cross/xtensa-esp32-elf-binutils/Makefile.common	Wed Apr 13 23:09:09 2022
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile.common,v 1.1 2022/04/13 23:09:09 tnn Exp $
+
+# used by cross/xtensa-esp32-elf-binutils/Makefile
+# used by cross/xtensa-esp32s2-elf-binutils/Makefile
+# used by cross/xtensa-esp32s3-elf-binutils/Makefile
+
+DISTNAME=	binutils-2.35.2
+PKGNAME=	${DISTNAME:C/.*binutils(-gdb)?/xtensa-${ESP32_TYPE}-elf-binutils/}
+CATEGORIES=	cross
+MASTER_SITES=	${MASTER_SITE_GNU:=binutils/}
+EXTRACT_SUFX=	.tar.xz
+# Espressif overlays
+DISTFILES=	${DEFAULT_DISTFILES}
+DISTFILES+=	crosstool-NG-esp-2021r2-patch3.tar.gz
+SITES.crosstool-NG-esp-2021r2-patch3.tar.gz=	-https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/crosstool-NG-esp-2021r2-patch3.tar.gz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://github.com/espressif/binutils-gdb
+COMMENT=	Cross binutils for Espressif ${ESP32_TYPE:tu} bare metal environment
+LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
+
+INFO_FILES=		yes
+GNU_CONFIGURE=		yes
+GNU_CONFIGURE_STRICT=	no # several sub-configures know --enable-nls
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake makeinfo
+
+#PATCHDIR=	${.CURDIR}/../../cross/xtensa-esp32-elf-binutils/patches
+DISTINFO_FILE=	${.CURDIR}/../../cross/xtensa-esp32-elf-binutils/distinfo
+DESCR_SRC=	${.CURDIR}/../../cross/xtensa-esp32-elf-binutils/DESCR
+
+OBJDIR=			../build
+CONFIGURE_DIRS=		${OBJDIR}
+CONFIGURE_SCRIPT=	${WRKSRC}/configure
+GNU_CONFIGURE_PREFIX=	${PREFIX}/xtensa-${ESP32_TYPE}-elf
+
+CONFIGURE_ARGS+=	--disable-werror
+CONFIGURE_ARGS+=	--target=xtensa-${ESP32_TYPE}-elf
+CONFIGURE_ARGS+=	--enable-multilib
+CONFIGURE_ARGS+=	--disable-nls
+CONFIGURE_ARGS+=	--disable-gdb
+
+post-extract:
+	${CP} -r ${WRKDIR}/overlays/xtensa_${ESP32_TYPE}/binutils/. \
+	    ${WRKSRC}/.
+
+pre-configure:
+	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}


--_----------=_1649891349216430--