Accepting request 37087 from devel:tools:building
Copy from devel:tools:building/swig based on submit request 37087 from user michal-m OBS-URL: https://build.opensuse.org/request/show/37087 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/swig?expand=0&rev=17
This commit is contained in:
parent
d716b3215b
commit
f0c827cae5
20
adapt-perl512.diff
Normal file
20
adapt-perl512.diff
Normal file
@ -0,0 +1,20 @@
|
||||
Index: swig-1.3.40/Lib/perl5/perlrun.swg
|
||||
===================================================================
|
||||
--- swig-1.3.40.orig/Lib/perl5/perlrun.swg 2009-08-14 23:05:06.000000000 +0200
|
||||
+++ swig-1.3.40/Lib/perl5/perlrun.swg 2010-04-06 15:07:29.000000000 +0200
|
||||
@@ -272,6 +272,7 @@ SWIG_Perl_ConvertPtrAndOwn(SWIG_MAYBE_PE
|
||||
} else if (! SvOK(sv)) { /* Check for undef */
|
||||
*(ptr) = (void *) 0;
|
||||
return SWIG_OK;
|
||||
+#if PERL_VERSION < 12
|
||||
} else if (SvTYPE(sv) == SVt_RV) { /* Check for NULL pointer */
|
||||
if (!SvROK(sv)) {
|
||||
*(ptr) = (void *) 0;
|
||||
@@ -279,6 +280,7 @@ SWIG_Perl_ConvertPtrAndOwn(SWIG_MAYBE_PE
|
||||
} else {
|
||||
return SWIG_ERROR;
|
||||
}
|
||||
+#endif
|
||||
} else { /* Don't know what it is */
|
||||
return SWIG_ERROR;
|
||||
}
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 6 13:38:47 UTC 2010 - coolo@novell.com
|
||||
|
||||
- fix build with new perl 5.12: there is no Reference type anymore,
|
||||
but references and integers are the same, so a 0L was seen as 0
|
||||
pointer - breaking the test suite. The fix is to remove the check
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 14 09:54:04 UTC 2010 - coolo@novell.com
|
||||
|
||||
|
@ -49,10 +49,11 @@ Group: Development/Languages/C and C++
|
||||
AutoReqProv: on
|
||||
Summary: Simplified Wrapper and Interface Generator
|
||||
Version: 1.3.40
|
||||
Release: 2
|
||||
Release: 3
|
||||
Source: swig-%{version}.tar.bz2
|
||||
Patch1: swig-1.3.36-perl-long-long.patch
|
||||
Patch2: swig-fixassert.diff
|
||||
Patch3: adapt-perl512.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -128,6 +129,7 @@ Authors:
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
v1=$(awk '/^# Generated by GNU Autoconf / { print $6; exit; }' configure)
|
||||
|
Loading…
Reference in New Issue
Block a user