Add sw64 architecture

Signed-off-by: wzx <wuzx1226@qq.com>
(cherry picked from commit 1397e09f478713f6f2cfc57e9c2029cc5b963379)
This commit is contained in:
wzx 2022-10-20 12:23:34 +08:00 committed by openeuler-sync-bot
parent 87d4e2100a
commit bb9a2ed1ff
2 changed files with 41 additions and 1 deletions

36
gphoto2-2.5.17-sw.patch Executable file
View File

@ -0,0 +1,36 @@
diff -Naur gphoto2-2.5.17.org/gphoto-m4/gp-stdint.m4 gphoto2-2.5.17.sw/gphoto-m4/gp-stdint.m4
--- gphoto2-2.5.17.org/gphoto-m4/gp-stdint.m4 2022-02-26 06:48:19.750000000 +0000
+++ gphoto2-2.5.17.sw/gphoto-m4/gp-stdint.m4 2022-02-26 06:49:11.080000000 +0000
@@ -449,7 +449,7 @@
typedef unsigned long long uint64_t;
#endif
-#elif defined __alpha || (defined __mips && defined _ABIN32)
+#elif defined __alpha || defined __sw_64 || (defined __mips && defined _ABIN32)
#if !defined _NO_LONGLONG
typedef long int64_t;
typedef unsigned long uint64_t;
diff -Naur gphoto2-2.5.17.org/packaging/rpm/Makefile.am gphoto2-2.5.17.sw/packaging/rpm/Makefile.am
--- gphoto2-2.5.17.org/packaging/rpm/Makefile.am 2022-02-26 06:48:19.780000000 +0000
+++ gphoto2-2.5.17.sw/packaging/rpm/Makefile.am 2022-02-26 06:50:54.610000000 +0000
@@ -15,7 +15,7 @@
rpm: Makefile package.spec
$(MAKE) clean
mkdir -p BUILD SPECS SOURCES SRPMS
- for arch in i386 i486 i586 i686 alpha noarch; do \
+ for arch in i386 i486 i586 i686 sw_64 alpha noarch; do \
mkdir -p "RPMS/$${arch}"; \
done
ln -f "$(top_srcdir)/@PACKAGE@-@VERSION@.tar.gz" SOURCES/
diff -Naur gphoto2-2.5.17.org/packaging/rpm/Makefile.in gphoto2-2.5.17.sw/packaging/rpm/Makefile.in
--- gphoto2-2.5.17.org/packaging/rpm/Makefile.in 2022-02-26 06:48:19.780000000 +0000
+++ gphoto2-2.5.17.sw/packaging/rpm/Makefile.in 2022-02-26 06:50:47.590000000 +0000
@@ -508,7 +508,7 @@
rpm: Makefile package.spec
$(MAKE) clean
mkdir -p BUILD SPECS SOURCES SRPMS
- for arch in i386 i486 i586 i686 alpha noarch; do \
+ for arch in i386 i486 i586 i686 sw_64 alpha noarch; do \
mkdir -p "RPMS/$${arch}"; \
done
ln -f "$(top_srcdir)/@PACKAGE@-@VERSION@.tar.gz" SOURCES/

View File

@ -1,10 +1,11 @@
Name: gphoto2
Version: 2.5.17
Release: 4
Release: 5
Summary: Access software for digital cameras
License: GPLv2+
Url: http://www.gphoto.org/
Source0: http://downloads.sourceforge.net/gphoto/gphoto2-%{version}.tar.bz2
Patch1: gphoto2-2.5.17-sw.patch
BuildRequires: make pkgconfig(libgphoto2) >= %{version} libjpeg-devel
BuildRequires: pkgconfig(libexif) popt-devel readline-devel gcc
@ -39,6 +40,9 @@ This package provides documentation for gphoto2.
%{_mandir}/man1/gphoto2.1*
%changelog
* Thu Oct 20 2022 wuzx<wuzx1226@qq.com> - 2.5.17-5
- add sw64 patch
* Mon Jun 7 2021 baizhonggui <baizhonggui@huawei.com> - 2.5.17-4
- Fix building error: configure: error: no acceptable C compiler found in $PATH
- Add gcc in BuildRequires