[libyaml-libyaml-perl] 01/01: First stab at using the system libyaml.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch gregoa/use-system-yaml
in repository libyaml-libyaml-perl.

commit 3a49d1ccf6b2af4abf1174813602785d8d09cd6f
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jul 12 22:28:11 2014 +0200

    First stab at using the system libyaml.
    
    - build-depend on libyaml-dev
    - move bundled files away in debian/rules
    - patch Makefile.PL to add -lyaml
    
    TODO:
    - move files back. or repack the tarball
    - disable/remove patches against bundled files
    - unfortunately the tests fail. looks like hash randomization or something
---
 debian/control                       |  1 +
 debian/patches/series                |  1 +
 debian/patches/use-system-yaml.patch | 11 +++++++++++
 debian/rules                         | 16 ++++++++++++++++
 4 files changed, 29 insertions(+)

diff --git a/debian/control b/debian/control
index a57d003..e7bea28 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: libyaml-libyaml-perl
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 9.20120312),
+               libyaml-dev,
                perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ryan Niebur <ryan at debian.org>,
diff --git a/debian/patches/series b/debian/patches/series
index a18d193..7805d77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ libyaml-node-id-hardening.patch
 libyaml-guard-against-overflows-in-indent-and-flow_level.patch
 CVE-2014-2525.patch
 pod-error.patch
+use-system-yaml.patch
diff --git a/debian/patches/use-system-yaml.patch b/debian/patches/use-system-yaml.patch
new file mode 100644
index 0000000..83bb1db
--- /dev/null
+++ b/debian/patches/use-system-yaml.patch
@@ -0,0 +1,11 @@
+--- a/LibYAML/Makefile.PL
++++ b/LibYAML/Makefile.PL
+@@ -24,7 +24,7 @@
+     # CCFLAGS => '-pedantic -Wall',
+     # CCFLAGS => '-Wall',
+     DEFINE => $DEFINE,
+-    LIBS => [''], # e.g., '-lm'
++    LIBS => ['-lyaml'], # e.g., '-lm'
+     INC => '-I.',
+     OBJECT => $obj_files,
+     ABSTRACT_FROM => 'lib/YAML/XS/LibYAML.pm',
diff --git a/debian/rules b/debian/rules
index 2d33f6a..9882e39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,19 @@
 
 %:
 	dh $@
+
+override_dh_auto_configure:
+	for f in \
+		api.c \
+		config.h \
+		dumper.c \
+		emitter.c \
+		loader.c \
+		parser.c \
+		reader.c \
+		scanner.c \
+		writer.c \
+		yaml.h \
+		yaml_private.h \
+	; do mv -v $(CURDIR)/LibYAML/$$f $(CURDIR)/LibYAML/$$f.disabled; done
+	dh_auto_configure

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libyaml-libyaml-perl.git