- Unify mingw32-filesystem packages from all three branches again, and

test.
- Fix mingw32-scripts so it can handle extra parameters correctly.
- Remove mingw32-env & mingw32-make since neither of them actually work.
This commit is contained in:
Richard W.M. Jones 2008-11-24 16:08:07 +00:00
parent 4b7d67464c
commit b8c580465a
3 changed files with 38 additions and 38 deletions

View File

@ -1,8 +1,8 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: mingw32-filesystem Name: mingw32-filesystem
Version: 38 Version: 39
Release: 1%{?dist} Release: 3%{?dist}
Summary: MinGW base filesystem and environment Summary: MinGW base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -17,7 +17,7 @@ Source1: mingw32-macros.mingw32
#Source3: mingw32.csh #Source3: mingw32.csh
Source4: mingw32-find-requires.sh Source4: mingw32-find-requires.sh
Source5: mingw32-find-provides.sh Source5: mingw32-find-provides.sh
Source6: mingw32-configure.sh Source6: mingw32-scripts.sh
Requires: setup Requires: setup
Requires: rpm Requires: rpm
@ -45,9 +45,6 @@ Provides: mingw32(user32.dll)
Provides: mingw32(wldap32.dll) Provides: mingw32(wldap32.dll)
Provides: mingw32(glut32.dll) Provides: mingw32(glut32.dll)
Obsoletes: mingw-filesystem = %{version}-%{release}
Provides: mingw-filesystem < 26
%description %description
This package contains the base filesystem layout, RPM macros and This package contains the base filesystem layout, RPM macros and
@ -73,8 +70,15 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/mingw32-configure pushd $RPM_BUILD_ROOT%{_bindir}
for i in mingw32-configure; do
ln -s %{_libexecdir}/mingw32-scripts $i
done
popd
#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d #mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
#install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ #install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
@ -132,11 +136,17 @@ rm -rf $RPM_BUILD_ROOT
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
%{_bindir}/mingw32-configure %{_bindir}/mingw32-configure
%{_libexecdir}/mingw32-scripts
%{_prefix}/i686-pc-mingw32/ %{_prefix}/i686-pc-mingw32/
/usr/lib/rpm/mingw32-* /usr/lib/rpm/mingw32-*
%changelog %changelog
* Mon Nov 24 2008 Richard W.M. Jones <rjones@redhat.com> - 39-3
- Unify mingw32-filesystem packages from all three branches again, and test.
- Fix mingw32-scripts so it can handle extra parameters correctly.
- Remove mingw32-env & mingw32-make since neither of them actually work.
* Sun Nov 23 2008 Richard Jones <rjones@redhat.com> - 38-1 * Sun Nov 23 2008 Richard Jones <rjones@redhat.com> - 38-1
- Added mingw32(glut32.dll). - Added mingw32(glut32.dll).

View File

@ -41,13 +41,15 @@
%_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh %_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh
%_mingw32_env HOST_CC=gcc; export HOST_CC; \ %_mingw32_env HOST_CC=gcc; export HOST_CC; \
AS="%{_mingw32_as}"; export AS; \
AR="%{_mingw32_ar}"; export AR; \
NM="%{_mingw32_nm}"; export NM; \ NM="%{_mingw32_nm}"; export NM; \
OBJDUMP="%{_mingw32_objdump}"; export OBJDUMP; \ OBJDUMP="%{_mingw32_objdump}"; export OBJDUMP; \
PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \ PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \
CC="${MINGW_CC:-%_mingw32_cc}"; export CC; \ CC="${MINGW32_CC:-%_mingw32_cc}"; export CC; \
CXX="${MINGW_CXX:-%_mingw32_cxx}"; export CXX; \ CXX="${MINGW32_CXX:-%_mingw32_cxx}"; export CXX; \
CFLAGS="${MINGW_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \ CFLAGS="${MINGW32_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \
CXXFLAGS="${MINGW_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \ CXXFLAGS="${MINGW32_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \
for i in `ls %{_mingw32_bindir}|grep -- "-config\$"` ; do \ for i in `ls %{_mingw32_bindir}|grep -- "-config\$"` ; do \
CONFIG_NAME=`echo $i|tr "a-z-" "A-Z_"`; \ CONFIG_NAME=`echo $i|tr "a-z-" "A-Z_"`; \
declare -x $CONFIG_NAME="%{_mingw32_bindir}/$i" ; export $CONFIG_NAME; \ declare -x $CONFIG_NAME="%{_mingw32_bindir}/$i" ; export $CONFIG_NAME; \

View File

@ -2,6 +2,7 @@
# mingw32-configure # mingw32-configure
# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones. # Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones.
# Copyright (C) 2008 Levente Farkas
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,23 +18,10 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# This is a useful command-line script which configures # This is a useful command-line script through which one can use the
# a program for cross-compilation. It is meant to be # macros from mingw32-macros.mingw32 cross-compilation.
# the equivalent of the %{_mingw32_configure} macro in
# /etc/rpm/macros.mingw32
mingw32_prefix=/usr/i686-pc-mingw32/sys-root/mingw # XXX This doesn't handle quoting of extra parameters which contain
mingw32_libdir=$mingw32_prefix/lib # spaces correctly.
mingw32_host=i686-pc-mingw32
mingw32_target=i686-pc-mingw32
mingw32_cc=i686-pc-mingw32-gcc
mingw32_cflags="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields"
PKG_CONFIG_PATH="$mingw32_libdir/pkgconfig" \ rpm --eval "%{_"`basename $0|tr "-" "_"`"} $@"|sh
CC="$mingw32_cc" \
CFLAGS="$mingw32_cflags" \
./configure \
--host=$mingw32_host \
--target=$mingw32_target \
--prefix=$mingw32_prefix \
"$@"