Fix a build failure in mingw32-libsoup and mingw32-webkitgtk

This commit is contained in:
Erik van Pienbroek 2010-11-07 16:28:42 +01:00
parent a6da1d27e5
commit 2f3bba8b2f

View File

@ -7,7 +7,7 @@
Name: mingw32-glib2
Version: 2.26.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: MinGW Windows GLib2 library
License: LGPLv2+
@ -137,8 +137,13 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d
# Drop this reference manually
find $RPM_BUILD_ROOT -name \*.la -exec sed -i s@' -lintl'@@ {} \;
# Let binaries depending on GLib link against the libintl wrapper library in a way that libtool doesn't refuse
sed -i s@inherited_linker_flags=''@inherited_linker_flags='-Wl,%{_mingw32_libdir}/libintl.a -Wl,--exclude-libs=libintl.a'@ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la
# Let binaries depending on GLib link against libproxy-intl in a way that libtool doesn't refuse
sed -i s@"inherited_linker_flags=''"@"inherited_linker_flags='-Wl,%{_mingw32_libdir}/libintl.a -Wl,--exclude-libs=libintl.a -lkernel32 -lmsvcrt'"@ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la
sed -i s@"inherited_linker_flags=''"@"inherited_linker_flags='-Wl,%{_mingw64_libdir}/libintl.a -Wl,--exclude-libs=libintl.a -lkernel32 -lmsvcrt'"@ $RPM_BUILD_ROOT%{_mingw64_libdir}/libglib-2.0.la
# Drop the reference to libintl from the pgkconfig and .la files as it's a soft dependency now
sed -i s/" -lintl"// $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/glib-2.0.pc
sed -i s/" -lintl"// $RPM_BUILD_ROOT%{_mingw64_libdir}/pkgconfig/glib-2.0.pc
%find_lang glib20
@ -205,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Nov 7 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.26.0-4
- Fix a build failure in mingw32-libsoup and mingw32-webkitgtk
* Sun Oct 17 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.26.0-3
- Let binaries depending on GLib link against the libintl wrapper library
in a way that libtool doesn't refuse