filesystem patch
by Farkas Levente
hi,
a second try to make a common scripts.
i hope it'll work.
i still not enable mingw32.sh, but it also would be useful with this patch.
--
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.6
diff -u -u -r1.6 mingw32-filesystem.spec
--- mingw32-filesystem.spec 24 Nov 2008 16:08:07 -0000 1.6
+++ mingw32-filesystem.spec 25 Nov 2008 17:32:30 -0000
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: mingw32-filesystem
-Version: 39
-Release: 3%{?dist}
+Version: 40
+Release: 1%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -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
@@ -135,13 +135,18 @@
%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
+* Tue Nov 25 2008 Levente Farkas <lfarkas(a)lfarkas.org> - 40-1
+- Rewrite mingw32-scripts to run in the current shell
+- Re-add mingw32-make
+- Add mingw32-env to mingw32.sh
+
* Mon Nov 24 2008 Richard W.M. Jones <rjones(a)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.
Index: mingw32-scripts.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-scripts.sh,v
retrieving revision 1.1
diff -u -u -r1.1 mingw32-scripts.sh
--- mingw32-scripts.sh 24 Nov 2008 16:08:07 -0000 1.1
+++ mingw32-scripts.sh 25 Nov 2008 17:32:30 -0000
@@ -1,6 +1,6 @@
#!/bin/sh -
-# mingw32-configure
+# mingw32-scripts
# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones.
# Copyright (C) 2008 Levente Farkas
#
@@ -21,7 +21,5 @@
# This is a useful command-line script through which one can use the
# macros from mingw32-macros.mingw32 cross-compilation.
-# XXX This doesn't handle quoting of extra parameters which contain
-# spaces correctly.
-
-rpm --eval "%{_"`basename $0|tr "-" "_"`"} $@"|sh
+NAME="`basename $0|tr -- - _`"
+eval "`rpm --eval "%{_$NAME}"`" "$@"
Index: mingw32.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32.sh,v
retrieving revision 1.1
diff -u -u -r1.1 mingw32.sh
--- mingw32.sh 30 Oct 2008 09:49:17 -0000 1.1
+++ mingw32.sh 25 Nov 2008 17:32:30 -0000
@@ -1 +1,3 @@
# Environment variables for MinGW.
+
+alias mingw32-env='eval `rpm --eval %{_mingw32_env}`'
15 years, 5 months
Re: error compiling postgresql with fedora mingw
by Richard W.M. Jones
On Tue, Nov 25, 2008 at 08:43:12AM -0200, Itamar - IspBrasil wrote:
> `/home/itamar/fedora/mingw-postgresql/postgresql-8.3.5/src/port'
> i686-pc-mingw32-gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
> -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -Wall
> -Wmissing-prototypes -Wpointer-arith -Winline
> -Wdeclaration-after-statement -Wendif-labels -fno-strict-aliasing
> -fwrapv zic.o ialloc.o scheck.o localtime.o -L../../src/port
> -Wl,--allow-multiple-definition -lpgport -lz -lm -lws2_32 -lshfolder
> -o zic.exe
> ../../src/port/libpgport.a: could not read symbols: Archive has no
> index; run ranlib to add one
Probably best to ask Fedora MinGW questions on the Fedora MinGW list
next time ...
https://admin.fedoraproject.org/mailman/listinfo/fedora-mingw
In this case the error is that the script uses 'ar' to create a static
library. Either use 'i686-pc-mingw32-ar rcs' to make the library, or
run 'i686-pc-mingw32-ranlib' on the library generated above by 'ar'.
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/
15 years, 5 months
jpeg, png and tiff
by Farkas Levente
hi,
what's the current setup with these image libraries? since i see there
is jpeg and png but not tiff for mingw although gtk use all of them. now
mingw32-gtk use mingw32-png or system png? are you sure about it?? from
the build log i see libtiff and libpng installed by some deps. is it
sure that mingw32-gtk do not use system libtiff?
i just come to that conclusion because gtk+ can't compile without
libtiff our --without-libtiff.
--
Levente "Si vis pacem para bellum!"
15 years, 5 months
package request: mingw32-libgsf
by Eric Smith
My application uses libgsf to read ZIP files, and in the past I've built
it against a Windows binary package provided on gnome.org. It would be
nice to have a mingw32-libgsf RPM, now that all the other libraries I
use are available in other mingw32- RPMs.
I've started trying to construct a suitable spec file and build it
myself, starting from the Fedora development libgsf SRPM, but it has
quickly become apparent that I don't really know what I'm doing. I'll
continue to flail away at it, but if anyone who actually has experience
with packaging libraries for mingw32 were to beat me to the punch, I
wouldn't be the least bit offended. :-)
In fact, I'm willing to offer a $100 bounty for a working RPM (with
SRPM). It's not a lot, but it would buy a few pizzas and beers. :-)
Thanks!
Eric
15 years, 5 months
[libgsf PATCH] Support cross-compilation under Fedora MinGW
by Richard W.M. Jones
Hi,
I'm from the Fedora MinGW project (http://fedoraproject.org/wiki/MinGW),
and we are cross-compiling a number of Linux libraries, from Fedora
targeting Windows. So I hope this is the right place to post a couple
of libgsf patches which enable libgsf to be cross-compiled using
Fedora MinGW cross-compiler.
The first patch changes the way that libbz2 / bzlib.h is detected. It
is my understanding that both the library and the header file are
needed in order to enable BZ2 support. However autoconf's
AC_CHECK_LIB cannot be used to check whether -lbz2 works on its own on
Windows, for rather complex reasons which are better explained by
referring to this thread:
http://www.nabble.com/failed-tests-AC_CHECK_LIB-td19588119.html#a19589469
So the first patch replaces the pair of tests with an invocation of
AC_LINK_IFELSE that tries to compile and link a program with both the
header file and a call to the sentinel library function.
The second patch, considerably simpler, enables deprecated functions
in glib, because otherwise G_WIN32_DLLMAIN_FOR_DLL_NAME isn't defined
in gsf/gsf-utils.c. I'm not really familiar with what this macro
does, and maybe a better solution is just to not use it if the macro
isn't defined.
Here is our development repository:
http://hg.et.redhat.com/misc/fedora-mingw--devel
If we make any updates then you can get the latest specfile and
patches by clicking 'manifest', then 'libgsf'.
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
15 years, 5 months
Policy on naming of implibs
by Richard W.M. Jones
I think we need a policy of naming implibs.
For example, the standard build of bzip2 builds a DLL and implib
called 'bz2-1.dll' and 'bz2.dll.a' respectively. That's not in itself
a problem because you can link with such a library by hand using:
gcc foo.c -lbz2
GCC apparently checks for both 'bz2.dll.a' and 'libbz2.dll.a', so it
works in this situation.
However libtool won't look for 'bz2.dll.a' at all, only an implib
beginning with 'lib*'. If you try to specify the library by giving
the full path to libtool, then libtool assumes it's a static library.
The only way around this was to rename 'bz2.dll.a' -> 'libbz2.dll.a'
which fixes my libtool problem. (Leaving the DLL with the same name
was fine).
http://hg.et.redhat.com/misc/fedora-mingw--devel/?cs=e18117547659
So I think we need a policy that implibs need to be named after the
pattern 'lib*.dll.a'.
By my reckoning this problem affects:
mingw32-bzip2 (fixed by the changeset above)
mingw32-readline
mingw32-pdcurses
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/
15 years, 5 months
updated filesystem patch
by Farkas Levente
i hope i fix here everything.
--
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 17:43:54 -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-*
+%{_libdir}/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 17:43:54 -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,13 +41,15 @@
%_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; \
- CC="${MINGW_CC:-%_mingw32_cc}"; export CC; \
- CXX="${MINGW_CXX:-%_mingw32_cxx}"; export CXX; \
- CFLAGS="${MINGW_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \
- CXXFLAGS="${MINGW_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \
+ CC="${MINGW32_CC:-%_mingw32_cc}"; export CC; \
+ CXX="${MINGW32_CXX:-%_mingw32_cxx}"; export CXX; \
+ CFLAGS="${MINGW32_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \
+ CXXFLAGS="${MINGW32_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \
for i in `ls %{_mingw32_bindir}|grep -- "-config\$"` ; do \
CONFIG_NAME=`echo $i|tr "a-z-" "A-Z_"`; \
declare -x $CONFIG_NAME="%{_mingw32_bindir}/$i" ; export $CONFIG_NAME; \
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 17:43:54 -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
15 years, 5 months
libwx_baseu trouble rebuilding mingw32-nsis on Fedora 9 x86_64
by Eric Smith
When I try to build NSIS, I get:
error: Failed build dependencies:
/usr/lib/libwx_baseu-2.8.so is needed by
mingw32-nsis-2.39-5.fc9.x86_64
I just installed yum install wxGTK.i386, and it didn't help. I have
/usr/lib/libwx_baseu-2.8.so.0, but not just the .so, though I have the
.so for 64-bit:
$ ls -l /usr/lib*/libwx_baseu-2.8*
lrwxrwxrwx 1 root root 20 2008-10-27 18:59
/usr/lib64/libwx_baseu-2.8.so -> libwx_baseu-2.8.so.0
lrwxrwxrwx 1 root root 24 2008-10-27 18:59
/usr/lib64/libwx_baseu-2.8.so.0 -> libwx_baseu-2.8.so.0.5.0
-rwxr-xr-x 1 root root 1436264 2008-09-30 08:04
/usr/lib64/libwx_baseu-2.8.so.0.5.0
lrwxrwxrwx 1 root root 24 2008-11-21 12:32
/usr/lib/libwx_baseu-2.8.so.0 -> libwx_baseu-2.8.so.0.5.0
-rwxr-xr-x 1 root root 1370588 2008-09-30 08:04
/usr/lib/libwx_baseu-2.8.so.0.5.0
Where is libws_baseu-2.8.so supposed to come from? I tried creating the
link by hand, but doing the rpmbuild *still* gives the same error. This
seems a bit mysterious to me.
Thanks!
Eric
15 years, 5 months
/tmp/mingw32-binutils.patch
by Farkas Levente
hi,
small spec file fixes already applied to the el-5 branch and rebuild for
el-5 the new rpm in the needsign queue.
--
Levente "Si vis pacem para bellum!"
Index: mingw32-binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-binutils/EL-5/mingw32-binutils.spec,v
retrieving revision 1.1
diff -u -r1.1 mingw32-binutils.spec
--- mingw32-binutils.spec 6 Nov 2008 13:50:21 -0000 1.1
+++ mingw32-binutils.spec 21 Nov 2008 21:37:09 -0000
@@ -4,7 +4,7 @@
Name: mingw32-binutils
Version: %{binutils_version}_%{mingw32_binutils_rpmvers}
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: MinGW Windows binutils
License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
@@ -16,12 +16,7 @@
BuildRequires: flex
BuildRequires: bison
BuildRequires: texinfo
-BuildRequires: mingw32-filesystem >= 26
-
-Requires: mingw32-filesystem >= 26
-
-Provides: mingw-binutils = %{version}
-Obsoletes: mingw-binutils < 2.18.50_20080109_2-8
+BuildRequires: mingw32-filesystem >= 38
%description
@@ -76,6 +71,9 @@
%changelog
+* Fri Nov 21 2008 Levente Farkas <lfarkas(a)lfarkas.org> - 2.18.50_20080109_2-9
+- BR mingw32-filesystem >= 38
+
* Wed Sep 24 2008 Richard W.M. Jones <rjones(a)redhat.com> - 2.18.50_20080109_2-8
- Rename mingw -> mingw32.
- BR mingw32-filesystem >= 26.
15 years, 5 months
binutils SRPM?
by Eric Smith
Is there a source RPM for mingw32-binutils? I don't see it in the
repository.
Thanks!
Eric
15 years, 5 months