-#%define __strip %{_mingw32_strip}
-#%define __objdump %{_mingw32_objdump}
-%define __strip :
-%define __objdump :
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+# Built-in strip corrupts binaries, so use the mingw32 strip instead:
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
%define debug_package %{nil}
%define otherlibraries win32unix str num dynlink bigarray systhreads win32graph
Name: mingw32-ocaml
-Version: 3.11.0+beta1
-Release: 8%{?dist}
+Version: 3.11.0
+Release: 0.16.beta1%{?dist}
Summary: Objective Caml MinGW cross-compiler and programming environment
License: QPL and (LGPLv2+ with exceptions)
Group: Development/Libraries
URL: http://caml.inria.fr/
-Source0: http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-%{version}.tar.bz2
+Source0: http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-%{version}+beta1.tar.bz2
# This is installed as config/Makefile when we cross-compile.
Source1000: Makefile-fedora-mingw.in
+Source1001: README.Fedora
# XXX We should apply any Fedora native patches here.
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Is it noarch? (XXX)
+# Answer: yes and no. In theory it should be, but because we install
+# Windows binaries in %{_libdir}, the path is different if built on
+# 32 and 64 bit platforms. We should probably install the binaries
+# in /usr/share.
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 30
BuildRequires: mingw32-binutils
BuildRequires: mingw32-flexdll
-# While we still ship bytecode, this requires a /usr/bin/ocamlrun from
-# the _identical_ native package. We don't have that at the moment,
-# which is why this is commented out.
-#Requires: ocaml-runtime = %{version}
+# These are required so we can use gcc -m32 and link to 32 bit X11:
+BuildRequires: /lib/libgcc_s.so.1
+BuildRequires: /usr/lib/crt1.o
+BuildRequires: /usr/lib/libX11.so
+
+# We need the native Fedora OCaml package (of the precise matching
+# version) for several reasons:
+# (a) We need /usr/bin/ocamlrun (the bytecode interpreter) in order
+# to run our bytecodes such as i686-pc-mingw32-ocamlopt. Eventually
+# shipping native versions of the cross-compiler binaries should
+# resolve this.
+# (b) We need camlp4 preprocessor, and because of the way this works
+# it has to be the camlp4 from the identical version.
+Requires: ocaml-runtime = %{version}
+Requires: ocaml-camlp4-devel = %{version}
# The built program will try to run the cross-compiler and flexdll, so
# these must be runtime requires.
%prep
-%setup -q -n ocaml-%{version}
+%setup -q -n ocaml-%{version}+beta1
%patch1000 -p1
%patch1001 -p1
# Don't run out of memory.
ulimit -s unlimited
-# Build native ocamlrun and ocamlc which contain the filename-win32-dirsep
-# patch.
+# Build native ocamlrun and ocamlc which contain the
+# filename-win32-dirsep patch.
+#
+# Note that we must build a 32 bit compiler, even on 64 bit build
+# architectures, because this compiler will try to do strength
+# reduction optimizations using its internal int type, and that must
+# match Windows' int type. (That's what -cc and -host are for).
./configure \
-no-tk \
-bindir %{_bindir} \
-libdir %{_libdir}/ocaml \
- -mandir %{_mandir}/man1
+ -mandir %{_mandir}/man1 \
+ -cc "gcc -m32" -host i386-pc-linux -x11lib /usr/lib -verbose
make world
# Now move the working ocamlrun, ocamlc into the boot/ directory,
# Build ocamlopt
make opt
+cp %{SOURCE1001} .
+
%install
rm -rf $RPM_BUILD_ROOT
cp config/Makefile \
$RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/Makefile.config
-# For bytecode binaries, change the bang-path to point to the locally
-# installed ocamlrun.
-pushd $RPM_BUILD_ROOT%{_bindir}
-for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlopt ocamlprof; do
- mv $f $f.old
- echo '#!%{_bindir}/%{_mingw32_target}-ocamlrun' > $f
- tail -n +2 $f.old >> $f
- chmod +x $f
- rm $f.old
-done
-popd
-
# Rename all the binaries to target-binary.
pushd $RPM_BUILD_ROOT%{_bindir}
-for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof ocamlrun; do
+for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof; do
mv $f %{_mingw32_target}-$f
done
popd
+# Don't install ocamlrun, use native one.
+rm $RPM_BUILD_ROOT%{_bindir}/ocamlrun
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
+%doc README.Fedora
%{_bindir}/%{_mingw32_target}-ocamlc
%{_bindir}/%{_mingw32_target}-ocamlcp
%{_bindir}/%{_mingw32_target}-ocamldep
%{_bindir}/%{_mingw32_target}-ocamlmktop
%{_bindir}/%{_mingw32_target}-ocamlprof
%{_bindir}/%{_mingw32_target}-ocamlopt
-%{_bindir}/%{_mingw32_target}-ocamlrun
%{_libdir}/%{_mingw32_target}-ocaml/
%changelog
+* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 3.11.0-0.16.beta1
+- Rebuild for mingw32-gcc 4.4
+
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0-0.15.beta1
+- Use the proper package naming convention, since '+' etc shouldn't be
+ in the name, as per Fedora packaging guidelines. Note that this won't
+ upgrade smoothly, but we don't care because these packages aren't
+ officially released yet. You'll just have to uninstall the old
+ package and install the new one.
+- Don't ship our own ocamlrun, use the native one instead.
+- Require camlp4 utilities.
+
+* Mon Nov 17 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0+beta1-14
+- Added README.Fedora.
+
+* Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0+beta1-13
+- Build the native compiler as 32 bits even on a 64 bit build
+ architecture (because the target, Windows, is 32 bit). The
+ compiler does strength reduction and other optimizations
+ internally so we must ensure it uses the same int type.
+- Requires libX11-devel.i386 and libgcc.i386.
+- Allow the normal dependency generators to run because this
+ is a native package.
+- Use mingw32 strip to avoid corrupting binaries.
+
* Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0+beta1-8
- Install ocamlc.
git.annexia.org / fedora-mingw.git / blobdiff