commit a8438714da82f7c65e6cb32a54405cacf77b39d4
Author: Jakub Bogusz <[email protected]>
Date: Sun Sep 20 17:16:09 2015 +0200
- updated optimize-la.pl to match more multilib subdirs and support direct
.la dependencies
gcc-optimize-la.pl | 10 ++++++----
gcc.spec | 5 +++--
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gcc.spec b/gcc.spec
index d4cab41..51efd1f 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -3159,8 +3159,9 @@ for f in libitm.la libssp.la libssp_nonshared.la \
%endif
%{?with_objc:libobjc.la};
do
- %{__perl} %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/$f %{_libdir} >
$RPM_BUILD_ROOT%{_libdir}/$f.fixed
- mv $RPM_BUILD_ROOT%{_libdir}/$f{.fixed,}
+ file="$RPM_BUILD_ROOT%{_libdir}/$f"
+ %{__perl} %{SOURCE1} "$file" %{_libdir} >"${file}.fixed"
+ %{__mv} "${file}.fixed" "$file"
done
%if %{with multilib}
for f in libitm.la libssp.la libssp_nonshared.la \
diff --git a/gcc-optimize-la.pl b/gcc-optimize-la.pl
index 5624529..39c4eac 100644
--- a/gcc-optimize-la.pl
+++ b/gcc-optimize-la.pl
@@ -16,11 +16,13 @@ close(F);
foreach (@lines)
{
- if (/(^dependency_libs='(.*)')/)
+ if (/(^dependency_libs='(.*)')[\ \t]*$/)
{
- @libs = split(/[\ \t\n]+/, trim($2));
- @L = grep(/^-L.*gcc\/.*\/\d\.\d\.\d(\/32)*$/, @libs);
- @l = grep(/^-l.*/, @libs);
+ my $trimmed = trim($2);
+ $trimmed =~ y/'//d;
+ @libs = split(/[\ \t\n]+/, $trimmed);
+ @L = grep(/^-L.*gcc\/.*\/\d\.\d\.\d(\/(32|64|x32|nof))*$/, @libs);
+ @l = grep(/^(-l.*|\/.*\.la$)/, @libs);
$opt_L = join(' ', @L);
$opt_l = join(' ', @l);
print("dependency_libs='");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gcc.git/commitdiff/a8438714da82f7c65e6cb32a54405cacf77b39d4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
