Attachment 7004 Details for Bug 16756 – svn diff from my working dir

[patch] svn diff from my working dir

svndiff (text/plain), 1.60 KB, created by Barry Jackson on 2015-09-15 00:33:25 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2015-09-15 00:33:25 CEST

Size: 1.60 KB

patch

obsolete

>Index: SPECS/boost.spec
>===================================================================
>--- SPECS/boost.spec	(revision 878905)
>+++ SPECS/boost.spec	(working copy)
>@@ -6,7 +6,7 @@
> Summary:	Portable C++ libraries
> Name:		boost
> Version:	1.58.0
>-Release:	%mkrel 2
>+Release:	%mkrel 1
> License:	Boost
> Group:		Development/C++
> URL:		http://boost.org/
>@@ -19,8 +19,11 @@
> BuildRequires:	doxygen
> BuildRequires:	xsltproc
> BuildRequires:	python3-devel
>-BuildRequires:	openmpi-devel
>+BuildRequires:	pkgconfig(ompi)
> 
>+# Required to build in iurt on local machine (cat permission error)
>+Patch1:	boost-1.58-mga-fix_local_iurt_build.patch
>+
> # https://svn.boost.org/trac/boost/ticket/6150
> Patch4: boost-1.50.0-fix-non-utf8-files.patch
> 
>@@ -53,7 +56,7 @@
> chores -- whether you're using GCC, MSVC, or a dozen more supported
> C++ compilers -- on Windows, OSX, Linux and commercial UNIX systems.
> 
>-%define boostlibs atomic chrono container context coroutine date_time filesystem graph iostreams locale log math prg_exec_monitor program_options python random regex serialization signals system thread timer unit_test_framework wave wserialization
>+%define boostlibs atomic chrono container context coroutine date_time filesystem graph iostreams locale log math mpi prg_exec_monitor program_options python random regex serialization signals system thread timer unit_test_framework wave wserialization
> 
> # (Anssi 01/2010) dashes are converted to underscores for macros ($lib2);
> # The sed script adds _ when library name ends in number.
>@@ -138,6 +141,7 @@
> 
> %prep
> %setup -q -n boost_%{packver}
>+%patch1 -p1
> %patch4 -p1
> %patch5 -p1
> %patch15 -p0

Index: SPECS/boost.spec
===================================================================
--- SPECS/boost.spec	(revision 878905)
+++ SPECS/boost.spec	(working copy)
@@ -6,7 +6,7 @@
 Summary:	Portable C++ libraries
 Name:		boost
 Version:	1.58.0
-Release:	%mkrel 2
+Release:	%mkrel 1
 License:	Boost
 Group:		Development/C++
 URL:		http://boost.org/
@@ -19,8 +19,11 @@
 BuildRequires:	doxygen
 BuildRequires:	xsltproc
 BuildRequires:	python3-devel
-BuildRequires:	openmpi-devel
+BuildRequires:	pkgconfig(ompi)
 
+# Required to build in iurt on local machine (cat permission error)
+Patch1:	boost-1.58-mga-fix_local_iurt_build.patch
+
 # https://svn.boost.org/trac/boost/ticket/6150
 Patch4: boost-1.50.0-fix-non-utf8-files.patch
 
@@ -53,7 +56,7 @@
 chores -- whether you're using GCC, MSVC, or a dozen more supported
 C++ compilers -- on Windows, OSX, Linux and commercial UNIX systems.
 
-%define boostlibs atomic chrono container context coroutine date_time filesystem graph iostreams locale log math prg_exec_monitor program_options python random regex serialization signals system thread timer unit_test_framework wave wserialization
+%define boostlibs atomic chrono container context coroutine date_time filesystem graph iostreams locale log math mpi prg_exec_monitor program_options python random regex serialization signals system thread timer unit_test_framework wave wserialization
 
 # (Anssi 01/2010) dashes are converted to underscores for macros ($lib2);
 # The sed script adds _ when library name ends in number.
@@ -138,6 +141,7 @@
 
 %prep
 %setup -q -n boost_%{packver}
+%patch1 -p1
 %patch4 -p1
 %patch5 -p1
 %patch15 -p0

Actions: View | Diff

Attachments on bug 16756: 7004 | 7005 | 7022