Accepting request 528527 from devel:tools:building

1

OBS-URL: https://build.opensuse.org/request/show/528527
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/swig?expand=0&rev=61
This commit is contained in:
2017-09-25 11:57:31 +00:00
committed by Git OBS Bridge
3 changed files with 47 additions and 0 deletions

40
swig-perl526.patch Normal file
View File

@@ -0,0 +1,40 @@
From 8855ef2b482c09da9255079b0fac92d08c8308fb Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 13 Jun 2017 17:32:37 +1200
Subject: [PATCH] [Perl] Fix testsuite to work without . in @INC
"." was removed from @INC in Perl 5.26 for security reasons, and has
also been removed from older versions in some distros.
Fixes https://github.com/swig/swig/issues/997 reported by lfam.
---
Examples/Makefile.in | 2 +-
Examples/test-suite/perl5/run-perl-test.pl | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 7682b565fc..8a88fb5eaa 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -282,7 +282,7 @@ perl5_static_cpp: $(SRCDIR_SRCS)
# -----------------------------------------------------------------
perl5_run:
- $(RUNTOOL) $(PERL) $(PERL5_SCRIPT) $(RUNPIPE)
+ $(RUNTOOL) $(PERL) -I. $(PERL5_SCRIPT) $(RUNPIPE)
# -----------------------------------------------------------------
# Version display
diff --git a/Examples/test-suite/perl5/run-perl-test.pl b/Examples/test-suite/perl5/run-perl-test.pl
index 106bf002bb..5ea4e51157 100644
--- a/Examples/test-suite/perl5/run-perl-test.pl
+++ b/Examples/test-suite/perl5/run-perl-test.pl
@@ -7,7 +7,7 @@
my $command = shift @ARGV;
-my $output = `$^X $command 2>&1`;
+my $output = `$^X -I. $command 2>&1`;
die "SWIG Perl test failed: \n\n$output\n"
if $?;

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Sep 24 10:47:22 UTC 2017 - coolo@suse.com
- add swig-perl526.patch from upstream to work with perl 5.26
-------------------------------------------------------------------
Thu Feb 2 14:56:53 UTC 2017 - adam.majer@suse.de

View File

@@ -29,6 +29,7 @@ Source: http://sourceforge.net/projects/swig/files/swig/%{name}-%{versio
Source1: %{name}.rpmlintrc
Patch2: swig308-isfinite.diff
Patch3: swig-ocaml-int64.patch
Patch4: swig-perl526.patch
BuildRequires: autoconf
BuildRequires: automake
%if 0%{?suse_version} > 1325
@@ -134,6 +135,7 @@ understandig SWIG usage.
%setup -q
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%ifarch s390 s390x