rpms/libtevent
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop the unneeded ABI hide patch

Browse Source
This commit is contained in:
Jakub Hrozek 2018-07-13 08:36:58 +02:00
parent d7f5d970d5
commit e86a2a06f6
3 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libtevent.spec
View File

@ -8,7 +8,7 @@
Name: libtevent
Version: 0.9.37
Release: 1%{?dist}
Release: 2%{?dist}
Summary: The tevent library
License: LGPLv3+
URL: http://tevent.samba.org/
@ -28,9 +28,6 @@ BuildRequires: libxslt
Provides: bundled(libreplace)
Patch0001: tevent-dont-use-usr-bin-env-python.patch
Patch0002: tevent-hide-local-ABI-symbols.patch
%if 0%{?with_python3}
BuildRequires: python3-devel
BuildRequires: python3-talloc-devel >= 2.0.7
@ -101,6 +98,8 @@ export PY3_CONFIG_FLAGS=--extra-python=%{__python3}
export PY3_CONFIG_FLAGS=
%endif
pathfix.py -n -p -i %{__python2} buildtools/bin/waf
%configure --disable-rpath \
--bundled-libraries=NONE \
--builtin-libraries=replace \
@ -153,6 +152,9 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
%endif
%changelog
* Fri Jul 13 2018 Jakub Hrozek <jhrozek@redhat.com> - 0.9.37-2
- Drop the unneeded ABI hide patch
* Thu Jul 12 2018 Jakub Hrozek <jhrozek@redhat.com> - 0.9.37-1
- New upstream release 0.9.37
- Apply a patch to hide local ABI symbols to avoid issues with new binutils

8
tevent-dont-use-usr-bin-env-python.patch
View File

@ -1,8 +0,0 @@
diff -up tevent-0.9.37/buildtools/bin/waf.envpy tevent-0.9.37/buildtools/bin/waf
--- tevent-0.9.37/buildtools/bin/waf.envpy 2018-07-12 13:54:01.482844881 +0200
+++ tevent-0.9.37/buildtools/bin/waf 2018-07-12 13:54:22.183967196 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# encoding: ISO-8859-1
# Thomas Nagy, 2005-2010

20
tevent-hide-local-ABI-symbols.patch
View File

@ -1,20 +0,0 @@
diff -up tevent-0.9.37/buildtools/wafsamba/samba_abi.py.sym_hide tevent-0.9.37/buildtools/wafsamba/samba_abi.py
--- tevent-0.9.37/buildtools/wafsamba/samba_abi.py.sym_hide 2018-07-12 14:00:27.787127410 +0200
+++ tevent-0.9.37/buildtools/wafsamba/samba_abi.py 2018-07-12 14:00:41.698209606 +0200
@@ -192,10 +192,12 @@ def abi_write_vscript(f, libname, curren
f.write("\t\t%s;\n" % x)
else:
f.write("\t\t*;\n")
- if abi_match != ["*"]:
- f.write("\tlocal:\n")
- for x in local_abi:
- f.write("\t\t%s;\n" % x[1:])
+ # Always hide symbols that must be local if exist
+ local_abi.extend(["!_end", "!_bss_start", "!_edata"])
+ f.write("\tlocal:\n")
+ for x in local_abi:
+ f.write("\t\t%s;\n" % x[1:])
+ if global_abi != ["*"]:
if len(global_abi) > 0:
f.write("\t\t*;\n")
f.write("};\n")