[packages/z80ex] Rel 4; fix x32 build

arekm arekm at pld-linux.org
Wed Mar 11 01:07:04 CET 2026


commit af24025c33fa670eed7240908c8bb16996606cff
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Mar 11 01:06:58 2026 +0100

    Rel 4; fix x32 build

 cmake-install-libdir.patch | 16 ++++++++++++++++
 z80ex.spec                 |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/z80ex.spec b/z80ex.spec
index e2c172e..1c8125a 100644
--- a/z80ex.spec
+++ b/z80ex.spec
@@ -2,11 +2,12 @@ Summary:	ZiLOG Z80 CPU emulator
 Summary(pl.UTF-8):	Emulator procesora ZiLOG Z80
 Name:		z80ex
 Version:	1.1.21
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/z80ex/%{name}-%{version}.tar.gz
 # Source0-md5:	92ab8d8f45fd7b448075b820013a5f97
+Patch0:		cmake-install-libdir.patch
 URL:		http://z80ex.sourceforge.net/
 BuildRequires:	cmake >= 2.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,6 +63,7 @@ Biblioteki statyczne Z80Ex.
 
 %prep
 %setup -q
+%patch -P0 -p1
 
 %build
 install -d build
diff --git a/cmake-install-libdir.patch b/cmake-install-libdir.patch
new file mode 100644
index 0000000..bce2ed0
--- /dev/null
+++ b/cmake-install-libdir.patch
@@ -0,0 +1,16 @@
+--- z80ex-1.1.21.orig/CMakeLists.txt	2013-07-29 01:45:44.000000000 +0200
++++ z80ex-1.1.21/CMakeLists.txt	2026-03-11 00:59:41.563310551 +0100
+@@ -58,11 +58,8 @@
+     PROPERTIES VERSION ${VERSION_STR} SOVERSION ${API_REVISION}
+ )
+ 
+-if ("${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}" MATCHES "lib64")
+-    set (LIB_DIR "lib64")
+-else ()
+-    set (LIB_DIR "lib")
+-endif ()
++include (GNUInstallDirs)
++set (LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
+ if (NOT DEFINED Z80EX_STATIC_ONLY)
+     install (TARGETS z80ex z80ex_dasm LIBRARY DESTINATION ${LIB_DIR} ARCHIVE DESTINATION ${LIB_DIR})
+ endif ()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/z80ex.git/commitdiff/af24025c33fa670eed7240908c8bb16996606cff



More information about the pld-cvs-commit mailing list