Accepting request 772315 from Base:System

OBS-URL: https://build.opensuse.org/request/show/772315
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libtirpc?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2020-02-11 21:16:45 +00:00 committed by Git OBS Bridge
commit a668596087
3 changed files with 66 additions and 12 deletions

View File

@ -0,0 +1,47 @@
From daed7eedba73907730241c5262a5c16c7abedb6f Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 21 Jan 2020 11:49:35 -0500
Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common
GCC 10 enables -fno-common by default.
Fixes: https://bugs.gentoo.org/705896
Signed-off-by: Steve Dickson <steved@redhat.com>
[Upstream status: daed7ee Avoid multiple-definiton with gcc -fno-common]
---
src/rpc_com.h | 3 +--
src/svc.c | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/rpc_com.h b/src/rpc_com.h
index 10bec79..76badef 100644
--- a/src/rpc_com.h
+++ b/src/rpc_com.h
@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *);
void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *);
-SVCXPRT **__svc_xports;
-int __svc_maxrec;
+extern int __svc_maxrec;
#ifdef __cplusplus
}
diff --git a/src/svc.c b/src/svc.c
index b59467b..6db164b 100644
--- a/src/svc.c
+++ b/src/svc.c
@@ -57,6 +57,9 @@
#define max(a, b) (a > b ? a : b)
+static SVCXPRT **__svc_xports;
+int __svc_maxrec;
+
/*
* The services list
* Each entry represents a set of procedures (an rpc program).
--
2.24.1

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Feb 5 14:08:52 UTC 2020 - Petr Vorel <pvorel@suse.cz>
- Backport upstream fix daed7ee ("Avoid multiple-definiton with gcc -fno-common")
to fix build error with gcc flag -fno-common (bsc#1160875).
Tested on gcc-9 and gcc-10.
0001-Avoid-multiple-definiton-with-gcc-fno-common.patch
-------------------------------------------------------------------
Fri Jan 31 00:58:56 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Skip unneeded autogen.sh run (configure is up-to-date), drop
dependencies: libtool, autoconf
- Replace krb5-mini-devel/krb5-devel with pkgconfig(krb5)
-------------------------------------------------------------------
Fri Jan 3 15:45:16 UTC 2020 - Petr Vorel <pvorel@suse.cz>

View File

@ -23,18 +23,13 @@ Release: 0
Summary: Transport Independent RPC Library
License: BSD-3-Clause
Group: Development/Libraries/C and C++
%if 0%{suse_version} >= 1300
BuildRequires: krb5-mini-devel
%else
BuildRequires: krb5-devel
%endif
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: pkgconfig(krb5)
URL: https://sourceforge.net/projects/libtirpc/
Source: %{name}-%{version}.tar.bz2
Source1: baselibs.conf
Patch0: 0001-Add-authdes_seccreate-stub.patch
Patch1: 0001-Avoid-multiple-definiton-with-gcc-fno-common.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires libtirpc3 = %{version}-%{release}
@ -80,16 +75,13 @@ TCP over IPv4.
%prep
%setup -q -n %name-%version
%patch0 -p1
%patch1 -p1
%build
sed -i -e 's|@includedir@/tirpc|@includedir@|g' libtirpc.pc.in
/bin/sh autogen.sh
%configure --disable-static \
%if 0%{suse_version} < 1200
--disable-gssapi \
%endif
--libdir=/%{_lib}
make %{?_smp_mflags}
%make_build %{?_smp_mflags}
%install
# Don't strip .symtab to allow debugging