Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
libfirm fixes for py3.12
To:
Brian Callahan <bcallah@devio.us>
Cc:
ports <ports@openbsd.org>
Date:
Wed, 18 Dec 2024 10:28:41 +0000

Download raw body.

Thread
  • Stuart Henderson:

    libfirm fixes for py3.12

needed for 3.12, but won't hurt earlier versions. ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libfirm/Makefile,v
diff -u -p -r1.8 Makefile
--- Makefile	6 May 2024 12:22:41 -0000	1.8
+++ Makefile	18 Dec 2024 10:28:18 -0000
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS =	amd64 arm i386
 COMMENT =	graph based intermediate representation and backend
 DISTNAME =	${GH_PROJECT}-1.22.1pl3
 CATEGORIES =	devel
-REVISION =	0
+REVISION =	1

 SHARED_LIBS +=	firm                      3.0 # 3.0

Index: patches/patch-scripts_filters_py
===================================================================
RCS file: patches/patch-scripts_filters_py
diff -N patches/patch-scripts_filters_py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-scripts_filters_py	18 Dec 2024 10:28:18 -0000
@@ -0,0 +1,16 @@
+Python 3.12 warns on invalid escape sequences
+https://github.com/python/cpython/pull/99011
+https://github.com/libfirm/libfirm/pull/34
+
+Index: scripts/filters.py
+--- scripts/filters.py.orig
++++ scripts/filters.py
+@@ -6,7 +6,7 @@ import re
+
+
+ def filtjoin(string, joinstring):
+-    args = re.split('\s*\n\s*', string)
++    args = re.split(r"\s*\n\s*", string)
+     if args[0] == '':
+         args = args[1:]
+     if len(args) > 0 and args[-1] == '':
Index: patches/patch-scripts_irops_py
===================================================================
RCS file: patches/patch-scripts_irops_py
diff -N patches/patch-scripts_irops_py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-scripts_irops_py	18 Dec 2024 10:28:18 -0000
@@ -0,0 +1,15 @@
+Python 3.12 removes imp module (deprecated since 3.4),
+it's not actually used in this script anyway.
+https://github.com/libfirm/libfirm/pull/34
+
+Index: scripts/irops.py
+--- scripts/irops.py.orig
++++ scripts/irops.py
+@@ -1,7 +1,6 @@
+ from jinjautil import export_filter, export
+ #from jinja2._compat import string_types use str instead
+ from filters import arguments
+-import imp
+ import sys
+
+