From a6f746549a2cb9170de0073a8f0810f315fcdf11 Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Wed, 4 May 2005 02:28:31 +0000 Subject: Fix Makefile to detect ocamlopt Signed-off-by: Mike Furr Signed-off-by: Stephane Glondu Gbp-Pq: Name 0001-Fix-Makefile-to-detect-ocamlopt.patch --- Makefile | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4827101..f79b054 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,10 @@ include Makefile.config +ifeq (YES, $(shell if [ -x /usr/bin/ocamlopt ]; then echo YES; fi)) +HASOCAMLOPT := yes +endif + OCAMLC := ocamlc OCAMLOPT := ocamlopt OCAMLMKLIB := ocamlmklib @@ -71,7 +75,11 @@ WRAPPERS := \ wrappers/pl_Template.cmo \ wrappers/pl_WWW_Mechanize.cmo +ifdef HASOCAMLOPT all: perl4caml.cma perl4caml.cmxa META all-examples html +else +all: perl4caml.cma META all-examples html +endif perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS) $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^ @@ -79,12 +87,20 @@ perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS) perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx) $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^ +ifdef HASOCAMLOPT all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \ examples/test.opt examples/loadpage.opt examples/google.opt \ examples/parsedate.bc examples/parsedate.opt +else +all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \ + examples/parsedate.bc +endif -TEST_PROGRAMS := $(patsubst %.ml,%.bc,$(wildcard test/*.ml)) \ - $(patsubst %.ml,%.opt,$(wildcard test/*.ml)) +TEST_PROGRAMS := $(patsubst %.ml,%.bc,$(wildcard test/*.ml)) + +ifdef HASOCAMLOPT +TEST_PROGRAMS += $(patsubst %.ml,%.opt,$(wildcard test/*.ml)) +endif test: $(TEST_PROGRAMS) run-tests @@ -161,10 +177,17 @@ install: rm -rf $(DESTDIR)$(OCAMLLIBDIR)/perl install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/perl install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/stublibs +ifdef HASOCAMLOPT install -c -m 0644 perl.cmi perl.mli perl4caml.cma perl4caml.cmxa \ perl4caml.a libperl4caml.a META \ $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) \ $(DESTDIR)$(OCAMLLIBDIR)/perl +else + install -c -m 0644 perl.cmi perl.mli perl4caml.cma \ + META \ + $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) \ + $(DESTDIR)$(OCAMLLIBDIR)/perl +endif install -c -m 0644 dllperl4caml.so $(DESTDIR)$(OCAMLLIBDIR)/stublibs # Distribution. @@ -220,4 +243,4 @@ html/index.html: $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml) mkdir html -$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $^ -.PHONY: depend dist check-manifest html dpkg test run-tests \ No newline at end of file +.PHONY: depend dist check-manifest html dpkg test run-tests -- cgit v1.2.3 From 006afd7efc7428b9400bec70d1ef58b5c5fbb1bb Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Fri, 9 Oct 2009 12:10:20 +0200 Subject: Disable libnet-google-perl wrappers As a consequence of #550329, see also #409163. Signed-off-by: Stephane Glondu Gbp-Pq: Name 0002-Disable-libnet-google-perl-wrappers.patch --- Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f79b054..298451d 100644 --- a/Makefile +++ b/Makefile @@ -55,11 +55,6 @@ WRAPPERS := \ wrappers/pl_Date_Calc.cmo \ wrappers/pl_Date_Format.cmo \ wrappers/pl_Date_Parse.cmo \ - wrappers/pl_Net_Google_Cache.cmo \ - wrappers/pl_Net_Google_Response.cmo \ - wrappers/pl_Net_Google_Search.cmo \ - wrappers/pl_Net_Google_Spelling.cmo \ - wrappers/pl_Net_Google.cmo \ wrappers/pl_HTML_Element.cmo \ wrappers/pl_HTML_Parser.cmo \ wrappers/pl_HTML_TreeBuilder.cmo \ @@ -88,11 +83,11 @@ perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx) $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^ ifdef HASOCAMLOPT -all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \ - examples/test.opt examples/loadpage.opt examples/google.opt \ +all-examples: examples/test.bc examples/loadpage.bc \ + examples/test.opt examples/loadpage.opt \ examples/parsedate.bc examples/parsedate.opt else -all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \ +all-examples: examples/test.bc examples/loadpage.bc \ examples/parsedate.bc endif @@ -238,7 +233,10 @@ dpkg: html: html/index.html -html/index.html: $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml) +DOCUMENTED_FILES := $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml) +DOCUMENTED_FILES := $(patsubst wrappers/pl_Net_Google%,,$(DOCUMENTED_FILES)) + +html/index.html: $(DOCUMENTED_FILES) rm -rf html mkdir html -$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $^ -- cgit v1.2.3 From 96d8e4eef1e10f46c01bfac957ce517f9657a0b4 Mon Sep 17 00:00:00 2001 From: Iain Arnell Date: Wed, 2 Jun 2010 17:34:43 +0100 Subject: Fix for Perl 5.12: SVt_RV missing. Also reported as the following Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578800 Comment from the author of this patch: "It seems simplest to pretend that SVt_RV still exists on the caml side; attached patch will do just that." Commit taken from upstream Git repository. Signed-off-by: Stephane Glondu Gbp-Pq: Name 0003-Fix-for-Perl-5.12-SVt_RV-missing.patch --- perl_c.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/perl_c.c b/perl_c.c index 7970a81..66f2959 100644 --- a/perl_c.c +++ b/perl_c.c @@ -199,12 +199,17 @@ perl4caml_sv_no (value unit) static int sv_type (SV *sv) { +#if PERL_VERSION >= 11 + if (SvROK(sv)) return 4; +#endif switch (SvTYPE (sv)) { case SVt_IV: return 1; case SVt_NV: return 2; case SVt_PV: return 3; +#if PERL_VERSION < 11 case SVt_RV: return 4; +#endif case SVt_PVAV: return 5; case SVt_PVHV: return 6; case SVt_PVCV: return 7; @@ -302,7 +307,9 @@ perl4caml_deref (value svv) case SVt_IV: case SVt_NV: case SVt_PV: +#if PERL_VERSION < 11 case SVt_RV: +#endif case SVt_PVMG: break; default: -- cgit v1.2.3 From 0e09cdb8374fbe4069336d61bb8939cd4ce1269e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 6 Nov 2016 19:09:58 +0000 Subject: Fix use of CAMLparam etc macros. This was broken previously, and OCaml 4.04 revealed it. Gbp-Pq: Name 0001-Fix-use-of-CAMLparam-etc-macros.patch --- perl_c.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/perl_c.c b/perl_c.c index 66f2959..ce53667 100644 --- a/perl_c.c +++ b/perl_c.c @@ -719,11 +719,13 @@ perl4caml_get_hv (value optcreate, value name) static inline void check_perl_failure () { + CAMLparam0 (); + CAMLlocal1 (errv); + SV *errsv = get_sv ("@", TRUE); if (SvTRUE (errsv)) /* Equivalent of $@ in Perl. */ { - CAMLlocal1 (errv); STRLEN n_a; const char *err = SvPV (errsv, n_a); @@ -731,6 +733,8 @@ check_perl_failure () caml_raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv); } + + CAMLreturn0; } CAMLprim value -- cgit v1.2.3 From aea57ec2a3921dbeaa794f1e82cb023f2e44a96c Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 11:17:52 +0200 Subject: Remove .depend (it is regenerated) Gbp-Pq: Name 0005-Remove-.depend-it-is-regenerated.patch --- .depend | 78 ----------------------------------------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 .depend diff --git a/.depend b/.depend deleted file mode 100644 index 43ca867..0000000 --- a/.depend +++ /dev/null @@ -1,78 +0,0 @@ -perl.cmo: perl.cmi -perl.cmx: perl.cmi -examples/google.cmo: wrappers/pl_Net_Google.cmo -examples/google.cmx: wrappers/pl_Net_Google.cmx -examples/loadpage.cmo: wrappers/pl_LWP_UserAgent.cmo \ - wrappers/pl_HTTP_Request.cmo wrappers/pl_HTML_TreeBuilder.cmo \ - wrappers/pl_HTML_Element.cmo -examples/loadpage.cmx: wrappers/pl_LWP_UserAgent.cmx \ - wrappers/pl_HTTP_Request.cmx wrappers/pl_HTML_TreeBuilder.cmx \ - wrappers/pl_HTML_Element.cmx -examples/parsedate.cmo: wrappers/pl_Date_Parse.cmo \ - wrappers/pl_Date_Format.cmo -examples/parsedate.cmx: wrappers/pl_Date_Parse.cmx \ - wrappers/pl_Date_Format.cmx -examples/test.cmo: perl.cmi -examples/test.cmx: perl.cmx -wrappers/pl_Data_Dumper.cmo: perl.cmi -wrappers/pl_Data_Dumper.cmx: perl.cmx -wrappers/pl_Date_Calc.cmo: perl.cmi -wrappers/pl_Date_Calc.cmx: perl.cmx -wrappers/pl_Date_Format.cmo: perl.cmi -wrappers/pl_Date_Format.cmx: perl.cmx -wrappers/pl_Date_Parse.cmo: perl.cmi -wrappers/pl_Date_Parse.cmx: perl.cmx -wrappers/pl_HTML_Element.cmo: perl.cmi -wrappers/pl_HTML_Element.cmx: perl.cmx -wrappers/pl_HTML_Form.cmo: wrappers/pl_HTTP_Response.cmo perl.cmi -wrappers/pl_HTML_Form.cmx: wrappers/pl_HTTP_Response.cmx perl.cmx -wrappers/pl_HTML_Parser.cmo: perl.cmi -wrappers/pl_HTML_Parser.cmx: perl.cmx -wrappers/pl_HTML_TreeBuilder.cmo: wrappers/pl_HTML_Parser.cmo \ - wrappers/pl_HTML_Element.cmo perl.cmi -wrappers/pl_HTML_TreeBuilder.cmx: wrappers/pl_HTML_Parser.cmx \ - wrappers/pl_HTML_Element.cmx perl.cmx -wrappers/pl_HTTP_Cookies.cmo: perl.cmi -wrappers/pl_HTTP_Cookies.cmx: perl.cmx -wrappers/pl_HTTP_Headers.cmo: perl.cmi -wrappers/pl_HTTP_Headers.cmx: perl.cmx -wrappers/pl_HTTP_Message.cmo: wrappers/pl_HTTP_Headers.cmo perl.cmi -wrappers/pl_HTTP_Message.cmx: wrappers/pl_HTTP_Headers.cmx perl.cmx -wrappers/pl_HTTP_Request_Common.cmo: wrappers/pl_HTTP_Request.cmo perl.cmi -wrappers/pl_HTTP_Request_Common.cmx: wrappers/pl_HTTP_Request.cmx perl.cmx -wrappers/pl_HTTP_Request.cmo: wrappers/pl_URI.cmo \ - wrappers/pl_HTTP_Message.cmo perl.cmi -wrappers/pl_HTTP_Request.cmx: wrappers/pl_URI.cmx \ - wrappers/pl_HTTP_Message.cmx perl.cmx -wrappers/pl_HTTP_Response.cmo: wrappers/pl_HTTP_Request.cmo \ - wrappers/pl_HTTP_Message.cmo perl.cmi -wrappers/pl_HTTP_Response.cmx: wrappers/pl_HTTP_Request.cmx \ - wrappers/pl_HTTP_Message.cmx perl.cmx -wrappers/pl_LWP_UserAgent.cmo: wrappers/pl_HTTP_Response.cmo \ - wrappers/pl_HTTP_Request.cmo wrappers/pl_HTTP_Cookies.cmo perl.cmi -wrappers/pl_LWP_UserAgent.cmx: wrappers/pl_HTTP_Response.cmx \ - wrappers/pl_HTTP_Request.cmx wrappers/pl_HTTP_Cookies.cmx perl.cmx -wrappers/pl_Net_Google_Cache.cmo: perl.cmi -wrappers/pl_Net_Google_Cache.cmx: perl.cmx -wrappers/pl_Net_Google.cmo: wrappers/pl_Net_Google_Spelling.cmo \ - wrappers/pl_Net_Google_Search.cmo wrappers/pl_Net_Google_Cache.cmo \ - perl.cmi -wrappers/pl_Net_Google.cmx: wrappers/pl_Net_Google_Spelling.cmx \ - wrappers/pl_Net_Google_Search.cmx wrappers/pl_Net_Google_Cache.cmx \ - perl.cmx -wrappers/pl_Net_Google_Response.cmo: perl.cmi -wrappers/pl_Net_Google_Response.cmx: perl.cmx -wrappers/pl_Net_Google_Search.cmo: wrappers/pl_Net_Google_Response.cmo \ - perl.cmi -wrappers/pl_Net_Google_Search.cmx: wrappers/pl_Net_Google_Response.cmx \ - perl.cmx -wrappers/pl_Net_Google_Spelling.cmo: perl.cmi -wrappers/pl_Net_Google_Spelling.cmx: perl.cmx -wrappers/pl_Template.cmo: perl.cmi -wrappers/pl_Template.cmx: perl.cmx -wrappers/pl_URI.cmo: perl.cmi -wrappers/pl_URI.cmx: perl.cmx -wrappers/pl_WWW_Mechanize.cmo: wrappers/pl_LWP_UserAgent.cmo \ - wrappers/pl_HTTP_Response.cmo wrappers/pl_HTML_Form.cmo perl.cmi -wrappers/pl_WWW_Mechanize.cmx: wrappers/pl_LWP_UserAgent.cmx \ - wrappers/pl_HTTP_Response.cmx wrappers/pl_HTML_Form.cmx perl.cmx -- cgit v1.2.3 From 99b6b372b731e91ba7c3d631a3d08a217aef6f26 Mon Sep 17 00:00:00 2001 From: Mike Furr Date: Wed, 4 May 2005 02:28:31 +0000 Subject: Fix Makefile to detect ocamlopt Signed-off-by: Mike Furr Signed-off-by: Stephane Glondu Gbp-Pq: Name 0001-Fix-Makefile-to-detect-ocamlopt.patch --- Makefile | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4827101..f79b054 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,10 @@ include Makefile.config +ifeq (YES, $(shell if [ -x /usr/bin/ocamlopt ]; then echo YES; fi)) +HASOCAMLOPT := yes +endif + OCAMLC := ocamlc OCAMLOPT := ocamlopt OCAMLMKLIB := ocamlmklib @@ -71,7 +75,11 @@ WRAPPERS := \ wrappers/pl_Template.cmo \ wrappers/pl_WWW_Mechanize.cmo +ifdef HASOCAMLOPT all: perl4caml.cma perl4caml.cmxa META all-examples html +else +all: perl4caml.cma META all-examples html +endif perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS) $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^ @@ -79,12 +87,20 @@ perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS) perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx) $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^ +ifdef HASOCAMLOPT all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \ examples/test.opt examples/loadpage.opt examples/google.opt \ examples/parsedate.bc examples/parsedate.opt +else +all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \ + examples/parsedate.bc +endif -TEST_PROGRAMS := $(patsubst %.ml,%.bc,$(wildcard test/*.ml)) \ - $(patsubst %.ml,%.opt,$(wildcard test/*.ml)) +TEST_PROGRAMS := $(patsubst %.ml,%.bc,$(wildcard test/*.ml)) + +ifdef HASOCAMLOPT +TEST_PROGRAMS += $(patsubst %.ml,%.opt,$(wildcard test/*.ml)) +endif test: $(TEST_PROGRAMS) run-tests @@ -161,10 +177,17 @@ install: rm -rf $(DESTDIR)$(OCAMLLIBDIR)/perl install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/perl install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/stublibs +ifdef HASOCAMLOPT install -c -m 0644 perl.cmi perl.mli perl4caml.cma perl4caml.cmxa \ perl4caml.a libperl4caml.a META \ $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) \ $(DESTDIR)$(OCAMLLIBDIR)/perl +else + install -c -m 0644 perl.cmi perl.mli perl4caml.cma \ + META \ + $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) \ + $(DESTDIR)$(OCAMLLIBDIR)/perl +endif install -c -m 0644 dllperl4caml.so $(DESTDIR)$(OCAMLLIBDIR)/stublibs # Distribution. @@ -220,4 +243,4 @@ html/index.html: $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml) mkdir html -$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $^ -.PHONY: depend dist check-manifest html dpkg test run-tests \ No newline at end of file +.PHONY: depend dist check-manifest html dpkg test run-tests -- cgit v1.2.3 From 7e674b6fda7dfe0df98d999560212edc264c9fc2 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Fri, 9 Oct 2009 12:10:20 +0200 Subject: Disable libnet-google-perl wrappers As a consequence of #550329, see also #409163. Signed-off-by: Stephane Glondu Gbp-Pq: Name 0002-Disable-libnet-google-perl-wrappers.patch --- Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f79b054..298451d 100644 --- a/Makefile +++ b/Makefile @@ -55,11 +55,6 @@ WRAPPERS := \ wrappers/pl_Date_Calc.cmo \ wrappers/pl_Date_Format.cmo \ wrappers/pl_Date_Parse.cmo \ - wrappers/pl_Net_Google_Cache.cmo \ - wrappers/pl_Net_Google_Response.cmo \ - wrappers/pl_Net_Google_Search.cmo \ - wrappers/pl_Net_Google_Spelling.cmo \ - wrappers/pl_Net_Google.cmo \ wrappers/pl_HTML_Element.cmo \ wrappers/pl_HTML_Parser.cmo \ wrappers/pl_HTML_TreeBuilder.cmo \ @@ -88,11 +83,11 @@ perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx) $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^ ifdef HASOCAMLOPT -all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \ - examples/test.opt examples/loadpage.opt examples/google.opt \ +all-examples: examples/test.bc examples/loadpage.bc \ + examples/test.opt examples/loadpage.opt \ examples/parsedate.bc examples/parsedate.opt else -all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \ +all-examples: examples/test.bc examples/loadpage.bc \ examples/parsedate.bc endif @@ -238,7 +233,10 @@ dpkg: html: html/index.html -html/index.html: $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml) +DOCUMENTED_FILES := $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml) +DOCUMENTED_FILES := $(patsubst wrappers/pl_Net_Google%,,$(DOCUMENTED_FILES)) + +html/index.html: $(DOCUMENTED_FILES) rm -rf html mkdir html -$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $^ -- cgit v1.2.3 From 783896300ba7675a780a55dc7a5f8cbe9d1672fa Mon Sep 17 00:00:00 2001 From: Iain Arnell Date: Wed, 2 Jun 2010 17:34:43 +0100 Subject: Fix for Perl 5.12: SVt_RV missing. Also reported as the following Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578800 Comment from the author of this patch: "It seems simplest to pretend that SVt_RV still exists on the caml side; attached patch will do just that." Commit taken from upstream Git repository. Signed-off-by: Stephane Glondu Gbp-Pq: Name 0003-Fix-for-Perl-5.12-SVt_RV-missing.patch --- perl_c.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/perl_c.c b/perl_c.c index 7970a81..66f2959 100644 --- a/perl_c.c +++ b/perl_c.c @@ -199,12 +199,17 @@ perl4caml_sv_no (value unit) static int sv_type (SV *sv) { +#if PERL_VERSION >= 11 + if (SvROK(sv)) return 4; +#endif switch (SvTYPE (sv)) { case SVt_IV: return 1; case SVt_NV: return 2; case SVt_PV: return 3; +#if PERL_VERSION < 11 case SVt_RV: return 4; +#endif case SVt_PVAV: return 5; case SVt_PVHV: return 6; case SVt_PVCV: return 7; @@ -302,7 +307,9 @@ perl4caml_deref (value svv) case SVt_IV: case SVt_NV: case SVt_PV: +#if PERL_VERSION < 11 case SVt_RV: +#endif case SVt_PVMG: break; default: -- cgit v1.2.3 From a0aa5c120b335dfdfe1f1a1998af3c5e9b26ebd1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 6 Nov 2016 19:09:58 +0000 Subject: Fix use of CAMLparam etc macros. This was broken previously, and OCaml 4.04 revealed it. Gbp-Pq: Name 0001-Fix-use-of-CAMLparam-etc-macros.patch --- perl_c.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/perl_c.c b/perl_c.c index 66f2959..ce53667 100644 --- a/perl_c.c +++ b/perl_c.c @@ -719,11 +719,13 @@ perl4caml_get_hv (value optcreate, value name) static inline void check_perl_failure () { + CAMLparam0 (); + CAMLlocal1 (errv); + SV *errsv = get_sv ("@", TRUE); if (SvTRUE (errsv)) /* Equivalent of $@ in Perl. */ { - CAMLlocal1 (errv); STRLEN n_a; const char *err = SvPV (errsv, n_a); @@ -731,6 +733,8 @@ check_perl_failure () caml_raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv); } + + CAMLreturn0; } CAMLprim value -- cgit v1.2.3 From 4a4ecf2d0cd0ed44de4a30ad7d8026d2a079eff9 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 19 Jul 2017 11:17:52 +0200 Subject: Remove .depend (it is regenerated) Gbp-Pq: Name 0005-Remove-.depend-it-is-regenerated.patch --- .depend | 78 ----------------------------------------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 .depend diff --git a/.depend b/.depend deleted file mode 100644 index 43ca867..0000000 --- a/.depend +++ /dev/null @@ -1,78 +0,0 @@ -perl.cmo: perl.cmi -perl.cmx: perl.cmi -examples/google.cmo: wrappers/pl_Net_Google.cmo -examples/google.cmx: wrappers/pl_Net_Google.cmx -examples/loadpage.cmo: wrappers/pl_LWP_UserAgent.cmo \ - wrappers/pl_HTTP_Request.cmo wrappers/pl_HTML_TreeBuilder.cmo \ - wrappers/pl_HTML_Element.cmo -examples/loadpage.cmx: wrappers/pl_LWP_UserAgent.cmx \ - wrappers/pl_HTTP_Request.cmx wrappers/pl_HTML_TreeBuilder.cmx \ - wrappers/pl_HTML_Element.cmx -examples/parsedate.cmo: wrappers/pl_Date_Parse.cmo \ - wrappers/pl_Date_Format.cmo -examples/parsedate.cmx: wrappers/pl_Date_Parse.cmx \ - wrappers/pl_Date_Format.cmx -examples/test.cmo: perl.cmi -examples/test.cmx: perl.cmx -wrappers/pl_Data_Dumper.cmo: perl.cmi -wrappers/pl_Data_Dumper.cmx: perl.cmx -wrappers/pl_Date_Calc.cmo: perl.cmi -wrappers/pl_Date_Calc.cmx: perl.cmx -wrappers/pl_Date_Format.cmo: perl.cmi -wrappers/pl_Date_Format.cmx: perl.cmx -wrappers/pl_Date_Parse.cmo: perl.cmi -wrappers/pl_Date_Parse.cmx: perl.cmx -wrappers/pl_HTML_Element.cmo: perl.cmi -wrappers/pl_HTML_Element.cmx: perl.cmx -wrappers/pl_HTML_Form.cmo: wrappers/pl_HTTP_Response.cmo perl.cmi -wrappers/pl_HTML_Form.cmx: wrappers/pl_HTTP_Response.cmx perl.cmx -wrappers/pl_HTML_Parser.cmo: perl.cmi -wrappers/pl_HTML_Parser.cmx: perl.cmx -wrappers/pl_HTML_TreeBuilder.cmo: wrappers/pl_HTML_Parser.cmo \ - wrappers/pl_HTML_Element.cmo perl.cmi -wrappers/pl_HTML_TreeBuilder.cmx: wrappers/pl_HTML_Parser.cmx \ - wrappers/pl_HTML_Element.cmx perl.cmx -wrappers/pl_HTTP_Cookies.cmo: perl.cmi -wrappers/pl_HTTP_Cookies.cmx: perl.cmx -wrappers/pl_HTTP_Headers.cmo: perl.cmi -wrappers/pl_HTTP_Headers.cmx: perl.cmx -wrappers/pl_HTTP_Message.cmo: wrappers/pl_HTTP_Headers.cmo perl.cmi -wrappers/pl_HTTP_Message.cmx: wrappers/pl_HTTP_Headers.cmx perl.cmx -wrappers/pl_HTTP_Request_Common.cmo: wrappers/pl_HTTP_Request.cmo perl.cmi -wrappers/pl_HTTP_Request_Common.cmx: wrappers/pl_HTTP_Request.cmx perl.cmx -wrappers/pl_HTTP_Request.cmo: wrappers/pl_URI.cmo \ - wrappers/pl_HTTP_Message.cmo perl.cmi -wrappers/pl_HTTP_Request.cmx: wrappers/pl_URI.cmx \ - wrappers/pl_HTTP_Message.cmx perl.cmx -wrappers/pl_HTTP_Response.cmo: wrappers/pl_HTTP_Request.cmo \ - wrappers/pl_HTTP_Message.cmo perl.cmi -wrappers/pl_HTTP_Response.cmx: wrappers/pl_HTTP_Request.cmx \ - wrappers/pl_HTTP_Message.cmx perl.cmx -wrappers/pl_LWP_UserAgent.cmo: wrappers/pl_HTTP_Response.cmo \ - wrappers/pl_HTTP_Request.cmo wrappers/pl_HTTP_Cookies.cmo perl.cmi -wrappers/pl_LWP_UserAgent.cmx: wrappers/pl_HTTP_Response.cmx \ - wrappers/pl_HTTP_Request.cmx wrappers/pl_HTTP_Cookies.cmx perl.cmx -wrappers/pl_Net_Google_Cache.cmo: perl.cmi -wrappers/pl_Net_Google_Cache.cmx: perl.cmx -wrappers/pl_Net_Google.cmo: wrappers/pl_Net_Google_Spelling.cmo \ - wrappers/pl_Net_Google_Search.cmo wrappers/pl_Net_Google_Cache.cmo \ - perl.cmi -wrappers/pl_Net_Google.cmx: wrappers/pl_Net_Google_Spelling.cmx \ - wrappers/pl_Net_Google_Search.cmx wrappers/pl_Net_Google_Cache.cmx \ - perl.cmx -wrappers/pl_Net_Google_Response.cmo: perl.cmi -wrappers/pl_Net_Google_Response.cmx: perl.cmx -wrappers/pl_Net_Google_Search.cmo: wrappers/pl_Net_Google_Response.cmo \ - perl.cmi -wrappers/pl_Net_Google_Search.cmx: wrappers/pl_Net_Google_Response.cmx \ - perl.cmx -wrappers/pl_Net_Google_Spelling.cmo: perl.cmi -wrappers/pl_Net_Google_Spelling.cmx: perl.cmx -wrappers/pl_Template.cmo: perl.cmi -wrappers/pl_Template.cmx: perl.cmx -wrappers/pl_URI.cmo: perl.cmi -wrappers/pl_URI.cmx: perl.cmx -wrappers/pl_WWW_Mechanize.cmo: wrappers/pl_LWP_UserAgent.cmo \ - wrappers/pl_HTTP_Response.cmo wrappers/pl_HTML_Form.cmo perl.cmi -wrappers/pl_WWW_Mechanize.cmx: wrappers/pl_LWP_UserAgent.cmx \ - wrappers/pl_HTTP_Response.cmx wrappers/pl_HTML_Form.cmx perl.cmx -- cgit v1.2.3