This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks.
commit c39d72301d283129424744f2bd3fae055449dfc5 Author: Lucas Nussbaum <lu...@debian.org> Date: Wed Apr 2 16:37:02 2014 +0200 Refreshed patches --- .../0001-Fix-the-OCaml-C-header-paths.patch | 72 ---------------------- .../0002-Use-the-Debian-prefix-for-building.patch | 22 ++++--- ...Fix-the-build-on-non-native-architectures.patch | 19 +++--- debian/patches/series | 1 - 4 files changed, 21 insertions(+), 93 deletions(-) diff --git a/debian/patches/0001-Fix-the-OCaml-C-header-paths.patch b/debian/patches/0001-Fix-the-OCaml-C-header-paths.patch deleted file mode 100644 index 3af4cda..0000000 --- a/debian/patches/0001-Fix-the-OCaml-C-header-paths.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: Lucas Nussbaum <lu...@debian.org> -Date: Sat, 1 Dec 2012 18:41:14 +0100 -Subject: Fix the OCaml C header paths - -This uses the Debian-specific paths for the caml C includes - -Forwarded: not-needed ---- - EXTRA/does-process-exist-c-wrapper.c | 4 ++-- - EXTRA/waitpid-c-wrapper.c | 12 ++++++------ - GETTEXT/gettext-c-wrapper.c | 6 +++--- - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/EXTRA/does-process-exist-c-wrapper.c b/EXTRA/does-process-exist-c-wrapper.c -index e512376..8351c78 100644 ---- a/EXTRA/does-process-exist-c-wrapper.c -+++ b/EXTRA/does-process-exist-c-wrapper.c -@@ -24,10 +24,10 @@ - #include <assert.h> - - #include <memory.h> --#include <mlvalues.h> -+#include <caml/mlvalues.h> - /* If I don't #include caml/alloc.h then this module compiles fine, but then crashes - at runtime. Funny, isn't it? */ --#include <alloc.h> -+#include <caml/alloc.h> - - /* Return true iff the process identified by the given pid exists. The idea is just to - call kill with 0 as a signal, which is easy in C but impossible in OCaml: */ -diff --git a/EXTRA/waitpid-c-wrapper.c b/EXTRA/waitpid-c-wrapper.c -index 7d08874..ee7a407 100644 ---- a/EXTRA/waitpid-c-wrapper.c -+++ b/EXTRA/waitpid-c-wrapper.c -@@ -22,12 +22,12 @@ - #include <errno.h> - #include <assert.h> - --#include <mlvalues.h> --#include <alloc.h> --#include <memory.h> --#include <fail.h> --#include <callback.h> --#include <unixsupport.h> -+#include <caml/mlvalues.h> -+#include <caml/alloc.h> -+#include <caml/memory.h> -+#include <caml/fail.h> -+#include <caml/callback.h> -+#include <caml/unixsupport.h> - - #define WAITPID_NAME "waitpid" - -diff --git a/GETTEXT/gettext-c-wrapper.c b/GETTEXT/gettext-c-wrapper.c -index 0c3ea78..42d5bed 100644 ---- a/GETTEXT/gettext-c-wrapper.c -+++ b/GETTEXT/gettext-c-wrapper.c -@@ -22,11 +22,11 @@ - #include <stdbool.h> - #include <libintl.h> - --#include <mlvalues.h> -+#include <caml/mlvalues.h> - /* If I don't #include caml/alloc.h then this module compiles fine, but then crashes - at runtime. Funny, isn't it? */ --#include <alloc.h> --#include <memory.h> -+#include <caml/alloc.h> -+#include <caml/memory.h> - - /* Some part of the gettext initialization should only be performed once: */ - static bool was_gettext_initialized = false; diff --git a/debian/patches/0002-Use-the-Debian-prefix-for-building.patch b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch index 64c13eb..4ca1ae0 100644 --- a/debian/patches/0002-Use-the-Debian-prefix-for-building.patch +++ b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch @@ -9,8 +9,6 @@ Forwarded: not-needed CONFIGME | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/CONFIGME b/CONFIGME -index 24941d6..cadaf22 100644 --- a/CONFIGME +++ b/CONFIGME @@ -34,11 +34,11 @@ @@ -27,12 +25,20 @@ index 24941d6..cadaf22 100644 # Prefix for the locale files localeprefix=${prefix}/share/locale -@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || exit -1) - # By default they will be installed into ${ocaml_libraryprefix}, but you - # can change it if you really want to install into a different, custom prefix. +@@ -59,12 +59,12 @@ ocaml_libraryprefix=$(ocamlc -where || e + # library or into ${ocaml_libraryprefix}, but you can change it if you really + # want to install into a different, custom prefix. # *No* trailing slash should be included. --libraryprefix=${ocaml_libraryprefix} -+libraryprefix=${prefix}/${ocaml_libraryprefix} +-libraryprefix=$(which 1>/dev/null ocamlfind && ocamlfind query lablgtk2) +-libraryprefix=${libraryprefix%/lablgtk2} +-libraryprefix=${libraryprefix:-$ocaml_libraryprefix} ++#libraryprefix=$(which 1>/dev/null ocamlfind && ocamlfind query lablgtk2) ++#libraryprefix=${libraryprefix%/lablgtk2} ++#libraryprefix=${libraryprefix:-$ocaml_libraryprefix} # # This definition may be appropriate for debian packaging: - #libraryprefix=debian/tmp/${ocaml_libraryprefix} +-#libraryprefix=debian/tmp/${ocaml_libraryprefix} ++libraryprefix=${prefix}/${ocaml_libraryprefix} + + # This should be defined as the absolute path to a directory containing + # the already configured OCaml source; in alternative, is your GNU/Linux diff --git a/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch b/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch index c6dcbe6..a96770e 100644 --- a/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch +++ b/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch @@ -12,22 +12,17 @@ Forwarded: https://bugs.launchpad.net/ocamlbricks/+bug/1130098 Makefile.d/ocamlmklib_wrapper.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -diff --git a/Makefile.d/ocamlmklib_wrapper.sh b/Makefile.d/ocamlmklib_wrapper.sh -index da72860..7a5d6ed 100755 --- a/Makefile.d/ocamlmklib_wrapper.sh +++ b/Makefile.d/ocamlmklib_wrapper.sh -@@ -42,6 +42,12 @@ cd _build/ +@@ -40,5 +40,9 @@ CMX=$(ocamlobjinfo _build/ocamlbricks.cm + cd _build/ echo "Rebuilding library with ocamlmklib..." - set -x - ocamlmklib -custom -o ocamlbricks $OBJECTS $INCLUDES $CMO --ocamlmklib -custom -o ocamlbricks $OBJECTS $INCLUDES $CMX -+if which ocamlopt &>/dev/null; then -+ ocamlmklib -custom -o ocamlbricks $OBJECTS $INCLUDES $CMX -+fi - set +x + echo '---'; set -x; ocamlc -a -linkall -dllib -locamlbricks_stubs -o ocamlbricks.cma $INCLUDES $CMO; set +x +-echo '---'; set -x; ocamlopt -a -linkall -cclib -locamlbricks_stubs -o ocamlbricks.cmxa $INCLUDES $CMX; set +x; -ls -l ocamlbricks.cm{,x}a +if which ocamlopt &>/dev/null; then -+ ls -l ocamlbricks.cm{,x}a ++ echo '---'; set -x; ocamlopt -a -linkall -cclib -locamlbricks_stubs -o ocamlbricks.cmxa $INCLUDES $CMX; set +x ++ ls -l ocamlbricks.cm{,x}a +else -+ ls -l ocamlbricks.cma ++ ls -l ocamlbricks.cma +fi diff --git a/debian/patches/series b/debian/patches/series index 41484da..ed24500 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -0001-Fix-the-OCaml-C-header-paths.patch 0002-Use-the-Debian-prefix-for-building.patch 0003-Fix-the-build-on-non-native-architectures.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits