The following commit has been merged in the master branch:
commit d1b6643be905fc8733d1f7144af60fa0b69be6b5
Author: Eric Cooper <e...@cmu.edu>
Date: Tue Mar 3 16:04:07 2009 -0500
compile C files with -fPIC
diff --git a/Makefile b/Makefile
index 6e82f44..069d9df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,34 @@
OCAMLC = ocamlc
OCAMLOPT = ocamlopt
OCAMLMKLIB = ocamlmklib
+override CFLAGS += -O3 -funroll-loops -fPIC -DPIC
all: byte-code-library native-code-library
byte-code-library: sha.cma
native-code-library: sha.cmxa
-sha.cma: sha.cmo $(foreach n, 1 256 512,sha$(n).cmi sha$(n).lib.o
sha$(n)_stubs.o sha$(n).cmo)
- $(OCAMLMKLIB) -o sha $(filter-out %.cmi,$^)
+cmi_files = $(foreach n, 1 256 512, sha$(n).cmi)
+byte_files = sha.cmo $(foreach n, 1 256 512, sha$(n)_lib.o sha$(n)_stubs.o
sha$(n).cmo)
-sha.cmxa: sha.cmx $(foreach n, 1 256 512, sha$(n).cmi sha$(n).lib.o
sha$(n)_stubs.o sha$(n).cmx)
- $(OCAMLMKLIB) -o sha $(filter-out %.cmi,$^)
+sha.cma: $(cmi_files) $(byte_files)
+ $(OCAMLMKLIB) -o sha $(byte_files)
-%.cmo: %.ml
- $(OCAMLC) -c -o $@ $<
+native_files = $(byte_files:.cmo=.cmx)
+
+sha.cmxa: $(cmi_files) $(native_files)
+ $(OCAMLMKLIB) -o sha $(native_files)
%.cmi: %.mli
$(OCAMLC) -c -o $@ $<
+%.cmo: %.ml
+ $(OCAMLC) -c -o $@ $<
+
%.cmx: %.ml
$(OCAMLOPT) -c -o $@ $<
-%.lib.o: %.c
- $(CC) -Wall -O3 -funroll-loops -c -o $@ $<
+%_lib.c: %.c
+ cp $< $@
clean:
- rm -f *.o *.a *.cm* dll*.so
+ rm -f *.o *.a *.cm* dll*.so sha*_lib.c
diff --git a/debian/changelog b/debian/changelog
index 9ffaa4d..65b4395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml-sha (1.5-2) unstable; urgency=low
+
+ * Compile C files with -fPIC (closes: #518038)
+ * Change Maintainer to d-o-m
+ * Add shasum.ml example in -dev package
+
+ -- Eric Cooper <e...@cmu.edu> Tue, 03 Mar 2009 15:43:10 -0500
+
ocaml-sha (1.5-1) unstable; urgency=low
* New upstream version
diff --git a/debian/control b/debian/control
index 5b6e5ce..0179811 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: ocaml-sha
Section: devel
Priority: optional
-Maintainer: Eric Cooper <e...@cmu.edu>
-Uploaders: Ralf Treinen <trei...@debian.org>
+Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
+Uploaders: Eric Cooper <e...@cmu.edu>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0), cdbs, ocaml-nox (>= 3.11), dh-ocaml,
ocaml-findlib
Standards-Version: 3.8.0
diff --git a/debian/rules b/debian/rules
index 5310016..a66fc73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ DEB_MAKE_BUILD_TARGET = byte-code-library
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
DEB_MAKE_BUILD_TARGET += native-code-library
endif
+DEB_INSTALL_EXAMPLES_libsha-ocaml-dev := shasum.ml
META:
echo 'name="sha"' > META
--
ocaml-sha packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
