[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: debian/patches/any/submitted-perl-inc.diff: new patch to fix the testsuite with perl (>= 5.22.2-4), which removed '.' from @INC by default.



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

aurel32 pushed a commit to branch sid
in repository glibc.

commit a37748c5028cf17b4a0ae7775a05a74dcf0b3ed1
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Sat Sep 3 22:31:37 2016 +0200

    debian/patches/any/submitted-perl-inc.diff: new patch to fix the testsuite with perl (>= 5.22.2-4), which removed '.' from @INC by default.
---
 debian/changelog                           |  3 +++
 debian/patches/any/submitted-perl-inc.diff | 38 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 51c77c9..051c3c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ glibc (2.24-2) UNRELEASED; urgency=medium
   [ Aurelien Jarno ]
   * debian/rules.d/debhelper.mk: remove the arch-qualifier from the
     linux-libc-dev depends.  Closes: #836446.
+  * debian/patches/any/submitted-perl-inc.diff: new patch to fix the
+    testsuite with perl (>= 5.22.2-4), which removed '.' from @INC by
+    default.
 
  -- Aurelien Jarno <aurel32@debian.org>  Wed, 31 Aug 2016 17:58:05 +0200
 
diff --git a/debian/patches/any/submitted-perl-inc.diff b/debian/patches/any/submitted-perl-inc.diff
new file mode 100644
index 0000000..df38bcc
--- /dev/null
+++ b/debian/patches/any/submitted-perl-inc.diff
@@ -0,0 +1,38 @@
+2016-09-03  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* conform/Makefile (conformtest-header-tests): Pass -I. to $(PERL).
+	(linknamespace-symlists-tests): Likewise.
+	(linknamespace-header-tests): Likewise.
+
+diff --git a/conform/Makefile b/conform/Makefile
+index 32a0937..b92a7d4 100644
+--- a/conform/Makefile
++++ b/conform/Makefile
+@@ -196,13 +196,13 @@ $(conformtest-header-tests): $(objpfx)%/conform.out: \
+ 			     conformtest.pl $(conformtest-headers-data)
+ 	(set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
+ 	 mkdir -p $(@D)/scratch; \
+-	 $(PERL) conformtest.pl --tmpdir=$(@D)/scratch --cc='$(CC)' \
++	 $(PERL) -I. conformtest.pl --tmpdir=$(@D)/scratch --cc='$(CC)' \
+ 		 --flags='$(conformtest-cc-flags)' --standard=$$std \
+ 		 --headers=$$hdr > $@); \
+ 	$(evaluate-test)
+ 
+ $(linknamespace-symlists-tests): $(objpfx)symlist-%: list-header-symbols.pl
+-	$(PERL) -w $< --tmpdir=$(objpfx) --cc='$(CC)' \
++	$(PERL) -I. -w $< --tmpdir=$(objpfx) --cc='$(CC)' \
+ 		--flags='$(conformtest-cc-flags)' --standard=$* \
+ 		--headers="$(strip $(conformtest-headers-$*))" \
+ 		> $@ 2> $@.err; \
+@@ -232,7 +232,7 @@ $(linknamespace-header-tests): $(objpfx)%/linknamespace.out: \
+ 			       $(linknamespace-symlist-stdlibs-tests)
+ 	(set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
+ 	 mkdir -p $(@D)/scratch; \
+-	 $(PERL) -w $< --tmpdir=$(@D)/scratch --cc='$(CC)' \
++	 $(PERL) -I. -w $< --tmpdir=$(@D)/scratch --cc='$(CC)' \
+ 		 --flags='$(conformtest-cc-flags)' --standard=$$std \
+ 		 --stdsyms=$(objpfx)symlist-$$std --header=$$hdr \
+ 		 --libsyms=$(objpfx)symlist-stdlibs-$$std \
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index bd564ee..a401253 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -213,3 +213,4 @@ any/local-dynamic-resolvconf.diff
 any/local-libpic.diff
 any/local-bootstrap-headers.diff
 any/submitted-dlopen-noload.diff
+any/submitted-perl-inc.diff

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


Reply to: