diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-03-14 03:27:13 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-03-14 03:27:13 -0500 |
| commit | 18fc821373d1ae7883ff1e0410a3b872e28d4b6f (patch) | |
| tree | 3a398725cc76b9aa967fd461081fb1810a3c564a | |
| parent | 1f4a69f902644897074c752d2cd8d2f58d7b8f2a (diff) | |
| download | cygwin-gcc-18fc821373d1ae7883ff1e0410a3b872e28d4b6f.tar.gz cygwin-gcc-18fc821373d1ae7883ff1e0410a3b872e28d4b6f.tar.xz cygwin-gcc-18fc821373d1ae7883ff1e0410a3b872e28d4b6f.zip | |
Ship libiberty.a from cygwin-binutils-devel instead of cygwin-gcc
| -rw-r--r-- | cygwin-gcc.spec | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cygwin-gcc.spec b/cygwin-gcc.spec index a096b33..2bb38c2 100644 --- a/cygwin-gcc.spec +++ b/cygwin-gcc.spec @@ -6,7 +6,7 @@ %global gcc_version %{gcc_major}.%{gcc_minor}.%{gcc_micro} # Note, gcc_release must be integer, if you want to add suffixes to # %{release}, append them after %{gcc_release} on Release: line. -%global gcc_release 1 +%global gcc_release 2 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha %global build_ada 1 %else @@ -275,6 +275,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/java/libgcj-*.jar rm -f $RPM_BUILD_ROOT%{_datadir}/python/* %endif +# This file is provided by cygwin-binutils-devel +rm -f $RPM_BUILD_ROOT%{_prefix}/%{_cygwin_target}/lib/libiberty.a + # These scripts are not intended for cross-compiling scenarios %if %{build_java} rm -f $RPM_BUILD_ROOT%{_bindir}/%{_cygwin_target}-aot-compile @@ -334,7 +337,6 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{_cygwin_target}/lib/libffi.a %{_prefix}/%{_cygwin_target}/lib/libffi.dll.a %endif -%{_prefix}/%{_cygwin_target}/lib/libiberty.a %dir %{_libdir}/gcc/%{_cygwin_target} %dir %{_libdir}/gcc/%{_cygwin_target}/%{version} %{_libdir}/gcc/%{_cygwin_target}/%{version}/crtbegin.o @@ -483,6 +485,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Mar 13 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 4.5.1-2 +- Ship libiberty.a from cygwin-binutils-devel instead of cygwin-gcc. + * Thu Feb 17 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 4.5.1-1 - Match native gcc version to resolve ecj1 dependency on libgcj. |