rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Prevent errors when the folders %{mingw32_prefix} or %{mingw64_prefix} are missing

Browse Source 
and fix parse error when -config files containing a . are available in %{mingw32_bindir} or %{mingw64_bindir} (RHBZ #657478)
This commit is contained in:
Erik van Pienbroek 2012-06-06 21:02:08 +02:00
parent 57554d32bb
commit 0cec28deb7
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macros.mingw32
View File

@ -78,7 +78,7 @@
fi; \ fi; \
LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \ LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \ for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
x=`basename $i|tr "a-z+-" "A-ZX_"`; \ x=`basename $i|tr "a-z+-." "A-ZX_"`; \
declare -x $x="$i" ; export $x; \ declare -x $x="$i" ; export $x; \
done; \ done; \
unset x i unset x i

2
macros.mingw64
View File

@ -78,7 +78,7 @@
fi; \ fi; \
LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \ LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \ for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
x=`basename $i|tr "a-z+-" "A-ZX_"`; \ x=`basename $i|tr "a-z+-." "A-ZX_"`; \
declare -x $x="$i" ; export $x; \ declare -x $x="$i" ; export $x; \
done; \ done; \
unset x i unset x i

7
mingw-filesystem.spec
View File

@ -2,7 +2,7 @@
Name: mingw-filesystem Name: mingw-filesystem
Version: 95 Version: 95
Release: 9%{?dist} Release: 10%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -246,6 +246,11 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Wed Jun 6 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-10
- Prevent errors when the folders %%{mingw32_prefix} or %%{mingw64_prefix} are missing
- Fix parse error when -config files containing a . are available
in %%{mingw32_bindir} or %%{mingw64_bindir} (RHBZ #657478)
* Thu Apr 19 2012 Kalev Lember <kalevlember@gmail.com> - 95-9 * Thu Apr 19 2012 Kalev Lember <kalevlember@gmail.com> - 95-9
- Fix whitespace handling in %%mingw_configure and friends - Fix whitespace handling in %%mingw_configure and friends

3
mingw-find-debuginfo.sh
View File

@ -31,6 +31,9 @@ done
for target in $@; do for target in $@; do
prefix=`rpm --eval "%{${target}_prefix}"` prefix=`rpm --eval "%{${target}_prefix}"`
if [ ! -d $RPM_BUILD_ROOT$prefix ] ; then
continue
fi
find $RPM_BUILD_ROOT$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" | find $RPM_BUILD_ROOT$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" |
sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/${target}-debugfiles.list sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/${target}-debugfiles.list
done done