[Pkg-ocaml-maint-commits] [ocaml-sha] 03/04: update patches
Eric Cooper
ecc at cmu.edu
Sun Jul 23 23:26:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
ecc-guest pushed a commit to branch master
in repository ocaml-sha.
commit daed9230695c067cbca1829e98311f56aa01bdde
Author: Eric Cooper <ecc at cmu.edu>
Date: Sun Jul 23 19:16:46 2017 -0400
update patches
---
debian/patches/0001-install-mli-files.patch | 17 +++++++++++++++--
debian/patches/0002-compile-C-files-with-fPIC.patch | 11 +++++++----
debian/patches/0003-use-internal-ccopts-variable.patch | 11 +++++++----
.../0004-add-all-byte-and-install-byte-targets.patch | 13 ++++++++-----
...de-string.h-in-C-stubs-to-silence-gcc-warnings.patch | 6 +++---
.../0006-change-compiler-flags-for-building-tests.patch | 8 ++++----
6 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/debian/patches/0001-install-mli-files.patch b/debian/patches/0001-install-mli-files.patch
index 90652d6..1d8ed40 100644
--- a/debian/patches/0001-install-mli-files.patch
+++ b/debian/patches/0001-install-mli-files.patch
@@ -1,13 +1,26 @@
+From ce74471245fa96e44b2a33c23b2dbe4adcd302a4 Mon Sep 17 00:00:00 2001
+From: Eric Cooper <ecc at cmu.edu>
+Date: Sun, 23 Jul 2017 19:05:59 -0400
+Subject: [PATCH 1/6] install mli files
+
+Signed-off-by: Eric Cooper <ecc at cmu.edu>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
diff --git a/Makefile b/Makefile
index 334847d..a1e6ad3 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ clean:
rm -f *.$(OBJ) *.$(A) *.$(SO) *.cmo *.cmi *.cma *.cmx *.cmxa sha.test $(PROGRAMS)
-
+
install: sha1.cma sha1.cmxa sha256.cma sha256.cmxa sha512.cma sha512.cmxa sha.cma sha.cmxa META
- ocamlfind install sha META *.cmx sha1.cmi sha1.cma sha1.cmxa sha256.cmi sha256.cma sha256.cmxa sha512.cmi sha512.cma sha512.cmxa sha.cma sha.cmxa *.$(A) *.$(SO)
+ ocamlfind install sha META *.mli *.cmx sha1.cmi sha1.cma sha1.cmxa sha256.cmi sha256.cma sha256.cmxa sha512.cmi sha512.cma sha512.cmxa sha.cma sha.cmxa *.$(A) *.$(SO)
-
+
uninstall:
ocamlfind remove sha
+--
+2.13.2
+
diff --git a/debian/patches/0002-compile-C-files-with-fPIC.patch b/debian/patches/0002-compile-C-files-with-fPIC.patch
index 03c1b53..515c048 100644
--- a/debian/patches/0002-compile-C-files-with-fPIC.patch
+++ b/debian/patches/0002-compile-C-files-with-fPIC.patch
@@ -1,16 +1,17 @@
+From a0cdfffda05620d962344b1b5d9cff0eb1522a62 Mon Sep 17 00:00:00 2001
From: Eric Cooper <ecc at cmu.edu>
Date: Fri, 25 Feb 2011 13:51:15 -0500
-Subject: compile C files with -fPIC
+Subject: [PATCH 2/6] compile C files with -fPIC
closes: #518038
Signed-off-by: Eric Cooper <ecc at cmu.edu>
---
- Makefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 6f7b45e..64819c9 100644
+index a1e6ad3..6918cfb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
@@ -20,3 +21,5 @@ index 6f7b45e..64819c9 100644
OCAMLOPT = ocamlopt
OCAMLMKLIB = ocamlmklib
--
+2.13.2
+
diff --git a/debian/patches/0003-use-internal-ccopts-variable.patch b/debian/patches/0003-use-internal-ccopts-variable.patch
index 950b956..708bc5c 100644
--- a/debian/patches/0003-use-internal-ccopts-variable.patch
+++ b/debian/patches/0003-use-internal-ccopts-variable.patch
@@ -1,17 +1,18 @@
+From cf831469e90912c9f258603053ca888f987062e2 Mon Sep 17 00:00:00 2001
From: Eric Cooper <ecc at cmu.edu>
Date: Fri, 25 Feb 2011 11:43:56 -0500
-Subject: use internal ccopts variable
+Subject: [PATCH 3/6] use internal ccopts variable
use $(ccopts) instead of $(CFLAGS) so that we still get
correct settings when CFLAGS is set by the build system
Signed-off-by: Eric Cooper <ecc at cmu.edu>
---
- Makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 64819c9..82bd445 100644
+index 6918cfb..0c5a072 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
@@ -30,3 +31,5 @@ index 64819c9..82bd445 100644
%.lib.$(OBJ): %.$(OBJ)
mv $< $@
--
+2.13.2
+
diff --git a/debian/patches/0004-add-all-byte-and-install-byte-targets.patch b/debian/patches/0004-add-all-byte-and-install-byte-targets.patch
index 84cce2e..8c7bb09 100644
--- a/debian/patches/0004-add-all-byte-and-install-byte-targets.patch
+++ b/debian/patches/0004-add-all-byte-and-install-byte-targets.patch
@@ -1,15 +1,16 @@
+From 71877fc4d785ef875e30036d78f9f27b2d290d5b Mon Sep 17 00:00:00 2001
From: Eric Cooper <ecc at cmu.edu>
Date: Wed, 2 Mar 2011 19:19:40 -0500
-Subject: add all-byte and install-byte targets
+Subject: [PATCH 4/6] add all-byte and install-byte targets
closes: #616176
Signed-off-by: Eric Cooper <ecc at cmu.edu>
---
- Makefile | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
diff --git a/Makefile b/Makefile
-index 82bd445..c72417c 100644
+index 0c5a072..705fbf5 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,8 @@ allshaopts = $(foreach n, 1 256 512, sha$(n).lib.$(OBJ) sha$(n)_stubs.$(OBJ) sh
@@ -23,7 +24,7 @@ index 82bd445..c72417c 100644
sha1sum$(EXE): sha1.cmxa sha256.cmxa sha512.cmxa shasum.cmx
@@ -107,5 +109,8 @@ clean:
install: sha1.cma sha1.cmxa sha256.cma sha256.cmxa sha512.cma sha512.cmxa sha.cma sha.cmxa META
- ocamlfind install sha META *.mli sha1.cmi sha1.cma sha1.cmxa sha256.cmi sha256.cma sha256.cmxa sha512.cmi sha512.cma sha512.cmxa sha.cma sha.cmxa *.$(A) *.$(SO)
+ ocamlfind install sha META *.mli *.cmx sha1.cmi sha1.cma sha1.cmxa sha256.cmi sha256.cma sha256.cmxa sha512.cmi sha512.cma sha512.cmxa sha.cma sha.cmxa *.$(A) *.$(SO)
+install-byte: sha1.cma sha256.cma sha512.cma sha.cma
+ ocamlfind install sha META *.mli sha1.cmi sha1.cma sha256.cmi sha256.cma sha512.cmi sha512.cma sha.cma *.$(A) *.$(SO)
@@ -31,3 +32,5 @@ index 82bd445..c72417c 100644
uninstall:
ocamlfind remove sha
--
+2.13.2
+
diff --git a/debian/patches/0005-include-string.h-in-C-stubs-to-silence-gcc-warnings.patch b/debian/patches/0005-include-string.h-in-C-stubs-to-silence-gcc-warnings.patch
index a401b02..a1af2f7 100644
--- a/debian/patches/0005-include-string.h-in-C-stubs-to-silence-gcc-warnings.patch
+++ b/debian/patches/0005-include-string.h-in-C-stubs-to-silence-gcc-warnings.patch
@@ -1,7 +1,7 @@
-From 7a8739e762c25a20249a4979045ce4a7383078b3 Mon Sep 17 00:00:00 2001
+From 854dfb1eebf99720628aebc22187cfe01a4ab382 Mon Sep 17 00:00:00 2001
From: Eric Cooper <ecc at cmu.edu>
Date: Fri, 1 Nov 2013 22:41:05 -0400
-Subject: [PATCH] include <string.h> in C stubs to silence gcc warnings
+Subject: [PATCH 5/6] include <string.h> in C stubs to silence gcc warnings
Signed-off-by: Eric Cooper <ecc at cmu.edu>
---
@@ -47,5 +47,5 @@ index 2a7a071..c1dde96 100644
static inline int sha512_file(char *filename, sha512_digest *digest)
--
-1.8.4.rc3
+2.13.2
diff --git a/debian/patches/0006-change-compiler-flags-for-building-tests.patch b/debian/patches/0006-change-compiler-flags-for-building-tests.patch
index affbedd..d0e0099 100644
--- a/debian/patches/0006-change-compiler-flags-for-building-tests.patch
+++ b/debian/patches/0006-change-compiler-flags-for-building-tests.patch
@@ -1,7 +1,7 @@
-From 624d6580d5d6f9108af01d310e51dd887179a9c8 Mon Sep 17 00:00:00 2001
+From 448cadb8bdf23f98a578aa82a62f9e144a2e018b Mon Sep 17 00:00:00 2001
From: Eric Cooper <ecc at cmu.edu>
Date: Sat, 2 Nov 2013 12:15:46 -0400
-Subject: [PATCH] change compiler flags for building tests
+Subject: [PATCH 6/6] change compiler flags for building tests
Signed-off-by: Eric Cooper <ecc at cmu.edu>
---
@@ -9,7 +9,7 @@ Signed-off-by: Eric Cooper <ecc at cmu.edu>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 334847d..7ab1a4c 100644
+index 705fbf5..e20d052 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ endif
@@ -22,5 +22,5 @@ index 334847d..7ab1a4c 100644
PROGRAMS_BINS = sha1sum sha256sum sha512sum
--
-1.8.4.rc3
+2.13.2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sha.git
More information about the Pkg-ocaml-maint-commits
mailing list