public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libx86emu] epel10.2: Address FTBFS
@ 2026-09-04 15:05 Lubomir Rintel
  0 siblings, 0 replies; only message in thread
From: Lubomir Rintel @ 2026-09-04 15:05 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/libx86emu
            Branch : epel10.2
            Commit : 0e9fc8576ba6212bf9ff8fe6b9b0592ef4d41a9b
            Author : Lubomir Rintel <lkundrak@v3.sk>
            Date   : 2024-12-31T20:52:20+01:00
            Stats  : +25/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/libx86emu/c/0e9fc8576ba6212bf9ff8fe6b9b0592ef4d41a9b?branch=epel10.2

            Log:
            Address FTBFS

Is the patch good enough for upstream?

I don't know!

I have no idea why did it even build before.

---
diff --git a/libx86emu-3.5-x86-io.patch b/libx86emu-3.5-x86-io.patch
new file mode 100644
index 0000000..7e9dab1
--- /dev/null
+++ b/libx86emu-3.5-x86-io.patch
@@ -0,0 +1,18 @@
+diff -urp libx86emu-3.5/mem.c libx86emu-3.5.fixed/mem.c
+--- libx86emu-3.5/mem.c	2021-11-18 18:14:15.000000000 +0100
++++ libx86emu-3.5.fixed/mem.c	2024-12-31 20:40:27.692860597 +0100
+@@ -35,6 +35,14 @@
+ #include "include/x86emu_int.h"
+ #if defined(__i386__) || defined (__x86_64__)
+ #include <sys/io.h>
++#else
++/* These are hopefully never reached, since iopl_ok is not going to be true. */
++static inline unsigned inb(unsigned addr) { abort(); return -1; }
++static inline unsigned inw(unsigned addr) { abort(); return -1; }
++static inline unsigned inl(unsigned addr) { abort(); return -1; }
++static inline void outb(unsigned val, unsigned addr) { abort(); }
++static inline void outw(unsigned val, unsigned addr) { abort(); }
++static inline void outl(unsigned val, unsigned addr) { abort(); }
+ #endif
+ 
+ #define PERM16(a)	((a) + ((a) << 8))

diff --git a/libx86emu.spec b/libx86emu.spec
index 5fed627..f641ef0 100644
--- a/libx86emu.spec
+++ b/libx86emu.spec
@@ -11,7 +11,7 @@
 
 Name:           libx86emu
 Version:        3.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        x86 emulation library
 
 # Automatically converted from old format: BSD - review is highly recommended.
@@ -19,6 +19,9 @@ License:        LicenseRef-Callaway-BSD
 URL:            https://github.com/wfeldt/libx86emu
 Source0:        https://github.com/wfeldt/libx86emu/archive/%{version}/%{name}-%{version}.tar.gz
 
+# Make it build outside x86. Not submitted upstream because I don't know what is going on.
+Patch0:         libx86emu-3.5-x86-io.patch
+
 BuildRequires:  gcc
 BuildRequires: make
 
@@ -65,6 +68,9 @@ library.
 
 
 %changelog
+* Tue Dec 31 2024 Lubomir Rintel <lkundrak@v3.sk> - 3.5-9
+- Make it build outside x86 again
+
 * Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 3.5-8
 - convert license to SPDX
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-04 15:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-04 15:05 [rpms/libx86emu] epel10.2: Address FTBFS Lubomir Rintel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox