[SCM] ViennaCL packaging branch, master, updated. debian/1.1.1-1-30-g727603b

Michael Wild themiwi at users.sourceforge.net
Tue Aug 2 12:19:23 UTC 2011


The following commit has been merged in the master branch:
commit d5eba537b607bf47effac5de5d81e9e8173e36a9
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Tue Aug 2 09:35:43 2011 +0200

    Force Boost.Filesystem version 2 API for auxiliary/converter.cpp
    
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/patches/0002-Link-auxiliary-converter-against-libboost_system-mt.patch b/debian/patches/0003-Force-Boost.Filesystem-version-2-API-for-auxiliary-c.patch
similarity index 59%
copy from debian/patches/0002-Link-auxiliary-converter-against-libboost_system-mt.patch
copy to debian/patches/0003-Force-Boost.Filesystem-version-2-API-for-auxiliary-c.patch
index 448be6c..25da2cb 100644
--- a/debian/patches/0002-Link-auxiliary-converter-against-libboost_system-mt.patch
+++ b/debian/patches/0003-Force-Boost.Filesystem-version-2-API-for-auxiliary-c.patch
@@ -1,6 +1,6 @@
 From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Mon, 1 Aug 2011 14:15:50 +0200
-Subject: Link auxiliary/converter against libboost_system-mt
+Date: Tue, 2 Aug 2011 09:31:49 +0200
+Subject: Force Boost.Filesystem version 2 API for auxiliary/converter.cpp
 
 Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
 ---
@@ -8,14 +8,14 @@ Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/auxiliary/convert.sh b/auxiliary/convert.sh
-index d554fa4..e0ec83f 100755
+index e0ec83f..f198dfa 100755
 --- a/auxiliary/convert.sh
 +++ b/auxiliary/convert.sh
 @@ -5,5 +5,5 @@ g++ generate-blas3-prod-align1.cpp -o generate-blas3-prod-align1
  
  ./generate-blas3.sh
  
--g++ converter.cpp -o converter -lboost_filesystem-mt
-+g++ converter.cpp -o converter -lboost_filesystem-mt -lboost_system-mt
+-g++ converter.cpp -o converter -lboost_filesystem-mt -lboost_system-mt
++g++ converter.cpp -DBOOST_FILESYSTEM_VERSION=2 -o converter -lboost_filesystem-mt -lboost_system-mt
  ./converter
 -- 
diff --git a/debian/patches/series b/debian/patches/series
index 3724205..5dec887 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Properly-link-tests-against-libOpenCL.patch
 0002-Link-auxiliary-converter-against-libboost_system-mt.patch
+0003-Force-Boost.Filesystem-version-2-API-for-auxiliary-c.patch

-- 
ViennaCL packaging



More information about the debian-science-commits mailing list