Try not to export LD path when building locales

This commit is contained in:
Andrey Bondrov 2016-09-02 10:20:18 +10:00
parent 1f385a3a99
commit bc6794cee1

View file

@ -57,7 +57,7 @@ Summary: The GNU libc libraries
Name: glibc Name: glibc
Epoch: 6 Epoch: 6
Version: 2.24 Version: 2.24
Release: 2 Release: 1
License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System/Libraries Group: System/Libraries
Url: http://www.eglibc.org/ Url: http://www.eglibc.org/
@ -1303,10 +1303,10 @@ rm -f %{buildroot}%{_infodir}/dir
%if %{with locales} %if %{with locales}
export PATH=%{buildroot}%{_bindir}:%{buildroot}%{_sbindir}:$PATH export PATH=%{buildroot}%{_bindir}:%{buildroot}%{_sbindir}:$PATH
%global glibcver %(rpm -q --qf "%%{VERSION}" glibc) #global glibcver %(rpm -q --qf "%%{VERSION}" glibc)
%if "%{shrink:%{python:rpm.evrCompare(rpm.expandMacro("%{ver}"),rpm.expandMacro("%{glibcver}"))}}" == "0" #if "%{shrink:%{python:rpm.evrCompare(rpm.expandMacro("%{ver}"),rpm.expandMacro("%{glibcver}"))}}" == "0"
export LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir}:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir}:$LD_LIBRARY_PATH
%endif #endif
export I18NPATH=%{buildroot}%{_datadir}/i18n export I18NPATH=%{buildroot}%{_datadir}/i18n
# Needed for/used by locale-archive # Needed for/used by locale-archive