!8 添加sw架构
From: @wuzx065891 Reviewed-by: @liuzhiqiang26 Signed-off-by: @liuzhiqiang26
This commit is contained in:
commit
ed4daf8568
58
0001-libpciaccess-add-sw64.patch
Executable file
58
0001-libpciaccess-add-sw64.patch
Executable file
@ -0,0 +1,58 @@
|
|||||||
|
From c6de975fd6bf03c63ce11417dc92043deb495898 Mon Sep 17 00:00:00 2001
|
||||||
|
From: wuzx <wuzx1226@qq.com>
|
||||||
|
Date: Wed, 3 Aug 2022 16:40:13 +0000
|
||||||
|
Subject: [PATCH] libpciaccess add sw64
|
||||||
|
|
||||||
|
Add code related to sw64 in file configure configure.ac and openbsd_pci.c to support sw64 architecture.
|
||||||
|
|
||||||
|
Signed-off-by: wuzx <wuzx1226@qq.com>
|
||||||
|
---
|
||||||
|
configure | 3 +++
|
||||||
|
configure.ac | 3 +++
|
||||||
|
src/openbsd_pci.c | 2 +-
|
||||||
|
3 files changed, 7 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index 2eada1d..dc7e3ec 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -18576,6 +18576,9 @@ case $host_os in
|
||||||
|
*x86_64*|*amd64*)
|
||||||
|
PCIACCESS_LIBS="$PCIACCESS_LIBS -lx86_64"
|
||||||
|
;;
|
||||||
|
+ *sw_64*)
|
||||||
|
+ PCIACCESS_LIBS="$PCIACCESS_LIBS -lsw_64"
|
||||||
|
+ ;;
|
||||||
|
*alpha*)
|
||||||
|
PCIACCESS_LIBS="$PCIACCESS_LIBS -lalpha"
|
||||||
|
;;
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index bfc75ae..00fcd4f 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -82,6 +82,9 @@ case $host_os in
|
||||||
|
*x86_64*|*amd64*)
|
||||||
|
PCIACCESS_LIBS="$PCIACCESS_LIBS -lx86_64"
|
||||||
|
;;
|
||||||
|
+ *sw_64*)
|
||||||
|
+ PCIACCESS_LIBS="$PCIACCESS_LIBS -lsw_64"
|
||||||
|
+ ;;
|
||||||
|
*alpha*)
|
||||||
|
PCIACCESS_LIBS="$PCIACCESS_LIBS -lalpha"
|
||||||
|
;;
|
||||||
|
diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c
|
||||||
|
index c061fd8..990860b 100644
|
||||||
|
--- a/src/openbsd_pci.c
|
||||||
|
+++ b/src/openbsd_pci.c
|
||||||
|
@@ -133,7 +133,7 @@ pci_device_openbsd_read_rom(struct pci_device *device, void *buffer)
|
||||||
|
return ENOSYS;
|
||||||
|
|
||||||
|
if (priv->base.rom_size == 0) {
|
||||||
|
-#if defined(__alpha__) || defined(__amd64__) || defined(__i386__)
|
||||||
|
+#if defined(__alpha__) || defined(__sw_64__) || defined(__amd64__) || defined(__i386__)
|
||||||
|
if ((device->device_class & 0x00ffff00) ==
|
||||||
|
((PCI_CLASS_DISPLAY << 16) |
|
||||||
|
(PCI_SUBCLASS_DISPLAY_VGA << 8))) {
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: libpciaccess
|
Name: libpciaccess
|
||||||
Version: 0.16
|
Version: 0.16
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Generic PCI access library
|
Summary: Generic PCI access library
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://www.x.org/
|
URL: https://www.x.org/
|
||||||
@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
|||||||
|
|
||||||
|
|
||||||
Patch0: 0000-libpciaccess-rom-size.patch
|
Patch0: 0000-libpciaccess-rom-size.patch
|
||||||
|
Patch1: 0001-libpciaccess-add-sw64.patch
|
||||||
|
|
||||||
BuildRequires: autoconf automake libtool pkgconfig xorg-x11-util-macros
|
BuildRequires: autoconf automake libtool pkgconfig xorg-x11-util-macros
|
||||||
Requires: hwdata
|
Requires: hwdata
|
||||||
@ -54,6 +55,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 28 2022 wuzx<wuzx1226@qq.com> - 0.16-3
|
||||||
|
- add sw64 patch
|
||||||
|
|
||||||
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.16-2
|
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.16-2
|
||||||
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
|
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user