CVS commit: pkgsrc/cross

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Mar 19 16:00:48 UTC 2023

Modified Files:
        pkgsrc/cross/mingw-w64-i686-gcc: Makefile PLIST
        pkgsrc/cross/mingw-w64-x86_64-gcc: Makefile Makefile.common

Log Message:
cross/mingw-w64-i686-gcc: Use DW2 exceptions


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/cross/mingw-w64-i686-gcc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/cross/mingw-w64-i686-gcc/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile.common

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

Modified files:

Index: pkgsrc/cross/mingw-w64-i686-gcc/Makefile
diff -u pkgsrc/cross/mingw-w64-i686-gcc/Makefile:1.8 pkgsrc/cross/mingw-w64-i686-gcc/Makefile:1.9
--- pkgsrc/cross/mingw-w64-i686-gcc/Makefile:1.8        Wed Feb 15 20:49:11 2023
+++ pkgsrc/cross/mingw-w64-i686-gcc/Makefile    Sun Mar 19 16:00:48 2023
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2023/02/15 20:49:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2023/03/19 16:00:48 js Exp $
 
 .include "../../cross/mingw-w64-x86_64-gcc/Makefile.common"
 
 PKGNAME=               mingw-w64-i686-${DISTNAME}
-PKGREVISION=           1
+PKGREVISION=           2
 COMMENT=               GNU C Compiler for win32 cross-development
 
 DEPENDS+=              mingw-w64-i686-binutils-[0-9]*:../../cross/mingw-w64-i686-binutils
 
 MINGW_TARGET=          ${MINGW_W64_32_TARGET}
+CONFIGURE_ARGS+=       --enable-dw2-exceptions
+CONFIGURE_ARGS+=       --disable-sjlj-exceptions
 
 .include "../../cross/mingw-w64-i686-crt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/cross/mingw-w64-i686-gcc/PLIST
diff -u pkgsrc/cross/mingw-w64-i686-gcc/PLIST:1.5 pkgsrc/cross/mingw-w64-i686-gcc/PLIST:1.6
--- pkgsrc/cross/mingw-w64-i686-gcc/PLIST:1.5   Sun Oct  9 02:37:02 2022
+++ pkgsrc/cross/mingw-w64-i686-gcc/PLIST       Sun Mar 19 16:00:48 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/10/09 02:37:02 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/03/19 16:00:48 js Exp $
 cross/i686-w64-mingw32/bin/i686-w64-mingw32-c++
 cross/i686-w64-mingw32/bin/i686-w64-mingw32-cpp
 cross/i686-w64-mingw32/bin/i686-w64-mingw32-g++
@@ -818,7 +818,7 @@ cross/i686-w64-mingw32/i686-w64-mingw32/
 cross/i686-w64-mingw32/i686-w64-mingw32/lib/libatomic-1.dll
 cross/i686-w64-mingw32/i686-w64-mingw32/lib/libatomic.la
 cross/i686-w64-mingw32/i686-w64-mingw32/lib/libgcc_s.a
-cross/i686-w64-mingw32/i686-w64-mingw32/lib/libgcc_s_sjlj-1.dll
+cross/i686-w64-mingw32/i686-w64-mingw32/lib/libgcc_s_dw2-1.dll
 cross/i686-w64-mingw32/i686-w64-mingw32/lib/libgfortran-5.dll
 cross/i686-w64-mingw32/i686-w64-mingw32/lib/libgfortran.la
 cross/i686-w64-mingw32/i686-w64-mingw32/lib/libgfortran.spec

Index: pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile
diff -u pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile:1.12 pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile:1.13
--- pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile:1.12     Wed Feb 15 20:49:11 2023
+++ pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile  Sun Mar 19 16:00:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/02/15 20:49:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2023/03/19 16:00:48 js Exp $
 
 .include "../../cross/mingw-w64-x86_64-gcc/Makefile.common"
 
@@ -9,6 +9,7 @@ COMMENT=                GNU C Compiler for win64 cross
 DEPENDS+=              mingw-w64-x86_64-binutils-[0-9]*:../../cross/mingw-w64-x86_64-binutils
 
 MINGW_TARGET=          ${MINGW_W64_64_TARGET}
+CONFIGURE_ARGS+=       --disable-dw2-exceptions
 
 .include "../../cross/mingw-w64-x86_64-crt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile.common
diff -u pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile.common:1.11 pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile.common:1.12
--- pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile.common:1.11      Wed Feb 15 20:49:11 2023
+++ pkgsrc/cross/mingw-w64-x86_64-gcc/Makefile.common   Sun Mar 19 16:00:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2023/02/15 20:49:11 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.12 2023/03/19 16:00:48 js Exp $
 #
 # used by cross/mingw-w64-i686-gcc/Makefile
 # used by cross/mingw-w64-x86_64-gcc/Makefile
@@ -37,7 +37,6 @@ CONFIGURE_ARGS+=      --enable-static
 CONFIGURE_ARGS+=       --enable-lto
 CONFIGURE_ARGS+=       --enable-fully-dynamic-string
 CONFIGURE_ARGS+=       --enable-libstdcxx-time=yes
-CONFIGURE_ARGS+=       --disable-dw2-exceptions
 CONFIGURE_ARGS+=       --disable-multilib
 CONFIGURE_ARGS+=       --disable-gcov # sys/mman.h not found errors