Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
7482d3fa38
!25 [sync] PR-22: enable test
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2023-03-11 09:27:27 +00:00
zhangpan
fef2494b6a enable test
(cherry picked from commit ab35dacc9cb8a601e72efa7475c681f67e6ea693)
2023-03-11 16:21:41 +08:00
openeuler-ci-bot
e4d2b73460
!18 [sync] PR-17: Optimize the patch for add sw architecture
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-11-21 02:33:21 +00:00
zhouwenpei
97ef039ab1 Optimize the patch for add sw architecture
(cherry picked from commit 4adc0f28369656155519e003578a01a93867122b)
2022-11-18 11:41:24 +08:00
openeuler-ci-bot
ce17d54254
!14 [sync] PR-10: 添加sw架构
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-11-18 03:27:20 +00:00
wzx
3aa580df47 Add sw64 architecture
Signed-off-by: wzx <wuzx1226@qq.com>
(cherry picked from commit f19799ed1cecb77b9f7f5b35f7b47e22b24b6979)
2022-11-17 21:15:48 +08:00
openeuler-ci-bot
b3f886fd4d
!11 【轻量级 PR】:Rebuild for next release
From: @zhouwenpei 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-10-26 12:04:38 +00:00
zhouwenpei
a03b3e918a
Rebuild for next release
Signed-off-by: zhouwenpei <zhouwenpei050@chinasoftinc.com>
2022-10-26 03:23:26 +00:00
openeuler-ci-bot
bd3313db51
!9 [sync] PR-7: rebuild libgtop2
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-04-27 06:30:18 +00:00
yangcheng1203
c6cc458daf rebuild libgtop2
(cherry picked from commit ece728ace5399aaff1a717e70bab025c76ddba39)
2022-04-27 11:14:41 +08:00
2 changed files with 53 additions and 2 deletions

30
libgtop-2.40.0-sw.patch Executable file
View File

@ -0,0 +1,30 @@
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,10 +1,13 @@
Name: libgtop2
Version: 2.40.0
Release: 2
Release: 7
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
@ -29,6 +32,9 @@ developing applications that use libgtop2.
%configure --disable-gtk-doc
%make_build
%check
make check
%install
%make_install
%delete_la
@ -61,7 +67,22 @@ developing applications that use libgtop2.
%{_datadir}/gtk-doc/html/libgtop/*
%changelog
* Tue Sep 8 2020 hanhui <hanhui15@huawei.com> - 2.40.0.2
* 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
- Type:bugfix
- ID:NA
- SUG:NA