!6 添加sw架构

From: @wuzx065891 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2022-11-07 02:11:10 +00:00 committed by Gitee
commit e11135e8a8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 39 additions and 1 deletions

32
cdrkit-1.1.11-sw.patch Executable file
View File

@ -0,0 +1,32 @@
diff -Naur cdrkit-1.1.11.org/include/btorder.h cdrkit-1.1.11.sw/include/btorder.h
--- cdrkit-1.1.11.org/include/btorder.h 2022-02-28 02:48:17.340000000 +0000
+++ cdrkit-1.1.11.sw/include/btorder.h 2022-02-28 02:52:34.310000000 +0000
@@ -112,6 +112,7 @@
# if defined(__i386__) || defined(__i386) || defined(i386) || \
defined(__alpha__) || defined(__alpha) || defined(alpha) || \
+ defined(__sw_64__) || defined(__sw_64) || defined(sw_64) || \
defined(__arm__) || defined(__arm) || defined(arm)
# define _BIT_FIELDS_LTOH
# endif
diff -Naur cdrkit-1.1.11.org/libusal/scsi-vms.c cdrkit-1.1.11.sw/libusal/scsi-vms.c
--- cdrkit-1.1.11.org/libusal/scsi-vms.c 2022-02-28 02:48:17.310000000 +0000
+++ cdrkit-1.1.11.sw/libusal/scsi-vms.c 2022-02-28 02:54:34.040000000 +0000
@@ -117,7 +117,7 @@
Uint SCSI$L_RES_6; /* Reserved */
};
-#ifdef __ALPHA
+#if defined __ALPHA || defined __SW_64
#pragma member_alignment save
#pragma nomember_alignment
#endif
@@ -129,7 +129,7 @@
Uchar SCSI$B_IOSB_STS; /* SCSI device status */
};
-#ifdef __ALPHA
+#if defined __ALPHA || defined __SW_64
#pragma member_alignment restore
#endif

View File

@ -1,6 +1,6 @@
Name: cdrkit
Version: 1.1.11
Release: 46
Release: 47
Summary: A collection of CD/DVD utilities
License: GPLv2
URL: http://cdrkit.org/
@ -30,6 +30,9 @@ Patch20: cdrkit-1.1.11-werror_gcc5.patch
Patch21: cdrkit-1.1.11-devname.patch
Patch22: cdrkit-1.1.11-sysmacros.patch
Patch23: cdrkit-1.1.11-gcc10.patch
%ifarch sw_64
Patch24: cdrkit-1.1.11-sw.patch
%endif
BuildRequires: gcc cmake libcap-devel zlib-devel perl-interpreter
BuildRequires: perl-generators file-devel bzip2-devel
@ -218,6 +221,9 @@ fi
%{_mandir}/*
%changelog
* Thu Nov 3 2022 wuzx<wuzx1226@qq.com> - 1.1.11-47
- add sw64 patch
* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 1.1.11-46
- rebuild for next release