NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/znc: fix build with swig 4.1.x

Browse Source 
Buildroot commit 260924e239
"package/swig: bump to version 4.1.1"
broke the build of znc.

Fixes:
http://autobuild.buildroot.net/results/14c/14c44e94b6b588aa033f24202aa8437882cf8792/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2023-05-23 17:18:12 +02:00 committed by Peter Korsgaard
parent 742258fec0
commit 222d747eff
1 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch Normal file
View File

@ -0,0 +1,53 @@
From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Sat, 5 Nov 2022 12:54:40 +0000
Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1
https://bugs.gentoo.org/878587
Upstream: https://github.com/znc/znc/commit/fecdd9895894b3afe903021b0843a422eb4d3308
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
CMakeLists.txt | 2 +-
modules/modperl/CMakeLists.txt | 1 -
modules/modpython/CMakeLists.txt | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d43578e0e..efab0ee1ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS
endif()
endif()
if(search_swig)
- find_package(SWIG 3.0.0)
+ find_package(SWIG 4.0.1)
if(NOT SWIG_FOUND)
message(FATAL_ERROR
"Can't find SWIG, therefore Perl and Python aren't supported. "
diff --git a/modules/modperl/CMakeLists.txt b/modules/modperl/CMakeLists.txt
index e18fe47644..a87f74e478 100644
--- a/modules/modperl/CMakeLists.txt
+++ b/modules/modperl/CMakeLists.txt
@@ -53,7 +53,6 @@ if(SWIG_FOUND)
"-I${PROJECT_SOURCE_DIR}/include"
"-I${CMAKE_CURRENT_SOURCE_DIR}/.."
"-I${CMAKE_CURRENT_SOURCE_DIR}/include"
- -DZNC_EXPORT_LIB_EXPORT
-outdir "${CMAKE_CURRENT_BINARY_DIR}"
-o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/modperl.i"
diff --git a/modules/modpython/CMakeLists.txt b/modules/modpython/CMakeLists.txt
index edbeb41ed5..36a2e649f0 100644
--- a/modules/modpython/CMakeLists.txt
+++ b/modules/modpython/CMakeLists.txt
@@ -50,7 +50,6 @@ if(SWIG_FOUND)
"-I${PROJECT_BINARY_DIR}/include"
"-I${PROJECT_SOURCE_DIR}/include"
"-I${CMAKE_CURRENT_SOURCE_DIR}/.."
- -DZNC_EXPORT_LIB_EXPORT
-outdir "${CMAKE_CURRENT_BINARY_DIR}"
-o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/modpython.i"