Compare commits

..

No commits in common. "5b06c7555c0a2e5f2f4c3e89f6b54431d9ef7e38" and "137b0c5312e8ae58ecfa2f9fc2b896a996ccb006" have entirely different histories.

4 changed files with 10 additions and 55 deletions

View File

@ -1,26 +0,0 @@
From 85f60235499f9d248ce689881e7ba9181152631a Mon Sep 17 00:00:00 2001
From: sjxur <sjxur@isoftstone.com>
Date: Fri, 21 Apr 2023 11:09:13 +0800
Subject: [PATCH] Fix compilation errors caused by specifying the gcc compiler
in source code
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 93c412b..9cdea44 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ PREFIX := libx86emu-$(VERSION)
MAJOR_VERSION := $(shell $(GIT2LOG) --version VERSION ; cut -d . -f 1 VERSION)
-CC = gcc
+CC ?= gcc
CFLAGS = -g -O2 -fPIC -fvisibility=hidden -fomit-frame-pointer -Wall
LDFLAGS =
--
2.33.0

BIN
libx86emu-3.1.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -7,23 +7,23 @@
LDFLAGS="-fPIC %{__global_ldflags}"
Name: libx86emu
Version: 3.5
Release: 3
Version: 3.1
Release: 1
Summary: x86 emulation library
License: BSD
URL: https://github.com/wfeldt/libx86emu
Source0: https://github.com/wfeldt/libx86emu/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: 10000-Fix-compilation-errors-caused-by-gcc.patch
BuildRequires: gcc nasm perl
BuildRequires: gcc
BuildRequires: libx86emu
%description
Small x86 emulation library with focus of easy usage and extended execution
logging functions. The library features an API to create emulation objects
for x86 architecture.
libx86emu is a small library to emulate x86 instructions.
The focus here is not a complete emulation (go for qemu for this)
but to cover enough for typical firmware blobs.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains development files for %{name}.
@ -34,16 +34,11 @@ The %{name}-devel package contains development files for %{name}.
%build
%make_build %{make_flags} shared
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%install
%make_install %{make_flags}
%check
%ifarch x86_64
make -C test
%endif
cp %{_libdir}/libx86emu.so.1* %{buildroot}%{_libdir}/
%files
%defattr(-,root,root)
@ -57,20 +52,6 @@ make -C test
%{_libdir}/libx86emu.so
%changelog
* Tue Sep 26 2023 zhangpan <zhangpan103@h-partners.com> - 3.5-3
- enable make check
* Fri Apr 21 2023 sjxur <sjxur@isoftstone.com> - 3.5-2
- Fix-compilation-errors-caused-by-gcc
* Fri Mar 25 2022 liukuo <liukuo@kylinos.cn> - 3.5-1
- Update version to v3.5
* Fri Nov 5 2021 xingxing <xingxing9@huawei.com> - 3.1-2
- ID:NA
- SUG:NA
- DESC:delete low version
* Tue Jul 28 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 3.1-1
- Type:enhancement
- ID:NA