From 8dd3b950296c17af926e219c40dd66670d228959dc1b66b836d374ca1f801c49 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 22 Aug 2019 18:39:09 +0000 Subject: [PATCH] - Disable LTO because it's broken. OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=45 --- grpc.changes | 5 +++++ grpc.spec | 16 +++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/grpc.changes b/grpc.changes index 35fcfc3..8fcf46d 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 22 18:28:15 UTC 2019 - Jan Engelhardt + +- Disable LTO because it's broken. + ------------------------------------------------------------------- Sun Aug 18 16:29:43 UTC 2019 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index 303d8eb..5d15ca0 100644 --- a/grpc.spec +++ b/grpc.spec @@ -33,14 +33,7 @@ BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: glibc-debuginfo -BuildRequires: libprotobuf-lite20-debuginfo -BuildRequires: libprotobuf20-debuginfo -BuildRequires: libprotoc20-debuginfo BuildRequires: pkg-config -BuildRequires: protobuf-debugsource -BuildRequires: protobuf-devel-debuginfo -BuildRequires: protobuf-source BuildRequires: python-rpm-macros BuildRequires: zypper BuildRequires: pkgconfig(libcares) @@ -101,18 +94,19 @@ This subpackage contains the python3 bindings. %setup -qn grpc-%rver %build +%define _lto_cflags %nil # protoc is invoked strangely; make it happy with this dir or it will assert() mkdir -p third_party/protobuf/src -make %{?_smp_mflags} STRIP=/bin/true V=1 VERBOSE=1 \ - CFLAGS="%optflags -Wno-error" CXXFLAGS="%optflags -Wno-error" +export CFLAGS="%optflags -Wno-error" +export CXXFLAGS="$CFLAGS" +make %{?_smp_mflags} STRIP=/bin/true V=1 VERBOSE=1 # build python module export GRPC_PYTHON_BUILD_WITH_CYTHON=True export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=True export GRPC_PYTHON_BUILD_SYSTEM_CARES=True -export CFLAGS="%optflags" %python_build %install @@ -139,7 +133,7 @@ tar -xzf %SOURCE0 --strip-components=1 -C "%buildroot/%src_install_dir" find "%buildroot/%src_install_dir" -type f \ -exec sed -i 's|#!%_bindir/env bash|#!/bin/bash|' "{}" + \ -exec sed -i 's|#!%_bindir/env ruby|#!%_bindir/ruby|' "{}" + -find "%buildroot/%src_install_dir -type f "(" -name "*.bzl" -o -name "*.py" ")" \ +find "%buildroot/%src_install_dir" -type f "(" -name "*.bzl" -o -name "*.py" ")" \ -exec sed -i 's|#!%_bindir/env python2.7|#!%_bindir/python2.7|' "{}" + \ -exec sed -i 's|#!%_bindir/env python|#!%_bindir/python|' "{}" +