[Pkg-ocaml-maint-commits] [ocurl] 17/23: Refresh patches
Stéphane Glondu
glondu at moszumanska.debian.org
Tue Feb 23 10:20:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocurl.
commit 00360c4dcd97c7fbb2ee71ab6b8c97371d364ce3
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Feb 23 10:46:05 2016 +0100
Refresh patches
---
...ile-to-use-ocamlfind-and-support-both-byt.patch | 85 ----------------------
debian/patches/0002-fix-compilation-flags.patch | 23 ------
...0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch | 4 +-
debian/patches/series | 2 -
4 files changed, 2 insertions(+), 112 deletions(-)
diff --git a/debian/patches/0001-fixes-makefile-to-use-ocamlfind-and-support-both-byt.patch b/debian/patches/0001-fixes-makefile-to-use-ocamlfind-and-support-both-byt.patch
deleted file mode 100644
index 4f1d97f..0000000
--- a/debian/patches/0001-fixes-makefile-to-use-ocamlfind-and-support-both-byt.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Enrico Tassi <gareuselesinge at debian.org>
-Date: Wed, 7 Apr 2010 22:42:24 +0200
-Subject: fixes makefile to use ocamlfind and support both byte and opt
- compilation
-
----
- Makefile.in | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 5eff392..13df227 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -10,7 +10,7 @@ INSTALLDIR = @INSTALLDIR@
- INSTALL = @INSTALL@
- INSTALLDATA = @INSTALL_DATA@
-
--FINDLIB = @OCAMLFIND@
-+FINDLIB = ocamlfind
- OCBYTE = @OCAMLC@
- OCOPT = @OCAMLOPT@
-
-@@ -31,9 +31,9 @@ CURLFLAGS = -ccopt @CURLFLAGS@
- CURLCLIBS = -cclib -lcurl-helper -cclib "@CURLLIBS@"
-
- ifeq (@OCAMLBEST@,opt)
--TARGETS = curl.cma curl.cmxa libcurl-helper.a
-+TARGETS = curl.cma curl.cmxa libcurl-helper.a dllcurl-helper.so
- else
--TARGETS = curl.cma libcurl-helper.a
-+TARGETS = curl.cma libcurl-helper.a dllcurl-helper.so
- endif
-
- all:
-@@ -45,11 +45,11 @@ targets: $(TARGETS) examples
- examples:
- (cd examples; $(MAKE))
-
--curl.cma: $(CURLBCOBJS) libcurl-helper.a
-- $(OCBYTE) -custom -a $(FLAGS) $(CURLFLAGS) -o $@ $(CURLBCOBJS) $(CURLCLIBS)
-+curl.cma: $(CURLBCOBJS) libcurl-helper.so
-+ ocamlmklib -o curl $(CURLBCOBJS) -oc curl-helper @CURLLIBS@
-
--curl.cmxa: $(CURLOBJS) libcurl-helper.a
-- $(OCOPT) -a $(FLAGS) $(CURLFLAGS) $(LIBS) $(CURLOBJS) -o $@ $(CURLCLIBS)
-+curl.cmxa: $(CURLOBJS) libcurl-helper.so
-+ ocamlmklib -o curl $(CURLOBJS) -oc curl-helper @CURLLIBS@
-
- .ml.cmx:
- $(OCOPT) -c $(FLAGS) $< -o $@
-@@ -60,17 +60,18 @@ curl.cmxa: $(CURLOBJS) libcurl-helper.a
- .ml.cmo:
- $(OCBYTE) -c $(FLAGS) $< -o $@
-
--libcurl-helper.a: $(CURLHELPEROBJS)
-- ar crus libcurl-helper.a $(CURLHELPEROBJS)
-- ranlib libcurl-helper.a
-+libcurl-helper.a libcurl-helper.so: $(CURLHELPEROBJS)
-+ ocamlmklib -oc curl-helper $(CURLHELPEROBJS) @CURLLIBS@
-
- .c.o:
-- $(CC) -c -Wall $(CFLAGS) $(CAMLINCDIR) $< -o $@
-+ $(OC) -c -ccopt "$(CFLAGS)" $<
-
- install:
- ifeq ($(FINDLIB),ocamlfind)
-- ocamlfind install curl META $(wildcard *.cmi) \
-- $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
-+ ocamlfind install -destdir $(DESTDIR) -ldconf ignore \
-+ curl META $(wildcard *.cmi) \
-+ $(wildcard *.a) $(wildcard *.cma) \
-+ $(wildcard *.cmxa) $(wildcard *.so) $(wildcard *.mli)
- else
- mkdir -p $(INSTALLDIR)
- $(INSTALLDATA) curl.cma $(INSTALLDIR)
-@@ -83,7 +84,8 @@ endif
-
-
- clean:
-- @rm -f $(TARGETS) *~ *.cm* *.o *.a .depend core
-+ @rm -f $(TARGETS) *~ *.cm* *.o *.a *.so .depend core
-+ @rm -f foo.ld.conf config.log config.status
- @(cd examples; $(MAKE) clean)
-
- depend:
diff --git a/debian/patches/0002-fix-compilation-flags.patch b/debian/patches/0002-fix-compilation-flags.patch
deleted file mode 100644
index 4dda938..0000000
--- a/debian/patches/0002-fix-compilation-flags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Enrico Tassi <gareuselesinge at debian.org>
-Date: Wed, 7 Apr 2010 22:44:32 +0200
-Subject: fix compilation flags
-
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 84a7df9..55d45bf 100755
---- a/configure
-+++ b/configure
-@@ -1655,8 +1655,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- CURLDIR=`curl-config --cflags`
--CURLFLAGS=`curl-config --libs | cut -d ' ' -f 1`
--CURLLIBS=`curl-config --libs | cut -d ' ' -f 2-`
-+CURLFLAGS='-L .'
-+CURLLIBS=`curl-config --libs`
-
- CFLAGS=$CURLDIR
-
diff --git a/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch b/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch
index 11fd20f..24588d0 100644
--- a/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch
+++ b/debian/patches/0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch
@@ -8,10 +8,10 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/curl-helper.c b/curl-helper.c
-index ce99890..0fe7483 100644
+index e515b4d..5a0675d 100644
--- a/curl-helper.c
+++ b/curl-helper.c
-@@ -172,7 +172,7 @@ CURLErrorMapping errorMap[] =
+@@ -218,7 +218,7 @@ CURLErrorMapping errorMap[] =
#else
{"CURLE_URL_MALFORMAT", -1},
#endif
diff --git a/debian/patches/series b/debian/patches/series
index 52a4e60..a66aa4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-fixes-makefile-to-use-ocamlfind-and-support-both-byt.patch
-0002-fix-compilation-flags.patch
0003-CURLE_URL_MALFORMAT_USER-is-obsolete.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocurl.git
More information about the Pkg-ocaml-maint-commits
mailing list