4:36 a.m.
hi,
here is my modified patch and the script for all script use the macros
and a few tab->space conversion.
may i apply it?
another important note, as we add and rebuild with -mms-bitfields in all
spec file
BuildRequires: mingw32-filesystem >= 23
Requires: mingw32-filesystem >= 23
should have to change to
BuildRequires: mingw32-filesystem >= 38
Requires: mingw32-filesystem >= 38
and there are some spec file where mingw32-filesystem only BuildRequires
and not Requires. imho all packages should have to add it. the same
apply to mingw32-example.spec too.
--
Levente "Si vis pacem para bellum!"
? mingw32-scripts.sh
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.4
diff -u -r1.4 mingw32-filesystem.spec
--- mingw32-filesystem.spec 19 Nov 2008 18:02:20 -0000 1.4
+++ mingw32-filesystem.spec 21 Nov 2008 10:31:05 -0000
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: mingw32-filesystem
-Version: 37
+Version: 38
Release: 1%{?dist}
Summary: MinGW base filesystem and environment
@@ -17,7 +17,7 @@
#Source3: mingw32.csh
Source4: mingw32-find-requires.sh
Source5: mingw32-find-provides.sh
-Source6: mingw32-configure.sh
+Source6: mingw32-scripts.sh
Requires: setup
Requires: rpm
@@ -72,8 +72,10 @@
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}
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/mingw32-configure
+(cd $RPM_BUILD_ROOT%{_bindir}; for i in mingw32-env mingw32-configure mingw32-make ; do
ln -s %{_libexecdir}/mingw32-scripts $i ; done)
#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
#install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
@@ -130,12 +132,17 @@
%config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
-%{_bindir}/mingw32-configure
+%{_bindir}/*
+%{_libexecdir}/mingw32-scripts
%{_prefix}/i686-pc-mingw32/
/usr/lib/rpm/mingw32-*
%changelog
+* Fri Nov 21 2008 Levente Farkas <lfarkas(a)lfarkas.org> 38-1
+- all script use macros.mingw32
+- a few tab->space conversion
+
* Wed Nov 19 2008 Richard Jones <rjones(a)redhat.com> - 37-1
- Revert part of the 36-1 patch. --build option to configure was wrong.
Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.3
diff -u -r1.3 mingw32-macros.mingw32
--- mingw32-macros.mingw32 19 Nov 2008 18:02:20 -0000 1.3
+++ mingw32-macros.mingw32 21 Nov 2008 10:31:05 -0000
@@ -23,16 +23,16 @@
%_mingw32_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions
--param=ssp-buffer-size=4 -mms-bitfields
-%_mingw32_cc i686-pc-mingw32-gcc
-%_mingw32_cpp i686-pc-mingw32-gcc -E
-%_mingw32_ar i686-pc-mingw32-ar
-%_mingw32_as i686-pc-mingw32-as
-%_mingw32_dlltool i686-pc-mingw32-dlltool
-%_mingw32_ranlib i686-pc-mingw32-ranlib
-%_mingw32_strip i686-pc-mingw32-strip
-%_mingw32_objdump i686-pc-mingw32-objdump
+%_mingw32_cc i686-pc-mingw32-gcc
+%_mingw32_cpp i686-pc-mingw32-gcc -E
+%_mingw32_ar i686-pc-mingw32-ar
+%_mingw32_as i686-pc-mingw32-as
+%_mingw32_dlltool i686-pc-mingw32-dlltool
+%_mingw32_ranlib i686-pc-mingw32-ranlib
+%_mingw32_strip i686-pc-mingw32-strip
+%_mingw32_objdump i686-pc-mingw32-objdump
%_mingw32_nm i686-pc-mingw32-nm
-%_mingw32_windres i686-pc-mingw32-windres
+%_mingw32_windres i686-pc-mingw32-windres
%_mingw32_cxx i686-pc-mingw32-g++
%_mingw32_cache mingw32-config.cache
5:11 a.m.
On Fri, Nov 21, 2008 at 11:36:09AM +0100, Farkas Levente wrote:
hi,
here is my modified patch and the script for all script use the macros
and a few tab->space conversion.
Can you post the full patch, including the missing mingw32-scripts.sh.
another important note, as we add and rebuild with -mms-bitfields in
all
spec file
BuildRequires: mingw32-filesystem >= 23
Requires: mingw32-filesystem >= 23
should have to change to
BuildRequires: mingw32-filesystem >= 38
Requires: mingw32-filesystem >= 38
and there are some spec file where mingw32-filesystem only BuildRequires
and not Requires. imho all packages should have to add it. the same
apply to mingw32-example.spec too.
The Requires: mingw32-filesystem >= [latest version] is added
automatically, so it should NOT be present in any specfile.
Rich.
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v
6:13 a.m.
Richard W.M. Jones wrote:
On Fri, Nov 21, 2008 at 11:36:09AM +0100, Farkas Levente wrote:
> hi,
> here is my modified patch and the script for all script use the macros
> and a few tab->space conversion.
Can you post the full patch, including the missing mingw32-scripts.sh.
attached.
> another important note, as we add and rebuild with -mms-bitfields
in all
> spec file
> BuildRequires: mingw32-filesystem >= 23
> Requires: mingw32-filesystem >= 23
> should have to change to
> BuildRequires: mingw32-filesystem >= 38
> Requires: mingw32-filesystem >= 38
> and there are some spec file where mingw32-filesystem only BuildRequires
> and not Requires. imho all packages should have to add it. the same
> apply to mingw32-example.spec too.
The Requires: mingw32-filesystem >= [latest version] is added
automatically, so it should NOT be present in any specfile.
then i'll remove from eg. mingw32-runtime.
--
Levente "Si vis pacem para bellum!"
Index: mingw32-configure.sh
===================================================================
RCS file: mingw32-configure.sh
diff -N mingw32-configure.sh
--- mingw32-configure.sh 19 Nov 2008 15:33:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-#!/bin/sh -
-
-# mingw32-configure
-# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# This is a useful command-line script which configures
-# a program for cross-compilation. It is meant to be
-# the equivalent of the %{_mingw32_configure} macro in
-# /etc/rpm/macros.mingw32
-
-mingw32_prefix=/usr/i686-pc-mingw32/sys-root/mingw
-mingw32_libdir=$mingw32_prefix/lib
-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" \
-CC="$mingw32_cc" \
-CFLAGS="$mingw32_cflags" \
-./configure \
- --host=$mingw32_host \
- --target=$mingw32_target \
- --prefix=$mingw32_prefix \
- "$@"
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.4
diff -u -r1.4 mingw32-filesystem.spec
--- mingw32-filesystem.spec 19 Nov 2008 18:02:20 -0000 1.4
+++ mingw32-filesystem.spec 21 Nov 2008 12:12:11 -0000
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: mingw32-filesystem
-Version: 37
+Version: 38
Release: 1%{?dist}
Summary: MinGW base filesystem and environment
@@ -17,7 +17,7 @@
#Source3: mingw32.csh
Source4: mingw32-find-requires.sh
Source5: mingw32-find-provides.sh
-Source6: mingw32-configure.sh
+Source6: mingw32-scripts.sh
Requires: setup
Requires: rpm
@@ -72,8 +72,10 @@
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}
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/mingw32-configure
+(cd $RPM_BUILD_ROOT%{_bindir}; for i in mingw32-env mingw32-configure mingw32-make ; do
ln -s %{_libexecdir}/mingw32-scripts $i ; done)
#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
#install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
@@ -130,12 +132,17 @@
%config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
-%{_bindir}/mingw32-configure
+%{_bindir}/*
+%{_libexecdir}/mingw32-scripts
%{_prefix}/i686-pc-mingw32/
/usr/lib/rpm/mingw32-*
%changelog
+* Fri Nov 21 2008 Levente Farkas <lfarkas(a)lfarkas.org> 38-1
+- all script use macros.mingw32
+- a few tab->space conversion
+
* Wed Nov 19 2008 Richard Jones <rjones(a)redhat.com> - 37-1
- Revert part of the 36-1 patch. --build option to configure was wrong.
Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.3
diff -u -r1.3 mingw32-macros.mingw32
--- mingw32-macros.mingw32 19 Nov 2008 18:02:20 -0000 1.3
+++ mingw32-macros.mingw32 21 Nov 2008 12:12:11 -0000
@@ -23,16 +23,16 @@
%_mingw32_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions
--param=ssp-buffer-size=4 -mms-bitfields
-%_mingw32_cc i686-pc-mingw32-gcc
-%_mingw32_cpp i686-pc-mingw32-gcc -E
-%_mingw32_ar i686-pc-mingw32-ar
-%_mingw32_as i686-pc-mingw32-as
-%_mingw32_dlltool i686-pc-mingw32-dlltool
-%_mingw32_ranlib i686-pc-mingw32-ranlib
-%_mingw32_strip i686-pc-mingw32-strip
-%_mingw32_objdump i686-pc-mingw32-objdump
+%_mingw32_cc i686-pc-mingw32-gcc
+%_mingw32_cpp i686-pc-mingw32-gcc -E
+%_mingw32_ar i686-pc-mingw32-ar
+%_mingw32_as i686-pc-mingw32-as
+%_mingw32_dlltool i686-pc-mingw32-dlltool
+%_mingw32_ranlib i686-pc-mingw32-ranlib
+%_mingw32_strip i686-pc-mingw32-strip
+%_mingw32_objdump i686-pc-mingw32-objdump
%_mingw32_nm i686-pc-mingw32-nm
-%_mingw32_windres i686-pc-mingw32-windres
+%_mingw32_windres i686-pc-mingw32-windres
%_mingw32_cxx i686-pc-mingw32-g++
%_mingw32_cache mingw32-config.cache
@@ -41,6 +41,8 @@
%_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh
%_mingw32_env HOST_CC=gcc; export HOST_CC; \
+ AS="%{_mingw32_as}"; export AS; \
+ AR="%{_mingw32_ar}"; export AR; \
NM="%{_mingw32_nm}"; export NM; \
OBJDUMP="%{_mingw32_objdump}"; export OBJDUMP; \
PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \
Index: mingw32-scripts.sh
===================================================================
RCS file: mingw32-scripts.sh
diff -N mingw32-scripts.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mingw32-scripts.sh 21 Nov 2008 12:12:11 -0000
@@ -0,0 +1,24 @@
+#!/bin/sh -
+
+# mingw32-configure
+# 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
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# This is a useful command-line script through which one can use the
+# macros from mingw32-macros.mingw32 cross-compilation.
+
+rpm --eval "%{_"`basename $0|tr "-" "_"`"}"|sh
7:13 a.m.
On Fri, Nov 21, 2008 at 01:13:47PM +0100, Farkas Levente wrote:
+rpm --eval "%{_"`basename $0|tr "-"
"_"`"}"|sh
I don't see how this is going to work when you have extra parameters,
eg. where do the extra params go for:
mingw32-configure --enable-some-feature
?
Rich.
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-top is 'top' for virtual machines. Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top
7:38 a.m.
Richard W.M. Jones wrote:
On Fri, Nov 21, 2008 at 01:13:47PM +0100, Farkas Levente wrote:
> +rpm --eval "%{_"`basename $0|tr "-"
"_"`"}"|sh
I don't see how this is going to work when you have extra parameters,
eg. where do the extra params go for:
mingw32-configure --enable-some-feature
opps. may be
rpm --eval "%{_"`basename $0|tr "-" "_"`"}"
"$@"|sh
would be better :-)
the strange thing it seems ti me that it works in runtime
--with-cross-host (but it was a bad tip anyway)
--
Levente "Si vis pacem para bellum!"
5639
days inactive
5639
days old
4 comments
2 participants
participants (2)
-
Farkas Levente -
Richard W.M. Jones