Compare commits
107 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74b108992c | ||
|
|
b3992326f1 | ||
|
|
6eb1208d37 | ||
|
|
28a355063e | ||
|
|
ad62c005a3 | ||
|
|
9a1f1a1a55 | ||
|
|
36cdf9d256 | ||
|
|
7f3c4ff630 | ||
|
|
79b2996e10 | ||
|
|
6d8e3c9268 | ||
|
|
65e8c5a6c2 | ||
|
|
b2c552c89d | ||
|
|
fc387ae5fe | ||
|
|
967cd34363 | ||
|
|
b769227485 | ||
|
|
b2f85aac64 | ||
|
|
7c0f355005 | ||
|
|
eb7c0ebce6 | ||
|
|
7c322c4f69 | ||
|
|
797df90a0b | ||
|
|
07e662f6d6 | ||
|
|
abae643ad3 | ||
|
|
daa3574f6d | ||
|
|
2f97bd3f0c | ||
|
|
48a62aa030 | ||
|
|
5a53f07653 | ||
|
|
f77b41fc2e | ||
|
|
ed86a8d491 | ||
|
|
8b63a5b179 | ||
|
|
d32feca3e6 | ||
|
|
6463e51599 | ||
|
|
bef85e9f4f | ||
|
|
3cfcd3fd2e | ||
|
|
4fcc29d0a3 | ||
|
|
cfa2a17e5e | ||
|
|
a88b74f2ba | ||
|
|
3b57be16db | ||
|
|
1e5ff9449e | ||
|
|
bad99c2667 | ||
|
|
4043e54fe7 | ||
|
|
fa8219acb6 | ||
|
|
474931b379 | ||
|
|
f50f0e420e | ||
|
|
3fe391e859 | ||
|
|
5a104ce6fb | ||
|
|
f1e63a8640 | ||
|
|
cff75cf870 |
||
|
|
1d2ecc9240 |
||
|
|
37afcecc7c | ||
|
|
1fe0c72f6b | ||
|
|
f74f288cd0 | ||
|
|
c972358d36 | ||
|
|
34774501ed | ||
|
|
4adf2d1284 | ||
|
|
a2bd7ba1ee | ||
|
|
3b059fb6f1 | ||
|
|
7022269bc4 | ||
|
|
a7dae3fb98 | ||
|
|
cb9865cf16 | ||
|
|
c9c90115bf | ||
|
|
54b745be0c | ||
|
|
62dded8bac | ||
|
|
2cd003f12e | ||
|
|
fd0b982bf5 | ||
|
|
8f1b050297 | ||
|
|
f8b278b91f | ||
|
|
67adf0affe | ||
|
|
97c4bc9ad9 | ||
|
|
81741091cf | ||
|
|
035e9e01d4 | ||
|
|
174b2c16fc | ||
|
|
5d06ee3b49 | ||
|
|
6ad2ca7ed2 | ||
|
|
38e811319e | ||
|
|
4ddcbf8197 | ||
|
|
0390543ac4 | ||
|
|
84ea8a4c67 | ||
|
|
9f07bb8030 | ||
|
|
02347479a3 | ||
|
|
17b9b5c606 | ||
|
|
315c07294e | ||
|
|
bc26ef20c1 | ||
|
|
df96fc9c40 | ||
|
|
b74d8bc1be | ||
|
|
e084217e71 | ||
|
|
baabb14839 | ||
|
|
5a0337f3d0 | ||
|
|
e01a76a62b | ||
|
|
a4db9fed81 | ||
|
|
d4147f8e97 | ||
|
|
c80675afb5 | ||
|
|
34dd3b20b7 | ||
|
|
240dde22fb | ||
|
|
54392e7afe | ||
|
|
9d7264020b | ||
|
|
f3809a515c | ||
|
|
117a26f825 | ||
|
|
3729515865 | ||
|
|
1c915ba221 | ||
|
|
9f0aa1bdd1 | ||
|
|
14231323b5 | ||
|
|
cc9e686631 | ||
|
|
f1e1b711da | ||
|
|
6d2a9571f5 | ||
|
|
c8c0cd2376 | ||
|
|
de4494ca6c | ||
|
|
0d5f480a20 |
5 changed files with 579 additions and 56 deletions
11
.gitignore
vendored
11
.gitignore
vendored
|
|
@ -22,3 +22,14 @@ swig-2.0.0.tar.gz
|
|||
/swig-3.0.10.tar.gz
|
||||
/swig-3.0.11.tar.gz
|
||||
/swig-3.0.12.tar.gz
|
||||
/swig-4.0.0.tar.gz
|
||||
/swig-4.0.1.tar.gz
|
||||
/swig-4.0.2.tar.gz
|
||||
/swig-4.1.0.tar.gz
|
||||
/swig-4.1.1.tar.gz
|
||||
/swig-4.2.0.tar.gz
|
||||
/swig-4.2.1.tar.gz
|
||||
/swig-4.3.0.tar.gz
|
||||
/swig-4.3.1.tar.gz
|
||||
/swig-4.4.0.tar.gz
|
||||
/swig-4.4.1.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (swig-3.0.12.tar.gz) = 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb
|
||||
SHA512 (swig-4.4.1.tar.gz) = 103ddb4a5914f28e6739a006d35042c701e55ba05066acff3f3609befb5f43f253ea717fc41d06c93d8fb187ded4399c12c94665b93dc06d0fb835069391c7c7
|
||||
|
|
|
|||
153
swig-python-Python-3.14-support.patch
Normal file
153
swig-python-Python-3.14-support.patch
Normal file
|
|
@ -0,0 +1,153 @@
|
|||
From 50e1cc8bc0d090164762ec166439f8b0f3855308 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Schueller <schueller@phimeca.com>
|
||||
Date: Thu, 10 Apr 2025 17:22:15 +0200
|
||||
Subject: [PATCH 1/3] Python: Handle __package__ removal
|
||||
|
||||
Closes #2967
|
||||
---
|
||||
Doc/Manual/Python.html | 6 +++---
|
||||
Source/Modules/python.cxx | 8 +++++---
|
||||
2 files changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
|
||||
index 23587e5dbcc..01fc449a68a 100644
|
||||
--- a/Doc/Manual/Python.html
|
||||
+++ b/Doc/Manual/Python.html
|
||||
@@ -6552,7 +6552,7 @@ <H4><a name="Python_package_search_both_package_modules">33.11.6.1 Both modules
|
||||
|
||||
<p>
|
||||
In this configuration, the pure Python module, foo.py, tries to load the C/C++ module, _foo, from the same package foo.py is
|
||||
-located in. The package name is determined from the <tt>__package__</tt>
|
||||
+located in. The package name is determined from the <tt>__spec__.parent</tt> (or <tt>__package__</tt> before Python 3.4)
|
||||
attribute if available, see <a href="https://www.python.org/dev/peps/pep-0366/">PEP 366</a>. Otherwise it is derived from the <tt>__name__</tt>
|
||||
attribute given to foo.py by the Python loader that imported foo.py.
|
||||
The interface file for this configuration would contain:
|
||||
@@ -6675,7 +6675,7 @@ <H4><a name="Python_custom_module_import">33.11.6.4 More on customizing the modu
|
||||
|
||||
<div class="targetlang">
|
||||
<pre>
|
||||
-if __package__ or '.' in __name__:
|
||||
+if getattr(__spec__, "parent", None) or '.' in __name__:
|
||||
from . import _foo
|
||||
else:
|
||||
import _foo
|
||||
@@ -6760,7 +6760,7 @@ <H4><a name="Python_custom_module_import">33.11.6.4 More on customizing the modu
|
||||
|
||||
<div class="targetlang">
|
||||
<pre>
|
||||
-if __package__ or '.' in __name__:
|
||||
+if getattr(__spec__, "parent", None) or '.' in __name__:
|
||||
from ._foo import *
|
||||
else:
|
||||
from _foo import *
|
||||
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
|
||||
index 86daf131c8b..a71fc3cdb25 100644
|
||||
--- a/Source/Modules/python.cxx
|
||||
+++ b/Source/Modules/python.cxx
|
||||
@@ -703,20 +703,22 @@ class PYTHON:public Language {
|
||||
* onwards (implicit relative imports raised a DeprecationWarning in 2.6,
|
||||
* and fail in 2.7 onwards).
|
||||
*
|
||||
- * First check for __package__ which is available from 2.6 onwards, see PEP366.
|
||||
+ * First check for __spec__.parent which is available from 3.4 onwards,
|
||||
+ * see https://docs.python.org/3/reference/import.html#spec. If not,
|
||||
+ * check for __package__, which was set before 3.14.
|
||||
* Next try determine the shadow wrapper's package based on the __name__ it
|
||||
* was given by the importer that loaded it.
|
||||
* If the module is in a package, load the low-level C/C++ module from the
|
||||
* same package, otherwise load it as a global module.
|
||||
*/
|
||||
Printv(default_import_code, "# Import the low-level C/C++ module\n", NULL);
|
||||
- Printv(default_import_code, "if __package__ or \".\" in __name__:\n", NULL);
|
||||
+ Printv(default_import_code, "if getattr(globals().get(\"__spec__\"), \"parent\", None) or globals().get(\"__package__\") or \".\" in __name__:\n", NULL);
|
||||
Printv(default_import_code, tab4, "from . import ", module, "\n", NULL);
|
||||
Printv(default_import_code, "else:\n", NULL);
|
||||
Printv(default_import_code, tab4, "import ", module, "\n", NULL);
|
||||
} else {
|
||||
Printv(default_import_code, "# Pull in all the attributes from the low-level C/C++ module\n", NULL);
|
||||
- Printv(default_import_code, "if __package__ or \".\" in __name__:\n", NULL);
|
||||
+ Printv(default_import_code, "if getattr(globals().get(\"__spec__\"), \"parent\", None) or globals().get(\"__package__\") or \".\" in __name__:\n", NULL);
|
||||
Printv(default_import_code, tab4, "from .", module, " import *\n", NULL);
|
||||
Printv(default_import_code, "else:\n", NULL);
|
||||
Printv(default_import_code, tab4, "from ", module, " import *\n", NULL);
|
||||
|
||||
From 3bfdf13c602f877860a9949ba751a5b5a9ba70aa Mon Sep 17 00:00:00 2001
|
||||
From: Julien Schueller <schueller@phimeca.com>
|
||||
Date: Thu, 10 Apr 2025 18:35:25 +0200
|
||||
Subject: [PATCH 2/3] Python: Add ht_token
|
||||
|
||||
---
|
||||
Source/Modules/python.cxx | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
|
||||
index a71fc3cdb25..3070a94face 100644
|
||||
--- a/Source/Modules/python.cxx
|
||||
+++ b/Source/Modules/python.cxx
|
||||
@@ -4374,6 +4374,11 @@ class PYTHON:public Language {
|
||||
Printv(f, "#if PY_VERSION_HEX >= 0x030b0000\n", NIL);
|
||||
printSlot(f, getSlot(n, "feature:python:_ht_tpname"), "_ht_tpname", "char *");
|
||||
|
||||
+ // void *ht_token;
|
||||
+ Printv(f, "#if PY_VERSION_HEX >= 0x030e0000\n", NIL);
|
||||
+ printSlot(f, getSlot(n, "feature:python:ht_token"), "ht_token", "void *");
|
||||
+ Printv(f, "#endif\n", NIL);
|
||||
+
|
||||
// struct _specialization_cache _spec_cache;
|
||||
Printf(f, " {\n");
|
||||
printSlot(f, getSlot(n, "feature:python:getitem"), "getitem", "PyObject *");
|
||||
|
||||
From 55237efa7219f65a04e0ffc69a81c574b5f5e162 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Schueller <schueller@phimeca.com>
|
||||
Date: Thu, 10 Apr 2025 17:47:59 +0200
|
||||
Subject: [PATCH 3/3] Python: Amend annotations test
|
||||
|
||||
---
|
||||
.../python_annotations_variable_c_runme.py | 24 +++++++++++++------
|
||||
1 file changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Examples/test-suite/python/python_annotations_variable_c_runme.py b/Examples/test-suite/python/python_annotations_variable_c_runme.py
|
||||
index 153852d05e6..d1f359bbbd0 100644
|
||||
--- a/Examples/test-suite/python/python_annotations_variable_c_runme.py
|
||||
+++ b/Examples/test-suite/python/python_annotations_variable_c_runme.py
|
||||
@@ -1,4 +1,17 @@
|
||||
import sys
|
||||
+import inspect
|
||||
+
|
||||
+
|
||||
+def get_annotations(cls):
|
||||
+ # Python >=3.14 removed the __annotations__ attribute
|
||||
+ # retrieve it via inspect (see also annotationlib)
|
||||
+ if hasattr(inspect, "get_annotations"):
|
||||
+ # Python >=3.10
|
||||
+ return inspect.get_annotations(cls)
|
||||
+ else:
|
||||
+ # Python <3.10
|
||||
+ return getattr(cls, "__annotations__", {})
|
||||
+
|
||||
|
||||
# Variable annotations for properties is only supported in python-3.6 and later (PEP 526)
|
||||
if sys.version_info[0:2] >= (3, 6):
|
||||
@@ -8,17 +21,14 @@
|
||||
annotations_supported = not(is_python_builtin() or is_python_fastproxy())
|
||||
|
||||
if annotations_supported:
|
||||
- ts = TemplateShort()
|
||||
- anno = ts.__annotations__
|
||||
+ anno = get_annotations(TemplateShort)
|
||||
if anno != {'member_variable': 'int'}:
|
||||
raise RuntimeError("annotations mismatch: {}".format(anno))
|
||||
|
||||
- ts = StructWithVar()
|
||||
- anno = ts.__annotations__
|
||||
+ anno = get_annotations(StructWithVar)
|
||||
if anno != {'member_variable': 'int'}:
|
||||
raise RuntimeError("annotations mismatch: {}".format(anno))
|
||||
|
||||
- ts = StructWithVarNotAnnotated()
|
||||
- if getattr(ts, "__annotations__", None) != None:
|
||||
- anno = ts.__annotations__
|
||||
+ anno = get_annotations(StructWithVarNotAnnotated)
|
||||
+ if anno != {}:
|
||||
raise RuntimeError("annotations mismatch: {}".format(anno))
|
||||
|
||||
456
swig.spec
456
swig.spec
|
|
@ -1,53 +1,95 @@
|
|||
# We can skip tests
|
||||
%bcond_without testsuite
|
||||
|
||||
%{!?tcl:%global tcl 1}
|
||||
%{!?guile:%global guile 0}
|
||||
%{!?lualang:%global lualang 1}
|
||||
%{!?phplang:%global phplang 1}
|
||||
%{!?rubylang:%global rubylang 1}
|
||||
%if %{without testsuite}
|
||||
%global tcl 0
|
||||
%global guile 0
|
||||
%global lualang 0
|
||||
%global perllang 0
|
||||
%global phplang 0
|
||||
%global rubylang 0
|
||||
%global python3lang 0
|
||||
%global golang 0
|
||||
%global octave 0
|
||||
%global Rlang 0
|
||||
%global javalang 0
|
||||
%global ocamllang 0
|
||||
%endif
|
||||
|
||||
%ifarch aarch64 %{arm} %{mips} ppc64le ppc %{power64} s390 s390x
|
||||
%{!?golang:%global golang 0}
|
||||
%{!?Rlang:%global Rlang 0}
|
||||
%{!?javalang:%global javalang 0}
|
||||
%{!?tcl:%global tcl 1}
|
||||
%{!?lualang:%global lualang 1}
|
||||
%{!?perllang:%global perllang 1}
|
||||
%{!?rubylang:%global rubylang 1}
|
||||
%{!?python3lang:%global python3lang 1}
|
||||
|
||||
# PHP drop support for 32-bit builds since Fedora 41.
|
||||
%if 0%{?fedora} >= 41 || 0%{?rhel} >= 11
|
||||
%ifarch %{ix86}
|
||||
%global phplang 0
|
||||
%endif
|
||||
%endif
|
||||
%{!?phplang:%global phplang 1}
|
||||
|
||||
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
|
||||
%ifarch %{ix86}
|
||||
%{!?ocamllang:%global ocamllang 0}
|
||||
%else
|
||||
%{!?ocamllang:%global ocamllang 1}
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
%{!?golang:%global golang 0}
|
||||
%{!?guile:%global guile 0}
|
||||
%{!?octave:%global octave 0}
|
||||
%{!?Rlang:%global Rlang 0}
|
||||
%bcond_with build_ccache_swig
|
||||
%else
|
||||
%{!?golang:%global golang 1}
|
||||
%{!?Rlang:%global Rlang 1}
|
||||
%{!?guile:%global guile 1}
|
||||
%{!?octave:%global octave 1}
|
||||
# R-core requires tcl < 9.0.0
|
||||
%{!?Rlang:%global Rlang 0}
|
||||
%bcond_without build_ccache_swig
|
||||
%endif
|
||||
|
||||
%ifarch %{ix86}
|
||||
%{!?javalang:%global javalang 0}
|
||||
%else
|
||||
# Temporary disable java tests, because they doesn't pass with java-21-openjdk
|
||||
# https://github.com/swig/swig/issues/2767
|
||||
%{!?javalang:%global javalang 1}
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
%{!?octave:%global octave 0}
|
||||
# Do not run Go tests, they failed with 4.0.0 on ppc64le, s390
|
||||
%ifarch x86_64 %{arm} aarch64
|
||||
%{!?golang:%global golang 1}
|
||||
%else
|
||||
%{!?octave:%global octave 1}
|
||||
%{!?golang:%global golang 0}
|
||||
%endif
|
||||
|
||||
Summary: Connects C/C++/Objective C to some high-level programming languages
|
||||
Name: swig
|
||||
Version: 3.0.12
|
||||
Release: 5%{?dist}
|
||||
License: GPLv3+ and BSD
|
||||
URL: http://swig.sourceforge.net/
|
||||
Version: 4.4.1
|
||||
Release: 1%{?dist}
|
||||
License: GPL-3.0-or-later AND BSD-3-Clause
|
||||
URL: https://www.swig.org/
|
||||
Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
|
||||
# Define the part of man page sections
|
||||
Source1: description.h2m
|
||||
%if %{with build_ccache_swig}
|
||||
Source2: description-ccache.h2m
|
||||
Source3: ccache-swig.sh
|
||||
Source4: ccache-swig.csh
|
||||
%endif
|
||||
|
||||
Patch0: swig308-Do-not-use-isystem.patch
|
||||
|
||||
BuildRequires: perl, pcre-devel
|
||||
BuildRequires: python2-devel, python3-devel
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: findutils
|
||||
BuildRequires: make
|
||||
BuildRequires: perl-interpreter, pcre2-devel
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: autoconf, automake, gawk, dos2unix
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: help2man
|
||||
BuildRequires: sed
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: perl(base)
|
||||
BuildRequires: perl(Config)
|
||||
|
|
@ -60,8 +102,10 @@ BuildRequires: perl(Test::More)
|
|||
BuildRequires: perl(vars)
|
||||
BuildRequires: perl(warnings)
|
||||
BuildRequires: boost-devel
|
||||
# Need when Source/CParse/parser.y is patched
|
||||
BuildRequires: bison
|
||||
%if %{tcl}
|
||||
BuildRequires: tcl-devel
|
||||
BuildRequires: tcl-devel >= 9.0.0
|
||||
%endif
|
||||
%if %{guile}
|
||||
BuildRequires: guile-devel
|
||||
|
|
@ -71,6 +115,10 @@ BuildRequires: octave-devel
|
|||
%endif
|
||||
%if %{golang}
|
||||
BuildRequires: golang
|
||||
BuildRequires: golang-bin
|
||||
%ifnarch s390x
|
||||
BuildRequires: golang-shared
|
||||
%endif
|
||||
BuildRequires: golang-src
|
||||
%endif
|
||||
%if %{lualang}
|
||||
|
|
@ -88,21 +136,28 @@ BuildRequires: java, java-devel
|
|||
%if %{phplang}
|
||||
BuildRequires: php, php-devel
|
||||
%endif
|
||||
%if %{ocamllang}
|
||||
BuildRequires: ocaml
|
||||
BuildRequires: ocaml-findlib
|
||||
%endif
|
||||
|
||||
%description
|
||||
Simplified Wrapper and Interface Generator (SWIG) is a software
|
||||
development tool for connecting C, C++ and Objective C programs with a
|
||||
variety of high-level programming languages. SWIG is primarily used
|
||||
with Perl, Python and Tcl/TK, but it has also been extended to Java,
|
||||
Eiffel and Guile. SWIG is normally used to create high-level
|
||||
interpreted programming environments, systems integration, and as a
|
||||
tool for building user interfaces
|
||||
variety of high-level programming languages. SWIG is used with different
|
||||
types of target languages including common scripting languages such as
|
||||
Javascript, Perl, PHP, Python, Tcl and Ruby. The list of supported
|
||||
languages also includes non-scripting languages such as C#, D, Go language,
|
||||
Java including Android, Lua, OCaml, Octave, Scilab and R. Also several
|
||||
interpreted and compiled Scheme implementations (Guile, MzScheme/Racket)
|
||||
are supported. SWIG is most commonly used to create high-level interpreted
|
||||
or compiled programming environments, user interfaces, and as a tool for
|
||||
testing and prototyping C/C++ software.
|
||||
|
||||
%if %{with build_ccache_swig}
|
||||
%package -n ccache-swig
|
||||
Summary: Fast compiler cache
|
||||
License: GPLv2+
|
||||
Group: Development/Tools
|
||||
Requires: ccache
|
||||
License: GPL-2.0-or-later
|
||||
Requires: swig
|
||||
Conflicts: swig < 3.0.8-2
|
||||
|
||||
|
|
@ -110,11 +165,11 @@ Conflicts: swig < 3.0.8-2
|
|||
ccache-swig is a compiler cache. It speeds up re-compilation of C/C++/SWIG
|
||||
code by caching previous compiles and detecting when the same compile is
|
||||
being done again. ccache-swig is ccache plus support for SWIG.
|
||||
%endif
|
||||
|
||||
%package doc
|
||||
Summary: Documentation files for SWIG
|
||||
License: BSD
|
||||
Group: Development/Tools
|
||||
License: BSD-3-Clause
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
|
|
@ -122,7 +177,7 @@ This package contains documentation for SWIG and useful examples
|
|||
|
||||
%package gdb
|
||||
Summary: Commands for easier debugging of SWIG
|
||||
License: BSD
|
||||
License: BSD-3-Clause
|
||||
Requires: swig
|
||||
|
||||
%description gdb
|
||||
|
|
@ -130,9 +185,7 @@ This package contains file with commands for easier debugging of SWIG
|
|||
in gdb.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1 -b .isystem
|
||||
%autosetup -p1
|
||||
|
||||
for all in CHANGES README; do
|
||||
iconv -f ISO88591 -t UTF8 < $all > $all.new
|
||||
|
|
@ -147,9 +200,26 @@ done
|
|||
# code produces lots of the warnings demanded by strict ISO C and ISO C++.
|
||||
# It causes that log had more then 600M.
|
||||
%configure \
|
||||
%if %{ocamllang}
|
||||
--with-ocaml \
|
||||
%else
|
||||
--without-ocaml \
|
||||
%endif
|
||||
%if %{python3lang}
|
||||
--with-python3=python3 \
|
||||
%else
|
||||
--without-python3 \
|
||||
%endif
|
||||
%if %{phplang}
|
||||
--with-php=%{__php} \
|
||||
--with-php \
|
||||
%else
|
||||
--without-php \
|
||||
%endif
|
||||
%if ! %{perllang}
|
||||
--without-perl5 \
|
||||
%endif
|
||||
%if ! %{tcl}
|
||||
--without-tcl \
|
||||
%endif
|
||||
%if ! %{javalang}
|
||||
--without-java \
|
||||
|
|
@ -160,16 +230,22 @@ done
|
|||
%if ! %{golang}
|
||||
--without-go \
|
||||
%endif
|
||||
%if ! %{guile}
|
||||
--without-guile \
|
||||
%endif
|
||||
%if %{octave}
|
||||
--with-octave=/usr/bin/octave \
|
||||
--with-octave=%{_bindir}/octave \
|
||||
--without-maximum-compile-warnings \
|
||||
%endif
|
||||
%if %{without build_ccache_swig}
|
||||
--disable-ccache \
|
||||
%endif
|
||||
;
|
||||
make %{?_smp_mflags}
|
||||
%{make_build}
|
||||
|
||||
%if %{with testsuite}
|
||||
# Test suite
|
||||
make check
|
||||
make check PY3=1
|
||||
%endif
|
||||
|
||||
%install
|
||||
|
|
@ -192,7 +268,7 @@ for all in `find -type f`; do
|
|||
done
|
||||
popd
|
||||
|
||||
make DESTDIR=%{buildroot} install
|
||||
%{make_install}
|
||||
|
||||
#################################################
|
||||
# Use help output for generating of man page swig
|
||||
|
|
@ -213,6 +289,7 @@ chmod a+x h2m_helper_swig
|
|||
# Generate man page
|
||||
help2man -N --section 1 ./h2m_helper_swig --include %{SOURCE1} -o %{name}.1
|
||||
|
||||
%if %{with build_ccache_swig}
|
||||
########################################################
|
||||
# Use help output for generating of man page ccache-swig
|
||||
%{buildroot}%{_bindir}/ccache-swig -h >>help_ccache
|
||||
|
|
@ -239,19 +316,24 @@ sed -i -e 's#@DOCDIR@#%{_docdir}#' help_ccache
|
|||
|
||||
# Generate man page
|
||||
help2man -N --section 1 ./h2m_helper_ccache --include help_ccache -o ccache-swig.1
|
||||
%endif
|
||||
|
||||
# Add man page for swig to repository
|
||||
mkdir -p %{buildroot}%{_mandir}/man1/
|
||||
install -p -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/
|
||||
%if %{with build_ccache_swig}
|
||||
install -p -m 0644 ccache-swig.1 %{buildroot}%{_mandir}/man1/
|
||||
%endif
|
||||
|
||||
# Quiet some rpmlint complaints - remove empty file
|
||||
rm -f %{buildroot}%{_datadir}/%name/%{version}/octave/std_carray.i
|
||||
|
||||
%if %{with build_ccache_swig}
|
||||
# Enable ccache-swig by default
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/profile.d/
|
||||
install -dm 755 %{buildroot}%{_sysconfdir}/profile.d
|
||||
install -pm 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d
|
||||
%endif
|
||||
|
||||
# Add swig.gdb sub-package gdb
|
||||
mkdir -p %{buildroot}%{_datadir}/%{name}/gdb
|
||||
|
|
@ -266,10 +348,12 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb
|
|||
%doc ANNOUNCE CHANGES CHANGES.current
|
||||
%doc COPYRIGHT README TODO
|
||||
|
||||
%if %{with build_ccache_swig}
|
||||
%files -n ccache-swig
|
||||
%{_bindir}/ccache-swig
|
||||
%config(noreplace) %{_sysconfdir}/profile.d/ccache-swig.*sh
|
||||
%{_mandir}/man1/ccache-swig.1*
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%license LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
|
||||
|
|
@ -279,6 +363,294 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb
|
|||
%{_datadir}/%{name}/gdb
|
||||
|
||||
%changelog
|
||||
* Mon Dec 08 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.4.1-1
|
||||
- 4.4.1 bump (rhbz#2419819, rhbz#2415440)
|
||||
|
||||
* Tue Oct 21 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.4.0-1
|
||||
- 4.4.0 bump (rhbz#2405182)
|
||||
|
||||
* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 4.3.1-6
|
||||
- OCaml 5.4.0 rebuild
|
||||
|
||||
* Thu Aug 07 2025 Orion Poplawski <orion@nwra.com> - 4.3.1-5
|
||||
- Rebuild for Octave 10.2
|
||||
|
||||
* Thu Jul 31 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.1-4
|
||||
- Fix Python DeprecationWarning
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Wed Jun 25 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 4.3.1-2
|
||||
- Add Python 3.14 support
|
||||
|
||||
* Wed Apr 16 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.1-1
|
||||
- 4.3.1 bump (rhbz#2360009)
|
||||
|
||||
* Mon Feb 17 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.0-5
|
||||
- Disable R tests, because they need tcl < 9
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Nov 14 2024 Orion Poplawski <orion@nwra.com> - 4.3.0-3
|
||||
- Rebuild for octave 9.2
|
||||
|
||||
* Tue Oct 29 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.0-2
|
||||
- Fix precedence of casts
|
||||
|
||||
* Mon Oct 21 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.0-1
|
||||
- 4.3.0 bump (rhbz#2320047)
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sun Jun 23 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 4.2.1-7
|
||||
- Rebuild for Python 3.13
|
||||
|
||||
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 4.2.1-6
|
||||
- OCaml 5.2.0 ppc64le fix
|
||||
|
||||
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 4.2.1-5
|
||||
- OCaml 5.2.0 for Fedora 41
|
||||
|
||||
* Mon Apr 29 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4.2.1-4
|
||||
- Fix gcc's -Wformat-security warning in R Raise function (rhbz#2277767)
|
||||
|
||||
* Fri Apr 12 2024 Remi Collet <remi@remirepo.net> - 4.2.1-3
|
||||
- disable PHP support on 32-bit
|
||||
https://fedoraproject.org/wiki/Changes/php_no_32_bit
|
||||
|
||||
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 4.2.1-2
|
||||
- Rebuilt for java-21-openjdk as system jdk
|
||||
- Temporary disable java tests (rhbz#2266693)
|
||||
|
||||
* Mon Feb 26 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4.2.1-1
|
||||
- 4.2.1 bump (rhbz#2265786)
|
||||
|
||||
* Tue Jan 23 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4.2.0-1
|
||||
- 4.2.0 bump
|
||||
|
||||
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 4.1.1-15
|
||||
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
|
||||
|
||||
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 4.1.1-14
|
||||
- OCaml 5.1.1 rebuild for Fedora 40
|
||||
|
||||
* Thu Dec 07 2023 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.1-13
|
||||
- Fix PHP director_classes testcase failures on x86
|
||||
|
||||
* Fri Oct 20 2023 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.1-12
|
||||
- Stop using Python's 2to3
|
||||
|
||||
* Wed Oct 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.1-11
|
||||
- Fix PHP test, it fails with PHP 8.3
|
||||
|
||||
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 4.1.1-10
|
||||
- OCaml 5.1 rebuild for Fedora 40
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Jul 12 2023 Jerry James <loganjerry@gmail.com> - 4.1.1-8
|
||||
- Add patch for python 3.12
|
||||
|
||||
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 4.1.1-8
|
||||
- OCaml 5.0 rebuild for Fedora 39
|
||||
|
||||
* Tue Jun 20 2023 Jerry James <loganjerry@gmail.com> - 4.1.1-7
|
||||
- Enable OCaml support
|
||||
- Add patch for OCaml 5.0.0
|
||||
|
||||
* Sat Apr 08 2023 Orion Poplawski <orion@nwra.com> - 4.1.1-6
|
||||
- Rebuild with octave 8.1.0
|
||||
|
||||
* Thu Mar 16 2023 Orion Poplawski <orion@nwra.com> - 4.1.1-5
|
||||
- Add patch to support octave 8.1
|
||||
|
||||
* Thu Feb 02 2023 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.1-4
|
||||
- Disable PHP test on i686
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jan 12 2023 Florian Weimer <fweimer@redhat.com> - 4.1.1-2
|
||||
- Port configure script to C99
|
||||
|
||||
* Thu Dec 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.1-1
|
||||
- Update to 4.1.1
|
||||
|
||||
* Tue Oct 25 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0-1
|
||||
- Update to 4.1.0
|
||||
|
||||
* Thu Jul 21 2022 Maxwell G <gotmax@e.email> - 4.0.2-18
|
||||
- Exclude golang extension from i686
|
||||
|
||||
* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 4.0.2-17
|
||||
- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in
|
||||
golang
|
||||
|
||||
* Sat Jun 18 2022 Robert-André Mauchin <zebob.m@gmail.com> - 4.0.2-16
|
||||
- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
|
||||
CVE-2022-29526, CVE-2022-30629
|
||||
|
||||
* Wed Jun 01 2022 Orion Poplawski <orion@nwra.com> - 4.0.2-15
|
||||
- Rebuild for octave 7.1
|
||||
|
||||
* Thu Feb 24 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.2-14
|
||||
- Disable Java tests
|
||||
|
||||
* Sat Jan 22 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.2-13
|
||||
- Fix tests against GCC12, enable Guile tests
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Nov 24 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.2-11
|
||||
- Disable PHP test, it fails with PHP 8.1
|
||||
|
||||
* Thu Oct 07 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.2-10
|
||||
- Enable Python tests
|
||||
|
||||
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 4.0.2-9
|
||||
- Rebuild for octave 6.3.0
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jul 15 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.2-7
|
||||
- Disable Python tests, they fail with 3.10.0~b2
|
||||
|
||||
* Mon May 31 2021 Orion Poplawski <orion@nwra.com> - 4.0.2-6
|
||||
- Add patch for octave 6 support (bz#1919617)
|
||||
|
||||
* Fri Mar 05 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.2-5
|
||||
- Backport support of PHP8 from upstream
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Aug 28 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.2-3
|
||||
- Enable tests for Python 3
|
||||
|
||||
* Wed Jul 29 2020 Tom Stellard <tstellar@redhat.com> - 4.0.2-2
|
||||
- Use make macros
|
||||
https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||
- Disable Go tests
|
||||
|
||||
* Mon Jun 08 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.2-1
|
||||
- Update to 4.0.2
|
||||
|
||||
* Fri Mar 06 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1-9
|
||||
- Remove BR for Python 2 (bug#1807547)
|
||||
|
||||
* Tue Feb 25 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 4.0.1-8
|
||||
- Add fix for newer NodeJS version
|
||||
|
||||
* Tue Feb 04 2020 Michael Jeanson <mjeanson@efficios.com> - 4.0.1-7
|
||||
- Fix crash in Python backend when using empty docstrings
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jan 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1-5
|
||||
- Add support for Ruby 2.7
|
||||
- Fix code generated for Ruby global variables
|
||||
|
||||
* Sat Jan 18 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.0.1-4
|
||||
- Backport upstream fixes for ruby 2.7 (as small as possible for now)
|
||||
|
||||
* Tue Nov 19 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1-3
|
||||
- Disable Ruby tests on all archs
|
||||
|
||||
* Thu Oct 17 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1-2
|
||||
- Disable Ruby tests on x86_64
|
||||
|
||||
* Wed Aug 21 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1-1
|
||||
- Update to 4.0.1
|
||||
- Add Python 3.8 support
|
||||
- Python Sphinx compatibility added for Doxygen comments
|
||||
- Fix some C++17 compatibility problems in Python and Ruby generated
|
||||
code
|
||||
|
||||
* Mon Aug 12 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.0-5
|
||||
- Backport upstream fix for Go tests (BZ#1736731)
|
||||
|
||||
* Tue Aug 06 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.0-4
|
||||
- Disable Go tests, they fail with Go 1.13-beta
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Jun 05 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.0-2
|
||||
- Updated package description
|
||||
|
||||
* Fri May 03 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.0-1
|
||||
- Update to 4.0.0
|
||||
|
||||
* Sat Apr 27 2019 Orion Poplawski <orion@nwra.com> - 3.0.12-25
|
||||
- Add patches for octave 5.1 support
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.12-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 3.0.12-23
|
||||
- Rebuilt for Boost 1.69
|
||||
|
||||
* Thu Nov 15 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-22
|
||||
- Add support for Octave 4.4
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.12-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.12-20
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Fri Jun 22 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-19
|
||||
- Disable using of Python 2
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.12-18
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Tue Apr 24 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-17
|
||||
- Backport upstream Coverity fixes (bug#1570037)
|
||||
- Do not build ccache-swig on RHEL
|
||||
|
||||
* Wed Feb 14 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-16
|
||||
- Update conditions for tests
|
||||
- Fix configure to properly check version of Go 1.10
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.12-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Tue Jan 23 2018 Jonathan Wakely <jwakely@redhat.com> - 3.0.12-14
|
||||
- Rebuilt for Boost 1.66
|
||||
|
||||
* Tue Nov 21 2017 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-13
|
||||
- Disable PHP tests, because they fail with PHP 7.2.0-RC
|
||||
|
||||
* Wed Sep 20 2017 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-12
|
||||
- Fix generated code for constant expressions containing wchar_t L
|
||||
literals
|
||||
|
||||
* Thu Sep 07 2017 Jared Smith <jsmith@fedoraproject.org> - 3.0.12-11
|
||||
- Add patch to support NodeJS versions 7 and 8, fixes FTBFS
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.12-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.12-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jun 14 2017 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-8
|
||||
- Fixed tests to building on Perl 5.26 without dot in INC
|
||||
|
||||
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.12-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
||||
|
||||
* Sat Apr 29 2017 Björn Esser <besser82@fedoraproject.org> - 3.0.12-6
|
||||
- Rebuilt for bootstrapping new arch: s390x
|
||||
|
||||
* Mon Feb 13 2017 Björn Esser <besser82@fedoraproject.org> - 3.0.12-5
|
||||
- Rebuilt with R-testsuite enabled
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff -up swig-3.0.8/configure.ac.orig swig-3.0.8/configure.ac
|
||||
--- swig-3.0.8/configure.ac.orig 2016-02-02 16:01:09.094852303 +0100
|
||||
+++ swig-3.0.8/configure.ac 2016-02-02 16:01:42.096702679 +0100
|
||||
@@ -131,7 +131,8 @@ AC_SUBST(BOOST_CPPFLAGS)
|
||||
dnl How to specify include directories that may be system directories.
|
||||
# -I should not be used on system directories (GCC)
|
||||
if test "$GCC" = yes; then
|
||||
- ISYSTEM="-isystem "
|
||||
+# ISYSTEM="-isystem "
|
||||
+ ISYSTEM="-I"
|
||||
else
|
||||
ISYSTEM="-I"
|
||||
fi
|
||||
Loading…
Add table
Add a link
Reference in a new issue