8:30 a.m.
hi,
i review this %_mingw32_make macro again. i can't find any better
solution than implement it separately from %_mingw32_makeinstall.
probably most of the case it's not used inside spec file, but even if i
used it will work and use the runtime used directories (the only
exception %_mingw32_make install, but there is the %_mingw32_makeinstall
macro for this).
it's working on fedora and rhel/centos too and mingw32-make outside of
spec also working.
i hope it'd be ok (and if you like i'll do the epel build).
yours.
--
Levente "Si vis pacem para bellum!"
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.7
diff -u -u -r1.7 mingw32-filesystem.spec
--- mingw32-filesystem.spec 6 Dec 2008 14:33:41 -0000 1.7
+++ mingw32-filesystem.spec 17 Dec 2008 14:23:26 -0000
@@ -75,7 +75,7 @@
mkdir -p $RPM_BUILD_ROOT%{_bindir}
pushd $RPM_BUILD_ROOT%{_bindir}
-for i in mingw32-configure ; do
+for i in mingw32-configure mingw32-make; do
ln -s %{_libexecdir}/mingw32-scripts $i
done
popd
@@ -136,13 +136,16 @@
%config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
-%{_bindir}/mingw32-configure
+%{_bindir}/mingw32-*
%{_libexecdir}/mingw32-scripts
%{_prefix}/i686-pc-mingw32/
/usr/lib/rpm/mingw32-*
%changelog
+* Wed Dec 17 2008 Levente Farkas <lfarkas(a)lfarkas.org> - 40-3
+- Re-add mingw32-make
+
* Sat Dec 6 2008 Levente Farkas <lfarkas(a)lfarkas.org> - 40-2
- Rewrite mingw32-scripts to run in the current shell
- (Re-add mingw32-make) - Removed by RWMJ.
Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.5
diff -u -u -r1.5 mingw32-macros.mingw32
--- mingw32-macros.mingw32 6 Dec 2008 14:33:41 -0000 1.5
+++ mingw32-macros.mingw32 17 Dec 2008 14:23:26 -0000
@@ -93,6 +93,22 @@
%_mingw32_make %{_mingw32_env} ; \
make \\\
+ prefix=%{_mingw32_prefix} \\\
+ exec_prefix=%{_mingw32_exec_prefix} \\\
+ bindir=%{_mingw32_bindir} \\\
+ sbindir=%{_mingw32_sbindir} \\\
+ sysconfdir=%{_mingw32_sysconfdir} \\\
+ datadir=%{_mingw32_datadir} \\\
+ includedir=%{_mingw32_includedir} \\\
+ libdir=%{_mingw32_libdir} \\\
+ libexecdir=%{_mingw32_libexecdir} \\\
+ localstatedir=%{_mingw32_localstatedir} \\\
+ sharedstatedir=%{_mingw32_sharedstatedir} \\\
+ mandir=%{_mingw32_mandir} \\\
+ infodir=%{_mingw32_infodir}
+
+%_mingw32_makeinstall %{_mingw32_env} ; \
+ make \\\
prefix=%{?buildroot:%{buildroot}}%{_mingw32_prefix} \\\
exec_prefix=%{?buildroot:%{buildroot}}%{_mingw32_exec_prefix} \\\
bindir=%{?buildroot:%{buildroot}}%{_mingw32_bindir} \\\
@@ -105,6 +121,6 @@
localstatedir=%{?buildroot:%{buildroot}}%{_mingw32_localstatedir} \\\
sharedstatedir=%{?buildroot:%{buildroot}}%{_mingw32_sharedstatedir} \\\
mandir=%{?buildroot:%{buildroot}}%{_mingw32_mandir} \\\
- infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir}
+ infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} \\\
+ install
-%_mingw32_makeinstall %{_mingw32_make} install
4:46 a.m.
On Wed, Dec 17, 2008 at 03:30:11PM +0100, Farkas Levente wrote:
hi,
i review this %_mingw32_make macro again. i can't find any better
solution than implement it separately from %_mingw32_makeinstall.
probably most of the case it's not used inside spec file, but even if i
used it will work and use the runtime used directories (the only
exception %_mingw32_make install, but there is the %_mingw32_makeinstall
macro for this).
it's working on fedora and rhel/centos too and mingw32-make outside of
spec also working.
i hope it'd be ok (and if you like i'll do the epel build).
yours.
Yes, this is looking much better. The only thing I would say is that
it's probably best to list the actual files explicitly here:
-%{_bindir}/mingw32-configure
+%{_bindir}/mingw32-*
ie.
%{_bindir}/mingw32-configure
%{_bindir}/mingw32-make
Rich.
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
4:49 a.m.
Richard W.M. Jones wrote:
On Wed, Dec 17, 2008 at 03:30:11PM +0100, Farkas Levente wrote:
> hi,
> i review this %_mingw32_make macro again. i can't find any better
> solution than implement it separately from %_mingw32_makeinstall.
> probably most of the case it's not used inside spec file, but even if i
> used it will work and use the runtime used directories (the only
> exception %_mingw32_make install, but there is the %_mingw32_makeinstall
> macro for this).
> it's working on fedora and rhel/centos too and mingw32-make outside of
> spec also working.
> i hope it'd be ok (and if you like i'll do the epel build).
> yours.
Yes, this is looking much better. The only thing I would say is that
it's probably best to list the actual files explicitly here:
> -%{_bindir}/mingw32-configure
> +%{_bindir}/mingw32-*
ie.
%{_bindir}/mingw32-configure
%{_bindir}/mingw32-make
as you like:-)
--
Levente "Si vis pacem para bellum!"
4:53 a.m.
On Thu, Dec 18, 2008 at 11:49:16AM +0100, Farkas Levente wrote:
Richard W.M. Jones wrote:
> On Wed, Dec 17, 2008 at 03:30:11PM +0100, Farkas Levente wrote:
>> hi,
>> i review this %_mingw32_make macro again. i can't find any better
>> solution than implement it separately from %_mingw32_makeinstall.
>> probably most of the case it's not used inside spec file, but even if i
>> used it will work and use the runtime used directories (the only
>> exception %_mingw32_make install, but there is the %_mingw32_makeinstall
>> macro for this).
>> it's working on fedora and rhel/centos too and mingw32-make outside of
>> spec also working.
>> i hope it'd be ok (and if you like i'll do the epel build).
>> yours.
>
> Yes, this is looking much better. The only thing I would say is that
> it's probably best to list the actual files explicitly here:
>
>> -%{_bindir}/mingw32-configure
>> +%{_bindir}/mingw32-*
>
> ie.
>
> %{_bindir}/mingw32-configure
> %{_bindir}/mingw32-make
as you like:-)
OK, I've built this in Rawhide. Note that the version is 41-1.
Rich.
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
4:53 a.m.
On Wed, Dec 17, 2008 at 03:30:11PM +0100, Farkas Levente wrote:
hi,
i review this %_mingw32_make macro again. i can't find any better
solution than implement it separately from %_mingw32_makeinstall.
probably most of the case it's not used inside spec file, but even if i
used it will work and use the runtime used directories (the only
exception %_mingw32_make install, but there is the %_mingw32_makeinstall
macro for this).
it's working on fedora and rhel/centos too and mingw32-make outside of
spec also working.
I still really don't think we should be passing all these args to
'make' or 'make install' by default because its diverging from what
native builds do. For native builds '%__make' just expands to
'/usr/bin/make' and %configure is where all these paths are setup.
Only in a very few cases of broken apps not using autotools would
args to make be needed and they can be done in those app's .spec
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
5:10 a.m.
Daniel P. Berrange wrote:
On Wed, Dec 17, 2008 at 03:30:11PM +0100, Farkas Levente wrote:
> hi,
> i review this %_mingw32_make macro again. i can't find any better
> solution than implement it separately from %_mingw32_makeinstall.
> probably most of the case it's not used inside spec file, but even if i
> used it will work and use the runtime used directories (the only
> exception %_mingw32_make install, but there is the %_mingw32_makeinstall
> macro for this).
> it's working on fedora and rhel/centos too and mingw32-make outside of
> spec also working.
I still really don't think we should be passing all these args to
'make' or 'make install' by default because its diverging from what
native builds do. For native builds '%__make' just expands to
'/usr/bin/make' and %configure is where all these paths are setup.
Only in a very few cases of broken apps not using autotools would
args to make be needed and they can be done in those app's .spec
Daniel
you've got right, the most important part here to set env variable
setting and not make's args ie. it can be:
%_mingw32_make %{_mingw32_env} ; make
too.
but the %_mingw32_makeinstall should have to remain this way (imho)
--
Levente "Si vis pacem para bellum!"
8:44 a.m.
Farkas Levente wrote:
Daniel P. Berrange wrote:
> On Wed, Dec 17, 2008 at 03:30:11PM +0100, Farkas Levente wrote:
>> hi,
>> i review this %_mingw32_make macro again. i can't find any better
>> solution than implement it separately from %_mingw32_makeinstall.
>> probably most of the case it's not used inside spec file, but even if i
>> used it will work and use the runtime used directories (the only
>> exception %_mingw32_make install, but there is the %_mingw32_makeinstall
>> macro for this).
>> it's working on fedora and rhel/centos too and mingw32-make outside of
>> spec also working.
> I still really don't think we should be passing all these args to
> 'make' or 'make install' by default because its diverging from what
> native builds do. For native builds '%__make' just expands to
> '/usr/bin/make' and %configure is where all these paths are setup.
> Only in a very few cases of broken apps not using autotools would
> args to make be needed and they can be done in those app's .spec
>
> Daniel
you've got right, the most important part here to set env variable
setting and not make's args ie. it can be:
%_mingw32_make %{_mingw32_env} ; make
too.
but the %_mingw32_makeinstall should have to remain this way (imho)
so here's my last patch in this series which removes the parameters from
make.
--
Levente "Si vis pacem para bellum!"
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.8
diff -u -r1.8 mingw32-filesystem.spec
--- mingw32-filesystem.spec 18 Dec 2008 10:53:30 -0000 1.8
+++ mingw32-filesystem.spec 29 Dec 2008 14:40:37 -0000
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: mingw32-filesystem
-Version: 41
+Version: 42
Release: 1%{?dist}
Summary: MinGW base filesystem and environment
@@ -144,6 +144,9 @@
%changelog
+* Wed Dec 29 2008 Levente Farkas <lfarkas(a)lfarkas.org> - 42-1
+- Remove parameters from mingw32-make
+
* Wed Dec 17 2008 Levente Farkas <lfarkas(a)lfarkas.org> - 41-1
- Re-add mingw32-make
Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.6
diff -u -r1.6 mingw32-macros.mingw32
--- mingw32-macros.mingw32 18 Dec 2008 10:53:30 -0000 1.6
+++ mingw32-macros.mingw32 29 Dec 2008 14:40:37 -0000
@@ -91,22 +91,6 @@
--mandir=%{_mingw32_mandir} \\\
--infodir=%{_mingw32_infodir}
-%_mingw32_make %{_mingw32_env} ; \
- make \\\
- prefix=%{_mingw32_prefix} \\\
- exec_prefix=%{_mingw32_exec_prefix} \\\
- bindir=%{_mingw32_bindir} \\\
- sbindir=%{_mingw32_sbindir} \\\
- sysconfdir=%{_mingw32_sysconfdir} \\\
- datadir=%{_mingw32_datadir} \\\
- includedir=%{_mingw32_includedir} \\\
- libdir=%{_mingw32_libdir} \\\
- libexecdir=%{_mingw32_libexecdir} \\\
- localstatedir=%{_mingw32_localstatedir} \\\
- sharedstatedir=%{_mingw32_sharedstatedir} \\\
- mandir=%{_mingw32_mandir} \\\
- infodir=%{_mingw32_infodir}
-
%_mingw32_makeinstall %{_mingw32_env} ; \
make \\\
prefix=%{?buildroot:%{buildroot}}%{_mingw32_prefix} \\\
@@ -124,3 +108,4 @@
infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} \\\
install
+%_mingw32_make %{_mingw32_env} ; make
8:15 a.m.
On Mon, Dec 29, 2008 at 03:44:54PM +0100, Farkas Levente wrote:
Farkas Levente wrote:
> Daniel P. Berrange wrote:
>> I still really don't think we should be passing all these args to
>> 'make' or 'make install' by default because its diverging from
what
>> native builds do. For native builds '%__make' just expands to
>> '/usr/bin/make' and %configure is where all these paths are setup.
>> Only in a very few cases of broken apps not using autotools would
>> args to make be needed and they can be done in those app's .spec
>>
>> Daniel
>
> you've got right, the most important part here to set env variable
> setting and not make's args ie. it can be:
> %_mingw32_make %{_mingw32_env} ; make
> too.
> but the %_mingw32_makeinstall should have to remain this way (imho)
so here's my last patch in this series which removes the parameters from
make.
[...]
+%_mingw32_make %{_mingw32_env} ; make
I think, as per Daniel's reply above, that %_mingw32_make should just
expand to plain 'make'.
Note that almost every specfile we have just runs 'make' (and 'make
install'). This macro isn't really used anywhere, so I'm not sure why
it is necessary.
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
4:19 p.m.
Richard W.M. Jones wrote:
On Mon, Dec 29, 2008 at 03:44:54PM +0100, Farkas Levente wrote:
> Farkas Levente wrote:
>> Daniel P. Berrange wrote:
>>> I still really don't think we should be passing all these args to
>>> 'make' or 'make install' by default because its diverging
from what
>>> native builds do. For native builds '%__make' just expands to
>>> '/usr/bin/make' and %configure is where all these paths are setup.
>>> Only in a very few cases of broken apps not using autotools would
>>> args to make be needed and they can be done in those app's .spec
>>>
>>> Daniel
>> you've got right, the most important part here to set env variable
>> setting and not make's args ie. it can be:
>> %_mingw32_make %{_mingw32_env} ; make
>> too.
>> but the %_mingw32_makeinstall should have to remain this way (imho)
> so here's my last patch in this series which removes the parameters from
> make.
[...]
> +%_mingw32_make %{_mingw32_env} ; make
I think, as per Daniel's reply above, that %_mingw32_make should just
expand to plain 'make'.
Note that almost every specfile we have just runs 'make' (and 'make
install'). This macro isn't really used anywhere, so I'm not sure why
it is necessary.
the differencies it's define a lots of env variable. and i look into
many configure scripts and makefile and saw that thay use these macros
like PKG_CONFIG_PATH, CC, CFLAGS, RANLIB etc.
so imho it's rather useful since in this case we've to use less patches
in most pacakges.
--
Levente "Si vis pacem para bellum!"
7:15 a.m.
On Fri, Jan 09, 2009 at 11:19:16PM +0100, Farkas Levente wrote:
the differencies it's define a lots of env variable. and i look
into
many configure scripts and makefile and saw that thay use these macros
like PKG_CONFIG_PATH, CC, CFLAGS, RANLIB etc.
so imho it's rather useful since in this case we've to use less patches
in most pacakges.
I think this is a misunderstanding of what the generated Makefiles are
doing. Take a look at the GNU standards on this:
http://www.gnu.org/prep/standards/standards.html#Directory-Variables
Basically what it's saying is that any paths provided to ./configure
become the defaults in the Makefile. eg:
./configure --prefix=/foo
make # by default the prefix will be /foo
People can _override_ these paths by supplying arguments to make, eg:
./configure --prefix=/usr
make prefix=/foo # override the default prefix
However we want the first case -- all paths supplied to ./configure
and just use the simple 'make' command.
That's not to say that every package out there follows the GNU
standards (or, equivalently, uses autoconf correctly), but we can deal
with non-compliant packages on a case-by-case basis.
Rich.
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
Read my OCaml programming blog: http://camltastic.blogspot.com/
Fedora now supports 68 OCaml packages (the OPEN alternative to F#)
http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
9:23 a.m.
Richard W.M. Jones wrote:
On Fri, Jan 09, 2009 at 11:19:16PM +0100, Farkas Levente wrote:
> the differencies it's define a lots of env variable. and i look into
> many configure scripts and makefile and saw that thay use these macros
> like PKG_CONFIG_PATH, CC, CFLAGS, RANLIB etc.
> so imho it's rather useful since in this case we've to use less patches
> in most pacakges.
I think this is a misunderstanding of what the generated Makefiles are
doing. Take a look at the GNU standards on this:
http://www.gnu.org/prep/standards/standards.html#Directory-Variables
Basically what it's saying is that any paths provided to ./configure
become the defaults in the Makefile. eg:
./configure --prefix=/foo
make # by default the prefix will be /foo
People can _override_ these paths by supplying arguments to make, eg:
./configure --prefix=/usr
make prefix=/foo # override the default prefix
However we want the first case -- all paths supplied to ./configure
and just use the simple 'make' command.
That's not to say that every package out there follows the GNU
standards (or, equivalently, uses autoconf correctly), but we can deal
with non-compliant packages on a case-by-case basis.
i talk about makefiles which not generated with configure.
--
Levente "Si vis pacem para bellum!"
5577
days inactive
5602
days old
10 comments
3 participants
participants (3)
-
Daniel P. Berrange -
Farkas Levente -
Richard W.M. Jones