[arch-commits] Commit in pfff/trunk (4 files)
Jürgen Hötzel
juergen at archlinux.org
Tue Sep 6 20:21:23 UTC 2016
Date: Tuesday, September 6, 2016 @ 20:21:22
Author: juergen
Revision: 188881
Add fixes for OCaml 4.03.0 rebuild
Added:
pfff/trunk/0001-Replace-use-of-uint32-by-standard-complient-way.patch
pfff/trunk/0001-external-ocamlzip-zip.ml-remove-duplicate-exception.patch
pfff/trunk/0001-lang_php-matcher-Makefile-remove-warn-error.patch
Modified:
pfff/trunk/PKGBUILD
----------------------------------------------------------------+
0001-Replace-use-of-uint32-by-standard-complient-way.patch | 39 ++++++++++
0001-external-ocamlzip-zip.ml-remove-duplicate-exception.patch | 27 ++++++
0001-lang_php-matcher-Makefile-remove-warn-error.patch | 26 ++++++
PKGBUILD | 19 +++-
4 files changed, 106 insertions(+), 5 deletions(-)
Added: 0001-Replace-use-of-uint32-by-standard-complient-way.patch
===================================================================
--- 0001-Replace-use-of-uint32-by-standard-complient-way.patch (rev 0)
+++ 0001-Replace-use-of-uint32-by-standard-complient-way.patch 2016-09-06 20:21:22 UTC (rev 188881)
@@ -0,0 +1,39 @@
+From 2c3dfc748e84fbfd99cf64bdedfa150a1b30286f Mon Sep 17 00:00:00 2001
+From: tychota <tychota at users.noreply.github.com>
+Date: Sun, 17 Jul 2016 10:52:08 +0200
+Subject: [PATCH] Replace use of uint32 by standard/ complient way
+
+This closes #142.
+
+Uint32 semms to be platform specific :
+- http://stackoverflow.com/questions/13362084/difference-between-uint32-and-uint32-t
+
+This I'm importing stdint and using the standard uint32_t type.
+---
+ external/ocamlzip/zlibstubs.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/external/ocamlzip/zlibstubs.c b/external/ocamlzip/zlibstubs.c
+index a627df9..62e5ed7 100644
+--- a/external/ocamlzip/zlibstubs.c
++++ b/external/ocamlzip/zlibstubs.c
+@@ -16,6 +16,7 @@
+ /* Stub code to interface with Zlib */
+
+ #include <zlib.h>
++#include <stdint.h>
+
+ #include <caml/mlvalues.h>
+ #include <caml/alloc.h>
+@@ -168,7 +169,7 @@ value camlzip_inflateEnd(value vzs)
+
+ value camlzip_update_crc32(value crc, value buf, value pos, value len)
+ {
+- return caml_copy_int32(crc32((uint32) Int32_val(crc),
++ return caml_copy_int32(crc32((uint32_t) Int32_val(crc),
+ &Byte_u(buf, Long_val(pos)),
+ Long_val(len)));
+ }
+--
+2.9.2
+
Added: 0001-external-ocamlzip-zip.ml-remove-duplicate-exception.patch
===================================================================
--- 0001-external-ocamlzip-zip.ml-remove-duplicate-exception.patch (rev 0)
+++ 0001-external-ocamlzip-zip.ml-remove-duplicate-exception.patch 2016-09-06 20:21:22 UTC (rev 188881)
@@ -0,0 +1,27 @@
+From a74aa84d1c8307a298567d73d2785354e7175c18 Mon Sep 17 00:00:00 2001
+From: pad <yoann.padioleau at gmail.com>
+Date: Thu, 11 Aug 2016 11:48:14 -0700
+Subject: [PATCH] * external/ocamlzip/zip.ml: remove duplicate exception. It is
+ causing compilation error with ocaml 4.02.3 apparently. Should fix issue #133
+ and issue #145
+
+---
+ external/ocamlzip/zip.ml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/external/ocamlzip/zip.ml b/external/ocamlzip/zip.ml
+index f49b91a..b6ad634 100644
+--- a/external/ocamlzip/zip.ml
++++ b/external/ocamlzip/zip.ml
+@@ -73,8 +73,6 @@ type out_file =
+ mutable of_entries: entry list;
+ of_comment: string }
+
+-exception Error of string * string * string
+-
+ (* Return the position of the last occurrence of s1 in s2, or -1 if not
+ found. *)
+
+--
+2.9.2
+
Added: 0001-lang_php-matcher-Makefile-remove-warn-error.patch
===================================================================
--- 0001-lang_php-matcher-Makefile-remove-warn-error.patch (rev 0)
+++ 0001-lang_php-matcher-Makefile-remove-warn-error.patch 2016-09-06 20:21:22 UTC (rev 188881)
@@ -0,0 +1,26 @@
+From ba77d861f2ec15ba74f5bdeaf2d0941995653454 Mon Sep 17 00:00:00 2001
+From: pad <yoann.padioleau at gmail.com>
+Date: Thu, 11 Aug 2016 13:01:33 -0700
+Subject: [PATCH] * lang_php/matcher/Makefile: remove -warn-error should fix
+ issue #147
+
+---
+ lang_php/matcher/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang_php/matcher/Makefile b/lang_php/matcher/Makefile
+index 056b4fb..1b1375e 100644
+--- a/lang_php/matcher/Makefile
++++ b/lang_php/matcher/Makefile
+@@ -31,7 +31,7 @@ INCLUDEDIRS= $(TOP)/commons $(TOP)/commons/ocollection \
+ # Generic variables
+ ##############################################################################
+ #BUG in ocamlc, false positive on unused value
+-WARNING_FLAGS=-w +A-4-29-6-45-32 -warn-error +a
++#WARNING_FLAGS=-w +A-4-29-6-45-32
+ -include $(TOP)/Makefile.common
+
+ ##############################################################################
+--
+2.9.2
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-09-06 19:26:20 UTC (rev 188880)
+++ PKGBUILD 2016-09-06 20:21:22 UTC (rev 188881)
@@ -5,7 +5,7 @@
pkgname='pfff'
pkgver=0.29
-pkgrel=3
+pkgrel=4
pkgdesc='Tools and APIs for code analysis, visualization and transformation'
arch=('i686' 'x86_64')
@@ -16,13 +16,22 @@
options=(!makeflags staticlibs) # parallel build fails, need *.a files
source=("$pkgname-$pkgver.tar.gz::https://github.com/facebook/pfff/archive/v$pkgver.tar.gz"
"lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch"
-"lang_js-analyze-utils_js.mli.patch")
+"lang_js-analyze-utils_js.mli.patch"
+"0001-Replace-use-of-uint32-by-standard-complient-way.patch"
+"0001-external-ocamlzip-zip.ml-remove-duplicate-exception.patch"
+"0001-lang_php-matcher-Makefile-remove-warn-error.patch")
sha256sums=('d31c68f1ebb1770297eb26441d21d83728c0fbdb9c7bb3be27625db45fae72d1'
'28b220807087b9378e0fcab1187163cdeb8d3da80f53f00ec9af434467ace57f'
- 'bb10f6b25afe0cd0df5084d9e3624f43cbf7489b148c67d99479d11cf90999b7')
+ 'bb10f6b25afe0cd0df5084d9e3624f43cbf7489b148c67d99479d11cf90999b7'
+ '1110287c8f402d57628c17e68b7881af0da895ffe4860933586070ab7a779d60'
+ 'e41743e0d29a4be5c2481fb969d43c4ca64633fcb9657716fdb3fd0635333d18'
+ 'a2170d5c4ef76395837a00eec2500d6ec4654fc26df5997f7d30e88176dfa854')
prepare() {
cd "$srcdir"/$pkgname-$pkgver
+ patch -Np1 -i ../0001-Replace-use-of-uint32-by-standard-complient-way.patch
+ patch -Np1 -i ../0001-external-ocamlzip-zip.ml-remove-duplicate-exception.patch
+ patch -Np1 -i ../0001-lang_php-matcher-Makefile-remove-warn-error.patch
patch -Np1 -i ../lang_js-analyze-utils_js.mli.patch
patch -Np1 -i ../lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch
}
@@ -32,8 +41,8 @@
./configure --prefix=/usr
make clean
make depend
- make
- make opt
+ WARNING_FLAGS="-w +A-4-29-6-45-41-44-48" make
+ WARNING_FLAGS="-w +A-4-29-6-45-41-44-48" make opt
}
package() {
More information about the arch-commits
mailing list