Date: Mon, 7 Jan 2013 18:08:06 GMT From: "O. Hartmann" <ohartman@zedat.fu-berlin.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/175113: devel/freeocl: Port revision PORTREVISION=1 Message-ID: <201301071808.r07I86Nr058790@red.freebsd.org> Resent-Message-ID: <201301071811.r07IBGxL064467@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175113
>Category: ports
>Synopsis: devel/freeocl: Port revision PORTREVISION=1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 07 18:10:26 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: O. Hartmann
>Release:
>Organization:
FU Berlin
>Environment:
>Description:
Attached, I provide an update of the port devel/freeocl to compile properly with CLANG 3.1/3.1 on FreeBSD 9.1-STABLE and FreeBSD 10.0-CURRENT.
>How-To-Repeat:
>Fix:
Attach the patch to the port devel/freeocl
Patch attached with submission follows:
--- /tmp/freeocl.orig 2013-01-07 19:04:30.000000000 +0100
+++ /tmp/freeocl 2013-01-07 19:04:20.000000000 +0100
@@ -5,21 +5,32 @@
#
# This archive contains:
#
-# freeocl.orig
-# freeocl.orig/files
-# freeocl.orig/files/patch-src_icd_icd_loader.cpp
-# freeocl.orig/files/patch-CMakeLists.txt
-# freeocl.orig/pkg-plist
-# freeocl.orig/Makefile
-# freeocl.orig/distinfo
-# freeocl.orig/pkg-descr
+# freeocl
+# freeocl/distinfo
+# freeocl/pkg-descr
+# freeocl/files
+# freeocl/files/patch-src_icd_icd_loader.cpp
+# freeocl/files/patch-CMakeLists.txt
+# freeocl/files/off-patch-config.h.cmake
+# freeocl/files/patch-src_parser_parser.h
+# freeocl/pkg-plist
+# freeocl/Makefile
#
-echo c - freeocl.orig
-mkdir -p freeocl.orig > /dev/null 2>&1
-echo c - freeocl.orig/files
-mkdir -p freeocl.orig/files > /dev/null 2>&1
-echo x - freeocl.orig/files/patch-src_icd_icd_loader.cpp
-sed 's/^X//' >freeocl.orig/files/patch-src_icd_icd_loader.cpp << 'dbdde8adf2a38ea5c1b9c97729c16a95'
+echo c - freeocl
+mkdir -p freeocl > /dev/null 2>&1
+echo x - freeocl/distinfo
+sed 's/^X//' >freeocl/distinfo << '46d70351e22a0453ddaed201d6caebfc'
+XSHA256 (FreeOCL-0.3.6-src.tar.gz) = d1eea6d6214781a67efee6b691f06407780fb51f8dd742a83324478a6cfb8f1a
+XSIZE (FreeOCL-0.3.6-src.tar.gz) = 216517
+46d70351e22a0453ddaed201d6caebfc
+echo x - freeocl/pkg-descr
+sed 's/^X//' >freeocl/pkg-descr << '7321084523b6193232cf9a5d53bb59e7'
+XFreeOCL - a free OpenCL implementation for CPU
+7321084523b6193232cf9a5d53bb59e7
+echo c - freeocl/files
+mkdir -p freeocl/files > /dev/null 2>&1
+echo x - freeocl/files/patch-src_icd_icd_loader.cpp
+sed 's/^X//' >freeocl/files/patch-src_icd_icd_loader.cpp << 'ce0d9abed3b9f0bfd28a10178bcf9058'
X--- src/icd/icd_loader.cpp.orig 2012-09-22 13:14:12.000000000 +0400
X+++ src/icd/icd_loader.cpp 2012-09-22 13:15:03.000000000 +0400
X@@ -53,8 +53,8 @@ namespace FreeOCL
@@ -33,12 +44,20 @@
X // For each file
X for(std::deque<std::string>::const_iterator i = files.begin() ; i != files.end() ; ++i)
X {
-dbdde8adf2a38ea5c1b9c97729c16a95
-echo x - freeocl.orig/files/patch-CMakeLists.txt
-sed 's/^X//' >freeocl.orig/files/patch-CMakeLists.txt << '5276e06fea39ba1c47b583b3c1c7a595'
-X--- CMakeLists.txt.orig 2012-09-22 12:55:02.000000000 +0400
-X+++ CMakeLists.txt 2012-09-22 12:55:27.000000000 +0400
-X@@ -83,7 +83,7 @@ endif(LIBRT)
+ce0d9abed3b9f0bfd28a10178bcf9058
+echo x - freeocl/files/patch-CMakeLists.txt
+sed 's/^X//' >freeocl/files/patch-CMakeLists.txt << 'f0db1ecb0c244d5d8e980a4aa174f73f'
+X--- CMakeLists.txt.orig 2012-09-02 19:00:41.000000000 +0200
+X+++ CMakeLists.txt 2013-01-07 18:34:52.000000000 +0100
+X@@ -70,6 +70,7 @@
+X include_directories(.)
+X include_directories(include)
+X include_directories(src)
+X+include_directories(%%PREFIX%%/include)
+X link_libraries(${CMAKE_THREAD_LIBS_INIT})
+X find_library(LIBDL dl)
+X find_library(LIBRT rt)
+X@@ -83,7 +84,7 @@
X add_subdirectory(samples)
X add_subdirectory(src)
X
@@ -47,9 +66,37 @@
X # OpenCL headers shouldn't be needed in the runtime package
X # install(DIRECTORY include/CL/ DESTINATION include/CL/ FILES_MATCHING PATTERN "*.h")
X install(DIRECTORY include/FreeOCL/ DESTINATION include/FreeOCL/ FILES_MATCHING PATTERN "*.h")
-5276e06fea39ba1c47b583b3c1c7a595
-echo x - freeocl.orig/pkg-plist
-sed 's/^X//' >freeocl.orig/pkg-plist << 'f3288ed44980e13cfb65a13691d8bf7c'
+f0db1ecb0c244d5d8e980a4aa174f73f
+echo x - freeocl/files/off-patch-config.h.cmake
+sed 's/^X//' >freeocl/files/off-patch-config.h.cmake << 'aa07f14a8b5cacb2210a767049f72d84'
+X--- config.h.cmake.orig 2012-12-24 17:56:10.000000000 +0100
+X+++ config.h.cmake 2012-12-24 17:56:45.000000000 +0100
+X@@ -31,7 +31,7 @@
+X
+X #define FREEOCL_CXX_FLAGS_COMMON " " \
+X " -shared -fpic -pipe" /* -Wall*/ \
+X- " -I./include" \
+X+ " -I./include -I%%PREFIX%%/include" \
+X " -g -O3" \
+X " -fomit-frame-pointer -ftree-vectorize -funroll-loops" \
+X " -fno-math-errno -fno-trapping-math" \
+aa07f14a8b5cacb2210a767049f72d84
+echo x - freeocl/files/patch-src_parser_parser.h
+sed 's/^X//' >freeocl/files/patch-src_parser_parser.h << 'd98e3cb07892822160224a273239915a'
+X--- src/parser/parser.h.orig 2012-12-24 17:42:59.000000000 +0100
+X+++ src/parser/parser.h 2012-12-24 17:43:11.000000000 +0100
+X@@ -115,7 +115,7 @@
+X inline std::istream &get(char &c)
+X {
+X c = 0;
+X- const bool ok = in.get(c);
+X+ const bool ok = (bool) in.get(c);
+X if (c == '\n')
+X ++line;
+X if (!current_line.empty() && *current_line.rbegin() == '\n')
+d98e3cb07892822160224a273239915a
+echo x - freeocl/pkg-plist
+sed 's/^X//' >freeocl/pkg-plist << '82436ca5b256c548729f352bfc927f9d'
Xetc/OpenCL/vendors/freeocl.icd
Xinclude/FreeOCL/asyncmemop.h
Xinclude/FreeOCL/atomic.h
@@ -83,14 +130,15 @@
X@dirrm include/FreeOCL
X@dirrm etc/OpenCL/vendors
X@dirrm etc/OpenCL
-f3288ed44980e13cfb65a13691d8bf7c
-echo x - freeocl.orig/Makefile
-sed 's/^X//' >freeocl.orig/Makefile << '54d9fa9723ea54b5901efd00b01794e8'
+82436ca5b256c548729f352bfc927f9d
+echo x - freeocl/Makefile
+sed 's/^X//' >freeocl/Makefile << '604bb6bbcbdd64260089abdd11c3300e'
X# Created by: Oliver Hartmann <ohartman@zedat.fu-berlin.de>
X# $FreeBSD: head/devel/freeocl/Makefile 305166 2012-10-02 16:40:40Z az $
X
XPORTNAME= freeocl
XPORTVERSION= 0.3.6
+XPORTREVISION= 1
XCATEGORIES= devel
XMASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
XDISTNAME= FreeOCL-${PORTVERSION}-src
@@ -105,7 +153,8 @@
X
XWRKSRC= ${WRKDIR}/FreeOCL-${PORTVERSION}-Source
X
-XUSE_GCC= 4.6+
+XCXXFLAGS+= -stdlib=libc++
+X
XUSE_CMAKE= yes
XUSE_LDCONFIG= yes
XCMAKE_BUILD_TYPE=Release
@@ -119,15 +168,6 @@
XBROKEN= this port does not compile at 7.x: "src/program.cpp:531:37: error: 'RTLD_NOLOAD' was not declared in this scope"
X.endif
X.include <bsd.port.post.mk>
-54d9fa9723ea54b5901efd00b01794e8
-echo x - freeocl.orig/distinfo
-sed 's/^X//' >freeocl.orig/distinfo << 'ef561c0081243e2d163b569624b9c0bc'
-XSHA256 (FreeOCL-0.3.6-src.tar.gz) = d1eea6d6214781a67efee6b691f06407780fb51f8dd742a83324478a6cfb8f1a
-XSIZE (FreeOCL-0.3.6-src.tar.gz) = 216517
-ef561c0081243e2d163b569624b9c0bc
-echo x - freeocl.orig/pkg-descr
-sed 's/^X//' >freeocl.orig/pkg-descr << '2fbcec6e2f6924b9d34460cd9a0e9549'
-XFreeOCL - a free OpenCL implementation for CPU
-2fbcec6e2f6924b9d34460cd9a0e9549
+604bb6bbcbdd64260089abdd11c3300e
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301071808.r07I86Nr058790>