rpms/ocaml-mlgmpidl/F-10 mlgmpidl-1.1-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 ocaml-mlgmpidl.spec, 1.1, 1.2 sources, 1.2, 1.3 mlgmpidl-1.0-Makefile.patch, 1.1, NONE
Alan Dunn
amdunn at fedoraproject.org
Thu Apr 2 15:31:02 UTC 2009
Author: amdunn
Update of /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5822/F-10
Modified Files:
.cvsignore import.log ocaml-mlgmpidl.spec sources
Added Files:
mlgmpidl-1.1-Makefile.patch
Removed Files:
mlgmpidl-1.0-Makefile.patch
Log Message:
New upstream version incorporates functional interface to Mpfr.
mlgmpidl-1.1-Makefile.patch:
--- NEW FILE mlgmpidl-1.1-Makefile.patch ---
--- Makefile 2009-04-02 09:41:47.000000000 -0400
+++ Makefile 2009-04-02 09:51:12.000000000 -0400
@@ -11,6 +11,24 @@
#
PREFIX = $(MLGMPIDL_PREFIX)
+# Location of includes
+GMP_INCLUDEDIR = $(GMP_PREFIX)/include
+MPFR_INCLUDEDIR = $(MPFR_PREFIX)/include
+
+# Location of C libraries
+GMP_LIBDIR = $(GMP_PREFIX)/lib
+MPFR_LIBDIR = $(MPFR_PREFIX)/lib
+
+# Location of OCaml libraries
+CAML_LIBDIR = $(CAML_PREFIX)/lib/ocaml
+CAMLIDL_LIBDIR = $(CAMLIDL_PREFIX)/lib/ocaml
+MLGMPIDL_LIBDIR = $(MLGMPIDL_PREFIX)/lib
+
+# Eventual installation destination directories
+INSTALL_INCLUDEDIR = $(PREFIX)/include
+INSTALL_OCAML_LIBDIR = $(PREFIX)/lib/ocaml/mlgmpidl
+INSTALL_BINDIR = $(PREFIX)/bin
+
#---------------------------------------
# CAML part
#---------------------------------------
@@ -18,15 +36,15 @@
OCAMLINC =
ifeq ($(HAS_MPFR),0)
OCAMLLDFLAGS = \
--ccopt "-L$(MLGMPIDL_PREFIX)/lib" -cclib "-lgmp_caml" \
--ccopt "-L$(GMP_PREFIX)/lib" -cclib "-lgmp" \
--ccopt "-L$(CAMLIDL_PREFIX)/lib/ocaml" -cclib "-lcamlidl"
+-ccopt "-L$(MLGMPIDL_LIBDIR)" -cclib "-lgmp_caml" \
+-ccopt "-L$(GMP_LIBDIR)" -cclib "-lgmp" \
+-ccopt "-L$(CAMLIDL_LIBDIR)" -cclib "-lcamlidl"
else
OCAMLLDFLAGS = \
--ccopt "-L$(MLGMPIDL_PREFIX)/lib" -cclib "-lgmp_caml" \
--ccopt "-L$(MPFR_PREFIX)/lib" -cclib "-lmpfr" \
--ccopt "-L$(GMP_PREFIX)/lib" -cclib "-lgmp" \
--ccopt "-L$(CAMLIDL_PREFIX)/lib/ocaml" -cclib "-lcamlidl"
+-ccopt "-L$(MLGMPIDL_LIBDIR)" -cclib "-lgmp_caml" \
+-ccopt "-L$(MPFR_LIBDIR)" -cclib "-lmpfr" \
+-ccopt "-L$(GMP_LIBDIR)" -cclib "-lgmp" \
+-ccopt "-L$(CAMLIDL_LIBDIR)" -cclib "-lcamlidl"
endif
#---------------------------------------
@@ -36,14 +54,14 @@
ifeq ($(HAS_MPFR),0)
ICFLAGS = \
-DHAS_MPFR=$(HAS_MPFR) \
--I$(GMP_PREFIX)/include \
--I$(CAML_PREFIX)/lib/ocaml -I$(CAMLIDL_PREFIX)/lib/ocaml
+-I$(GMP_INCLUDEDIR) \
+-I$(CAML_LIBDIR) -I$(CAMLIDL_LIBDIR)
else
ICFLAGS = \
-DHAS_MPFR=$(HAS_MPFR) \
--I$(GMP_PREFIX)/include \
--I$(MPFR_PREFIX)/include \
--I$(CAML_PREFIX)/lib/ocaml -I$(CAMLIDL_PREFIX)/lib/ocaml
+-I$(GMP_INCLUDEDIR) \
+-I$(MPFR_INCLUDEDIR) \
+-I$(CAML_LIBDIR) -I$(CAMLIDL_LIBDIR)
endif
#---------------------------------------
@@ -89,20 +107,20 @@
-ccopt "-L." bigarray.cma gmp.cma
install:
- mkdir -p $(PREFIX)/include $(PREFIX)/lib $(PREFIX)/bin
- cp -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(PREFIX)/lib
- cp -f $(CCINC_TOINSTALL) $(PREFIX)/include
- for i in $(CCLIB_TOINSTALL); do if test -f $$i; then cp -f $$i $(PREFIX)/lib; fi; done
- for i in $(CCBIN_TOINSTALL); do if test -f $$i; then cp -f $$i $(PREFIX)/bin; fi; done
+ mkdir -p $(INSTALL_INCLUDEDIR) $(INSTALL_OCAML_LIBDIR) $(INSTALL_BINDIR)
+ cp -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(INSTALL_OCAML_LIBDIR)
+ cp -f $(CCINC_TOINSTALL) $(INSTALL_INCLUDEDIR)
+ for i in $(CCLIB_TOINSTALL); do if test -f $$i; then cp -f $$i $(INSTALL_OCAML_LIBDIR); fi; done
+ for i in $(CCBIN_TOINSTALL); do if test -f $$i; then cp -f $$i $(INSTALL_BINDIR); fi; done
#---------------------------------------
# Misc rules
#---------------------------------------
distclean: clean
- (cd $(PREFIX)/include; /bin/rm -f $(CCINC_TOINSTALL))
- (cd $(PREFIX)/lib; /bin/rm -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(CCLIB_TOINSTALL))
- (cd $(PREFIX)/bin; /bin/rm -f $(CCBIN_TOINSTALL))
+ (cd $(INSTALL_INCLUDEDIR); /bin/rm -f $(CCINC_TOINSTALL))
+ (cd $(INSTALL_OCAML_LIBDDIR); /bin/rm -f $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx))
+ (cd $(INSTALL_BINDIR); /bin/rm -f $(CCBIN_TOINSTALL))
clean:
/bin/rm -fr tmp html
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 28 Mar 2009 15:27:17 -0000 1.2
+++ .cvsignore 2 Apr 2009 15:30:32 -0000 1.3
@@ -1 +1 @@
-mlgmpidl.tgz
+mlgmpidl-1.1.tgz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 28 Mar 2009 15:27:17 -0000 1.1
+++ import.log 2 Apr 2009 15:30:32 -0000 1.2
@@ -1 +1,2 @@
ocaml-mlgmpidl-1_0-1_fc10:F-10:ocaml-mlgmpidl-1.0-1.fc10.src.rpm:1238253748
+ocaml-mlgmpidl-1_1-1_fc10:F-10:ocaml-mlgmpidl-1.1-1.fc10.src.rpm:1238685944
Index: ocaml-mlgmpidl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10/ocaml-mlgmpidl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-mlgmpidl.spec 28 Mar 2009 15:27:17 -0000 1.1
+++ ocaml-mlgmpidl.spec 2 Apr 2009 15:30:32 -0000 1.2
@@ -10,17 +10,17 @@
%define debug_package %{nil}
Name: ocaml-mlgmpidl
-Version: 1.0
+Version: 1.1
Release: 1%{?dist}
Summary: OCaml interface to GMP and MPFR libraries
Group: Development/Libraries
License: LGPLv2
URL: http://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/index.html
-Source0: http://gforge.inria.fr/frs/download.php/2460/mlgmpidl.tgz
+Source0: http://gforge.inria.fr/frs/download.php/20228/mlgmpidl-%{version}.tgz
Source1: mlgmpidl_test.ml
Source2: mlgmpidl_test_result
Source3: mlgmpidl-META
-Patch0: mlgmpidl-1.0-Makefile.patch
+Patch0: mlgmpidl-1.1-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ocaml >= 3.07, ocaml-ocamldoc, ocaml-camlidl-devel, gmp-devel, mpfr-devel, prelink
# BuildRequires for documentation build
@@ -141,5 +141,7 @@
%{_docdir}/%{name}
%changelog
+* Thu Apr 02 2009 Alan Dunn <amdunn at gmail.com> 1.1-1
+- New upstream version incorporates functional interface to Mpfr.
* Sat Mar 28 2009 Alan Dunn <amdunn at gmail.com> 1.0-1
- Initial Fedora RPM version.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 28 Mar 2009 15:27:17 -0000 1.2
+++ sources 2 Apr 2009 15:30:32 -0000 1.3
@@ -1 +1 @@
-63ec244511e58bd1cbf5513dc7aaad8e mlgmpidl.tgz
+5374d9764c609e005691925c612c44ac mlgmpidl-1.1.tgz
--- mlgmpidl-1.0-Makefile.patch DELETED ---
More information about the fedora-extras-commits
mailing list