Accepting request 1142787 from devel:tools
- Force-replace all /usr/bin/env python by python3. There are some more /usr/bin/env left, these come from opencensus-proto-source (copied verbatim by this build) and should be fixed in that other package, after which it will trickle down. OBS-URL: https://build.opensuse.org/request/show/1142787 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grpc?expand=0&rev=72
This commit is contained in:
commit
5c41abcfeb
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jan 29 17:25:06 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Force-replace all /usr/bin/env python by python3.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jan 18 07:58:43 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
|
Thu Jan 18 07:58:43 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
|
||||||
|
|
||||||
|
11
grpc.spec
11
grpc.spec
@ -126,18 +126,27 @@ This subpackage contains source code of the gRPC reference implementation.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -N
|
%autosetup -N
|
||||||
|
find "." -type f -exec grep -l '/usr/bin/env ' {} + |
|
||||||
|
xargs -r perl -i -lpe \
|
||||||
|
's{#! ?/usr/bin/env python\S*}{#!/usr/bin/python3}g;
|
||||||
|
s{#! ?/usr/bin/env sh}{#!/bin/sh}g;
|
||||||
|
s{#! ?/usr/bin/env bash}{#!/bin/bash}g;
|
||||||
|
s{#! ?/usr/bin/env }{#!/usr/bin/}g;'
|
||||||
pushd third_party/xxhash
|
pushd third_party/xxhash
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
popd
|
popd
|
||||||
rm -Rf third_party/abseil-cpp/
|
rm -Rf third_party/abseil-cpp/
|
||||||
|
|
||||||
|
%build
|
||||||
# protoc is invoked strangely; make it happy with this dir or it will assert()
|
# protoc is invoked strangely; make it happy with this dir or it will assert()
|
||||||
mkdir -p third_party/protobuf/src
|
mkdir -p third_party/protobuf/src
|
||||||
|
|
||||||
cp -a /usr/src/opencensus-proto third_party/
|
cp -a /usr/src/opencensus-proto third_party/
|
||||||
export CFLAGS="%optflags -Wno-error"
|
export CFLAGS="%optflags -Wno-error"
|
||||||
export CXXFLAGS="$CFLAGS"
|
export CXXFLAGS="$CFLAGS"
|
||||||
|
find "." -type f -exec grep '/usr/bin/env ' {} + || :
|
||||||
|
pushd .
|
||||||
%cmake -DgRPC_INSTALL=ON \
|
%cmake -DgRPC_INSTALL=ON \
|
||||||
-DgRPC_INSTALL_LIBDIR:PATH="%_lib" \
|
-DgRPC_INSTALL_LIBDIR:PATH="%_lib" \
|
||||||
-DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir/cmake/grpc" \
|
-DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir/cmake/grpc" \
|
||||||
@ -150,6 +159,8 @@ export CXXFLAGS="$CFLAGS"
|
|||||||
-DgRPC_ZLIB_PROVIDER=package \
|
-DgRPC_ZLIB_PROVIDER=package \
|
||||||
-DCMAKE_CXX_STANDARD=17
|
-DCMAKE_CXX_STANDARD=17
|
||||||
%cmake_build
|
%cmake_build
|
||||||
|
popd
|
||||||
|
find "." -type f -exec grep '/usr/bin/env ' {} + || :
|
||||||
|
|
||||||
%install
|
%install
|
||||||
b="%buildroot"
|
b="%buildroot"
|
||||||
|
Loading…
Reference in New Issue
Block a user