Remove my PKGSRC_COMPILER cludge and replace it with a patch to RTLIL::IdString.

[Lloyd Parkes <lloyd%must-have-coffee.gen.nz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Lloyd Parkes <lloyd%must-have-coffee.gen.nz@localhost>
Pushed By:	lloyd
Date:		Tue Nov 1 13:43:10 2022 +1300
Changeset:	0873c82405ccf7eb67bcddc40a6e2034abc91422

Modified Files:
	yosys/Makefile
	yosys/distinfo
	yosys/patches/patch-kernel_rtlil.h
Removed Files:
	yosys/options.mk

Log Message:
Remove my PKGSRC_COMPILER cludge and replace it with a patch to RTLIL::IdString.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0873c82405ccf7eb67bcddc40a6e2034abc91422

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

diffstat:
 yosys/Makefile                     | 15 +++++++++------
 yosys/distinfo                     |  2 +-
 yosys/options.mk                   | 34 ----------------------------------
 yosys/patches/patch-kernel_rtlil.h |  2 +-
 4 files changed, 11 insertions(+), 42 deletions(-)

diffs:
diff --git a/yosys/Makefile b/yosys/Makefile
index 55cc1d0d4a..8c2c08ee06 100644
--- a/yosys/Makefile
+++ b/yosys/Makefile
@@ -14,7 +14,6 @@ LICENSE=	isc
 USE_LANGUAGES+=			c c++
 USE_TOOLS+=			gmake pkg-config bison gawk flex bash:test
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-# PKGCONFIG_CONFIG=		${PKG_CONFIG:Q}
 
 WRKSRC=			${WRKDIR}/yosys-${DISTNAME}
 TEST_TARGET=		test
@@ -55,8 +54,6 @@ SUBST_FILES.python+=	tests/tools/txt2tikztiming.py
 
 .include "../../mk/bsd.prefs.mk"
 
-.include "options.mk"
-
 .if ${OPSYS} != "Linux"
 BUILDLINK_TRANSFORM=	rm:-ldl
 .endif
@@ -64,12 +61,18 @@ BUILDLINK_TRANSFORM=	rm:-ldl
 do-configure:
 	${RUN} ${ECHO} 'CONFIG := ${YOSYS_CONFIG}' > ${WRKSRC}/Makefile.conf
 
-.if ${YOSYS_CONFIG} == "clang"
-.include "../../lang/clang/buildlink3.mk"
-.endif
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+YOSYS_CONFIG=		clang
+.elif !empty(PKGSRC_COMPILER:Mgcc)
+YOSYS_CONFIG=		gcc
+GCC_REQD+=		4.8.1
+.else
+.  error Yosys must be compiled with either GCC or Clang
+.endif
diff --git a/yosys/distinfo b/yosys/distinfo
index 546fe26c5a..58e3c07308 100644
--- a/yosys/distinfo
+++ b/yosys/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (yosys-0.22.tar.gz) = 4983725a68e89f2e5dbc341beb5deba28906c6ca84ecfe8dea
 SHA512 (yosys-0.22.tar.gz) = d546196a6875b0ecaaab44437b5691f08890576eed357ac99dce233a0afd352a56742f5286da406e4e5513be32db99811fc6caa7a7a605a94af3903670fbf616
 Size (yosys-0.22.tar.gz) = 2362180 bytes
 SHA1 (patch-kernel_rtlil.cc) = 9e85969577560c67dd40d2fa63702ca103511a4e
-SHA1 (patch-kernel_rtlil.h) = 6a50b94a8f053df1816739f4a87a9933cc1789ac
+SHA1 (patch-kernel_rtlil.h) = d468c6736227ac176c153540fdb230038ff113f3
 SHA1 (patch-kernel_yosys.cc) = 81e504f0a61baa47eca7cec021ae60d8ed432e3b
 SHA1 (patch-libs_fst_fstapi.cc) = 3be81ba51fc67b4578f956513dc5e3c531c7240d
 SHA1 (patch-tests_sim_run-test.sh) = 9f8149dcb024ab93f723ed0f85dd88a58168bf62
diff --git a/yosys/options.mk b/yosys/options.mk
deleted file mode 100644
index c5d128cce8..0000000000
--- a/yosys/options.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD$
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.yosys
-
-PKG_OPTIONS_REQUIRED_GROUPS=	compiler
-PKG_OPTIONS_GROUP.compiler=	gcc clang
-
-PKG_SUGGESTED_OPTIONS=	clang
-
-# On NetBSD only clang allows Yosys to pass its self tests.
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS=	clang
-.else
-PKG_SUGGESTED_OPTIONS=	gcc
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use clang to build Yosys
-###
-.if !empty(PKG_OPTIONS:Mclang)
-YOSYS_CONFIG=		clang
-BUILD_DEPENDS+=		clang-[0-9]*:../../lang/clang
-PKGSRC_COMPILER=	clang
-.endif
-
-###
-### Use GCC to build Yosys
-###
-.if !empty(PKG_OPTIONS:Mgcc)
-YOSYS_CONFIG=		gcc
-GCC_REQD+=		4.8.1
-.endif
diff --git a/yosys/patches/patch-kernel_rtlil.h b/yosys/patches/patch-kernel_rtlil.h
index eae8f4fed9..8d474e8734 100644
--- a/yosys/patches/patch-kernel_rtlil.h
+++ b/yosys/patches/patch-kernel_rtlil.h
@@ -9,7 +9,7 @@ Move the ok flag out of the destruct_guard_t so that GCC won't optimise
  
  		// the global id string cache
  
-+		bool destruct_guard_ok; // POD, will be initialized to zero
++		static bool destruct_guard_ok; // POD, will be initialized to zero
  		static struct destruct_guard_t {
 -			bool ok; // POD, will be initialized to zero
 -			destruct_guard_t() { ok = true; }