[packages/libgphoto2] - missing patch
qboosh
qboosh at pld-linux.org
Fri Sep 11 22:47:40 CEST 2020
commit d507b54e92e117da2b575460fb2d57498ce36626
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Sep 11 22:50:25 2020 +0200
- missing patch
...hoto2-configure-fix-symver-support-checks.patch | 66 ++++++++++++++++++++++
1 file changed, 66 insertions(+)
---
diff --git a/libgphoto2-configure-fix-symver-support-checks.patch b/libgphoto2-configure-fix-symver-support-checks.patch
new file mode 100644
index 0000000..7455d53
--- /dev/null
+++ b/libgphoto2-configure-fix-symver-support-checks.patch
@@ -0,0 +1,66 @@
+From be61c7fd7d60f57dcc07e6a7c5d3d49938546b61 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= <wferi at debian.org>
+Date: Sat, 18 Jul 2020 12:35:30 +0200
+Subject: [PATCH] configure: fix symver support checks
+
+The versioned test symbols must be external, so move them into the
+prologue, otherwise GCC 9.3 (at least) reports "Error: invalid attempt
+to declare external version name as default in symbol `f@@VER2'".
+Also suppress warnings about missing prototypes and return
+statements for these test functions.
+---
+ configure.ac | 11 ++++++-----
+ libgphoto2_port/configure.ac | 11 ++++++-----
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f73c81d88..51d1e18b3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -259,13 +259,14 @@ AC_SYS_LARGEFILE
+
+ AC_MSG_CHECKING([for asm .symver support])
+ AC_COMPILE_IFELSE([dnl
+- AC_LANG_PROGRAM([[]],[[
+- int f1() { }
+- int f2() { }
++ AC_LANG_PROGRAM([[
++ void f1(void);
++ void f1() {}
++ void f2(void);
++ void f2() {}
+ asm(".symver f1, f at VER1");
+ asm(".symver f2, f@@VER2");
+- int main(int argc, char **argv) { }
+- ]])dnl
++ ]],[])dnl
+ ],[
+ AC_DEFINE([HAVE_ASM_SYMVERS],1,[Define if there is asm .symver support.])
+ VERSIONMAPLDFLAGS="-Wl,--version-script=\$(srcdir)/libgphoto2.ver"
+diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
+index 6af8bd914..a8546aa36 100644
+--- a/libgphoto2_port/configure.ac
++++ b/libgphoto2_port/configure.ac
+@@ -165,13 +165,14 @@ AC_CHECK_LIB([regex],[regexec])
+
+ AC_MSG_CHECKING([for asm .symver support])
+ AC_COMPILE_IFELSE([dnl
+- AC_LANG_PROGRAM([[]],[[
+- int f1() { }
+- int f2() { }
++ AC_LANG_PROGRAM([[
++ void f1(void);
++ void f1() {}
++ void f2(void);
++ void f2() {}
+ asm(".symver f1, f at VER1");
+ asm(".symver f2, f@@VER2");
+- int main(int argc, char **argv) { }
+- ]])dnl
++ ]],[])dnl
+ ],[
+ AC_DEFINE([HAVE_ASM_SYMVERS],1,[Define if there is asm .symver support.])
+ VERSIONMAPLDFLAGS="-Wl,--version-script=\$(srcdir)/libgphoto2_port.ver"
+--
+2.26.2
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgphoto2.git/commitdiff/d507b54e92e117da2b575460fb2d57498ce36626
More information about the pld-cvs-commit
mailing list