Attachment 938813 Details for Bug 1143914 – Improved patch

[patch] Improved patch

0001-Fixed-s390-build.patch (text/plain), 2.37 KB, created by Jakub Čajka on 2014-09-18 09:13:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-09-18 09:13:17 UTC

Size: 2.37 KB

patch

obsolete

>From 29b6243ef9411d30f2763256570be4d472a5bfd8 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
>Date: Thu, 18 Sep 2014 11:12:02 +0200
>Subject: [PATCH] Fixed s390 build
>
>---
> gnuradio.spec        | 13 ++++++++++++-
> s390-build-fix.patch | 11 +++++++++++
> 2 files changed, 23 insertions(+), 1 deletion(-)
> create mode 100644 s390-build-fix.patch
>
>diff --git a/gnuradio.spec b/gnuradio.spec
>index db7a723..aacdecb 100644
>--- a/gnuradio.spec
>+++ b/gnuradio.spec
>@@ -28,7 +28,7 @@
> 
> Name:		gnuradio
> Version:	3.7.5
>-Release:	1%{?dist}
>+Release:	2%{?dist}
> Summary:	Software defined radio framework
> 
> Group:		Applications/Engineering
>@@ -67,6 +67,10 @@ Requires:	PyQwt
> %endif
> Obsoletes:	usrp < 3.3.0-1
> Obsoletes:	grc < 0.80-1
>+#Removes flag set that forces size_t to be int on 32-bit systems, on s390(31-bit) size_t is long
>+#upstream report: http://gnuradio.org/redmine/issues/728
>+#bz: https://bugzilla.redhat.com/show_bug.cgi?id=1143914
>+Patch0: s390-build-fix.patch
> 
> %description
> GNU Radio is a collection of software that when combined with minimal
>@@ -104,6 +108,10 @@ GNU Radio examples
> 
> %prep
> %setup -q
>+# breaks build on other 32-bit systems 
>+%ifarch s390
>+%patch0 -p1 -b .s390
>+%endif
> 
> #force regeneration of cached moc output files
> find . -name "*_moc.cc" -exec rm {} \;
>@@ -191,6 +199,9 @@ rm -rf %{buildroot}
> %{_datadir}/gnuradio/examples
> 
> %changelog
>+* Thu Sep 18 2014 Jakub Äajka <jcajka@redhat.com> - 3.7.5-2
>+- Fixed s390 build by dropping -DSIZE_T_32 swig flag(s390 only)
>+
> * Mon Sep  1 2014 Jaroslav Å karvada <jskarvad@redhat.com> - 3.7.5-1
> - New version
>   Resolves: rhbz#1135814
>diff --git a/s390-build-fix.patch b/s390-build-fix.patch
>new file mode 100644
>index 0000000..d935271
>--- /dev/null
>+++ b/s390-build-fix.patch
>@@ -0,0 +1,11 @@
>+diff -up gnuradio-3.7.5/cmake/Modules/GrSwig.cmake.s390 gnuradio-3.7.5/cmake/Modules/GrSwig.cmake
>+--- gnuradio-3.7.5/cmake/Modules/GrSwig.cmake.s390	2014-09-18 08:34:03.512097784 +0200
>++++ gnuradio-3.7.5/cmake/Modules/GrSwig.cmake	2014-09-18 08:34:12.534123485 +0200
>+@@ -114,7 +114,6 @@ macro(GR_SWIG_MAKE name)
>+     CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T)
>+     CHECK_TYPE_SIZE("unsigned int" SIZEOF_UINT)
>+     if(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
>+-      list(APPEND GR_SWIG_FLAGS -DSIZE_T_32)
>+     endif(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
>+ 
>+     #do swig doc generation if specified
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1143914: 938811 | 938813 | 938818 | 939065