61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
Fix linking for perl.
|
|
|
|
From: David Rothenberger <daveroth@acm.org>
|
|
|
|
|
|
---
|
|
Makefile.in | 1 +
|
|
build.conf | 7 ++-----
|
|
.../bindings/swig/perl/native/Makefile.PL.in | 1 +
|
|
3 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index faf2a70..6a73b4c 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -153,6 +153,7 @@ SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
|
|
SWIG_PY_LIBS = @SWIG_PY_LIBS@
|
|
SWIG_PY_ERRMSG = @SWIG_PY_ERRMSG@
|
|
SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
|
|
+SWIG_PL_LINK = @SWIG_PL_LINK@
|
|
SWIG_PL_ERRMSG = @SWIG_PL_ERRMSG@
|
|
SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
|
|
SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
|
|
diff --git a/build.conf b/build.conf
|
|
index b7177f7..33084f7 100644
|
|
--- a/build.conf
|
|
+++ b/build.conf
|
|
@@ -587,7 +587,8 @@ description = Subversion utility library for Python bindings
|
|
type = swig_lib
|
|
lang = perl
|
|
path = subversion/bindings/swig/perl/libsvn_swig_perl
|
|
-libs = libsvn_delta libsvn_subr apriconv apr perl swig
|
|
+libs = libsvn_delta libsvn_subr apriconv apr swig
|
|
+link-cmd = $(LINK) $(SWIG_PL_LINK)
|
|
install = swig-pl-lib
|
|
# need special build rule to include
|
|
compile-cmd = $(COMPILE_SWIG_PL)
|
|
@@ -1521,10 +1522,6 @@ external-lib = $(SVN_XML_LIBS)
|
|
type = lib
|
|
external-lib = $(SVN_SWIG_LIBS)
|
|
|
|
-[perl]
|
|
-type = lib
|
|
-external-lib = $(SVN_PERL_LIBS)
|
|
-
|
|
[httpd]
|
|
type = lib
|
|
external-lib = -lmod_dav -lhttpd
|
|
diff --git a/subversion/bindings/swig/perl/native/Makefile.PL.in b/subversion/bindings/swig/perl/native/Makefile.PL.in
|
|
index 3b36901..8ec0bac 100644
|
|
--- a/subversion/bindings/swig/perl/native/Makefile.PL.in
|
|
+++ b/subversion/bindings/swig/perl/native/Makefile.PL.in
|
|
@@ -62,6 +62,7 @@ chomp($cflags);
|
|
$cflags =~ s/-ansi\s+//g;
|
|
$cflags =~ s/-std=c89\s+//g;
|
|
$cflags =~ s/-Wall//g;
|
|
+$cflags =~ s/-Werror=format-security//g;
|
|
$cflags =~ s/-Wunused//g;
|
|
$cflags =~ s/-Wshadow//g;
|
|
$cflags =~ s/-Wstrict-prototypes//g;
|