This commit is contained in:
wzx 2022-08-02 16:32:40 +08:00
parent c1b46d44ae
commit e5777668f8
2 changed files with 37 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 Name: cdrkit
Version: 1.1.11 Version: 1.1.11
Release: 45 Release: 46
Summary: A collection of CD/DVD utilities Summary: A collection of CD/DVD utilities
License: GPLv2 License: GPLv2
URL: http://cdrkit.org/ URL: http://cdrkit.org/
@ -30,6 +30,7 @@ Patch20: cdrkit-1.1.11-werror_gcc5.patch
Patch21: cdrkit-1.1.11-devname.patch Patch21: cdrkit-1.1.11-devname.patch
Patch22: cdrkit-1.1.11-sysmacros.patch Patch22: cdrkit-1.1.11-sysmacros.patch
Patch23: cdrkit-1.1.11-gcc10.patch Patch23: cdrkit-1.1.11-gcc10.patch
Patch24: cdrkit-1.1.11-sw.patch
BuildRequires: gcc cmake libcap-devel zlib-devel perl-interpreter BuildRequires: gcc cmake libcap-devel zlib-devel perl-interpreter
BuildRequires: perl-generators file-devel bzip2-devel BuildRequires: perl-generators file-devel bzip2-devel
@ -218,6 +219,9 @@ fi
%{_mandir}/* %{_mandir}/*
%changelog %changelog
* Thu Jul 28 2022 wuzx<wuzx1226@qq.com> - 1.1.11-46
- add sw64 patch
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.1.11-45 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.1.11-45
- DESC: delete -S git from %autosetup, and delete BuildRequires git - DESC: delete -S git from %autosetup, and delete BuildRequires git