[packages/apitrace] disable debian multiarch installation dirs
atler
atler at pld-linux.org
Sat May 24 21:54:21 CEST 2025
commit 73790bff8d402c066c3dbbbef16f0270f2b79443
Author: Jan Palus <atler at pld-linux.org>
Date: Sat May 24 21:48:26 2025 +0200
disable debian multiarch installation dirs
apitrace.spec | 2 ++
no-debian-multiarch.patch | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
---
diff --git a/apitrace.spec b/apitrace.spec
index 7e34675..0c36796 100644
--- a/apitrace.spec
+++ b/apitrace.spec
@@ -14,6 +14,7 @@ Group: Development/Tools
Source0: https://github.com/apitrace/apitrace/archive/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 822b50a96c10911f474cba51d05ff568
Patch0: system-libs.patch
+Patch1: no-debian-multiarch.patch
URL: https://apitrace.github.io/
%if %{with qt}
BuildRequires: Qt5Core-devel >= %{qtver}
@@ -56,6 +57,7 @@ Qt based GUI for apitrace.
%prep
%setup -q
%patch -P0 -p1
+%patch -P1 -p1
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scripts/*.py
diff --git a/no-debian-multiarch.patch b/no-debian-multiarch.patch
new file mode 100644
index 0000000..e3f6b15
--- /dev/null
+++ b/no-debian-multiarch.patch
@@ -0,0 +1,18 @@
+--- apitrace-12.0/CMakeLists.txt.orig 2024-05-30 20:10:10.000000000 +0200
++++ apitrace-12.0/CMakeLists.txt 2025-05-24 21:45:00.367650581 +0200
+@@ -489,15 +489,6 @@
+ ##############################################################################
+ # Installation directories
+
+-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+- # Debian multiarch support
+- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+- OUTPUT_VARIABLE ARCH_SUBDIR
+- ERROR_QUIET
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+-endif()
+-
+ if (WIN32 OR APPLE)
+ # On Windows/MacOSX, applications are usually installed on a directory of
+ # their own
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apitrace.git/commitdiff/73790bff8d402c066c3dbbbef16f0270f2b79443
More information about the pld-cvs-commit
mailing list