[packages/ntopng] - fix building o x32
baggins
baggins at pld-linux.org
Mon Oct 2 07:05:07 CEST 2023
commit a568f895da5cdc02233ca286c2b8d5ff5e8ae508
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Oct 2 05:34:17 2023 +0200
- fix building o x32
ntopng.spec | 2 ++
x32.patch | 11 +++++++++++
2 files changed, 13 insertions(+)
---
diff --git a/ntopng.spec b/ntopng.spec
index caf728b..7f38ac4 100644
--- a/ntopng.spec
+++ b/ntopng.spec
@@ -11,6 +11,7 @@ Source0: https://github.com/ntop/ntopng/archive/%{version}/%{name}-%{version}.ta
Source1: https://github.com/ntop/nDPI/archive/%{ndpi_ver}/nDPI-%{ndpi_ver}.tar.gz
# Source1-md5: 1803f5f3999e1dc3a2454d437b11e9ba
Patch0: mandir.patch
+Patch1: x32.patch
URL: http://www.ntop.org/
BuildRequires: GeoIP-devel
BuildRequires: autoconf >= 2.52
@@ -55,6 +56,7 @@ It is the new incarnation of the original ntop written in
%patch0 -p1
%{__mv} nDPI-%{ndpi_ver} nDPI
+%patch1 -p1
%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
httpdocs/misc/ntopng-utils-manage-config.in \
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..f8f2e0f
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- ntopng-5.6/nDPI/src/lib/third_party/src/roaring.cc.orig 2023-02-01 18:29:59.000000000 +0100
++++ ntopng-5.6/nDPI/src/lib/third_party/src/roaring.cc 2023-10-02 05:27:14.540262993 +0200
+@@ -315,7 +315,7 @@
+
+
+
+-#if defined(__x86_64__) || defined(_M_X64)
++#if (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64)
+ // we have an x64 processor
+ #define CROARING_IS_X64
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ntopng.git/commitdiff/a568f895da5cdc02233ca286c2b8d5ff5e8ae508
More information about the pld-cvs-commit
mailing list