Compare commits

..

No commits in common. "7482d3fa38685f2177811fee0cfb752f5d539b83" and "9bc21c55c0d879d279862d41799093728e655245" have entirely different histories.

2 changed files with 2 additions and 53 deletions

View File

@ -1,30 +0,0 @@
diff -Naur libgtop-2.40.0.org/sysdeps/bsd/prockernel.c libgtop-2.40.0.sw/sysdeps/bsd/prockernel.c
--- libgtop-2.40.0.org/sysdeps/bsd/prockernel.c 2022-03-02 01:48:18.960000000 +0000
+++ libgtop-2.40.0.sw/sysdeps/bsd/prockernel.c 2022-03-02 01:54:03.870000000 +0000
@@ -33,7 +33,7 @@
#if (!defined __OpenBSD__) && (!defined __bsdi__)
#include <sys/user.h>
#endif
-#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && \
+#if !defined(__bsdi__) && !(defined(__FreeBSD__) && (defined(__alpha__) || defined(__sw_64__))) && \
!defined(__NetBSD__)
#include <machine/pcb.h>
#endif
@@ -204,7 +204,7 @@
(char *) &pcb, sizeof (pcb)) == sizeof (pcb))
{
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#ifndef __alpha__
+#if !defined __alpha__ && !defined __sw_64__
#if (__FreeBSD_version >= 300003) || defined(__FreeBSD_kernel__)
buf->kstk_esp = (guint64) pcb.pcb_esp;
buf->kstk_eip = (guint64) pcb.pcb_eip;
@@ -240,7 +240,7 @@
#elif defined(__sparc__)
buf->kstk_esp = (guint64) pcb.pcb_sp;
buf->kstk_eip = (guint64) pcb.pcb_pc;
-#elif defined(__alpha__)
+#elif defined(__alpha__) || defined(__sw_64__)
buf->kstk_esp = (guint64) pcb.pcb_context[9];
buf->kstk_eip = (guint64) pcb.pcb_context[8];
#else

View File

@ -1,13 +1,10 @@
Name: libgtop2
Version: 2.40.0
Release: 7
Release: 2
Summary: System status information library (version 2)
License: GPLv2+
URL: https://developer.gnome.org/libgtop/stable/
Source0: https://download.gnome.org/sources/libgtop/2.40/libgtop-%{version}.tar.xz
%ifarch sw_64
Patch1: libgtop-2.40.0-sw.patch
%endif
BuildRequires: gettext glib2-devel gobject-introspection-devel
@ -32,9 +29,6 @@ developing applications that use libgtop2.
%configure --disable-gtk-doc
%make_build
%check
make check
%install
%make_install
%delete_la
@ -67,22 +61,7 @@ make check
%{_datadir}/gtk-doc/html/libgtop/*
%changelog
* Sat Mar 11 2023 zhangpan<zhangpan103@h-partners.com> - 2.40.0-7
- enable test
* Fri Nov 18 2022 zhouwenpei<zhouwenpei1@h-partners.com> - 2.40.0-6
- Optimize the patch for add sw architecture
* Mon Nov 14 2022 wuzx<wuzx1226@qq.com> - 2.40.0-5
- Add sw64 architecture
* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.40.0-4
- Rebuild for next release
* Wed Apr 27 2022 yangcheng <yangcheng87@h-partners.com> - 2.40.0-3
- rebuild libgtop2
* Tue Sep 8 2020 hanhui <hanhui15@huawei.com> - 2.40.0-2
* Tue Sep 8 2020 hanhui <hanhui15@huawei.com> - 2.40.0.2
- Type:bugfix
- ID:NA
- SUG:NA