Hello community, here is the log from the commit of package ocl-icd for openSUSE:Factory checked in at 2020-06-03 20:34:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocl-icd (Old) and /work/SRC/openSUSE:Factory/.ocl-icd.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocl-icd" Wed Jun 3 20:34:59 2020 rev:10 rq:811111 version:2.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/ocl-icd/ocl-icd.changes 2020-02-27 14:37:04.265999255 +0100 +++ /work/SRC/openSUSE:Factory/.ocl-icd.new.3606/ocl-icd.changes 2020-06-03 20:36:00.149827084 +0200 @@ -1,0 +2,10 @@ +Wed Jun 3 10:56:53 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Add ocl-icd-gcc10.patch: Fix build with gcc10 (boo#1172436). + +------------------------------------------------------------------- +Sat May 30 08:57:18 UTC 2020 - Marcus Meissner <[email protected]> + +- add baselibs.conf to build 32bit binaries for Wine (bsc#1172303) + +------------------------------------------------------------------- New: ---- baselibs.conf ocl-icd-gcc10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocl-icd.spec ++++++ --- /var/tmp/diff_new_pack.UiscZU/_old 2020-06-03 20:36:01.429831096 +0200 +++ /var/tmp/diff_new_pack.UiscZU/_new 2020-06-03 20:36:01.433831108 +0200 @@ -23,6 +23,9 @@ License: BSD-2-Clause URL: https://github.com/OCL-dev/ocl-icd Source: https://github.com/OCL-dev/ocl-icd/archive/v%{version}/%{name}-%{version}.tar.gz +Source1: baselibs.conf +# PATCH-FIx-UPSTREAM ocl-icd-gcc10.patch [email protected] -- Fix build with gcc10 +Patch0: ocl-icd-gcc10.patch BuildRequires: libtool BuildRequires: opencl-headers >= 2.2 BuildRequires: pkgconfig @@ -66,7 +69,7 @@ use ocl-icd for ICD functionality. %prep -%setup -q +%autosetup -p1 %build ./bootstrap ++++++ baselibs.conf ++++++ libOpenCL1 ocl-icd-devel requires "libOpenCL1-<targettype> = %version" ++++++ ocl-icd-gcc10.patch ++++++ >From 4667bddd365bcc1dc66c483835971f0083b44b1d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich <[email protected]> Date: Wed, 22 Jan 2020 19:38:23 +0000 Subject: [PATCH] icd_generator.rb: fix build failure against gcc-10 On gcc-10 (and gcc-9 -fno-common) build fails as: ``` libtool: link: gcc -shared -fPIC -DPIC .libs/libdummy_icd.o .libs/libdummy_icd_gen.o \ -ldl -g -O2 -Wl,-soname -Wl,libdummycl.so.0 -o .libs/libdummycl.so.0.0.0 ld: .libs/libdummy_icd_gen.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: multiple definition of `master_dispatch'; .libs/libdummy_icd.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: first defined here ``` gcc-10 will change the default from -fcommon to fno-common: https://gcc.gnu.org/PR85678. The error also happens if CFLAGS=-fno-common passed explicitly. Reported-by: Anthony Parsons Bug: https://bugs.gentoo.org/706098 Signed-off-by: Sergei Trofimovich <[email protected]> --- icd_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icd_generator.rb b/icd_generator.rb index 49443b8..764cabb 100644 --- a/icd_generator.rb +++ b/icd_generator.rb @@ -207,7 +207,7 @@ def self.generate_libdummy_icd_header } libdummy_icd_structures += "};\n\n" libdummy_icd_structures += "#pragma GCC visibility push(hidden)\n\n" - libdummy_icd_structures += "struct _cl_icd_dispatch master_dispatch; \n\n" + libdummy_icd_structures += "extern struct _cl_icd_dispatch master_dispatch; \n\n" $use_name_in_test.each { |k, f| libdummy_icd_structures += "typeof(#{f}) INT#{f};\n" }
