Attachment 147984 Details for Bug 179180 – Fix some bugs and prepare for future port conflicts.

[patch] Fix some bugs and prepare for future port conflicts.

freeocl-0.3.6_6.diff (text/plain), 6.98 KB, created by O. Hartmann on 2014-10-04 20:01:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: O. Hartmann

Created: 2014-10-04 20:01:07 UTC

Size: 6.98 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 369993)
>+++ Makefile	(working copy)
>@@ -3,27 +3,32 @@
> 
> PORTNAME=	freeocl
> PORTVERSION=	0.3.6
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
> DISTNAME=	FreeOCL-${PORTVERSION}-src
> 
> MAINTAINER=	ohartman@zedat.fu-berlin.de
>-COMMENT=	Free Open Computing Language (OpenCL) implementation for CPU
>+COMMENT=	Free implementation of OpenCL 1.2 for CPUs
> 
>+LICENSE=	LGPL3
>+
>+CONFLICTS=	ocl-icd[0-9]* opencl-icd[0-9]* pocl[0-9]*
>+
> BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops \
> 		${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
> 
>-LICENSE=	LGPL3
>-
> WRKSRC=		${WRKDIR}/FreeOCL-${PORTVERSION}-Source
> 
>-USE_GCC=	yes
>+USE_GCC=	any
> USES=		cmake
> USE_LDCONFIG=	yes
> 
>+CXXFLAGS+=	-pthread -std=gnu++0x
>+CMAKE_ENV+=	FREEOCL_CXX_COMPILER="${CXX}"
>+
> post-patch:
>-	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/src/icd/icd_loader.cpp \
>+		@${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/src/icd/icd_loader.cpp \
> 		${WRKSRC}/CMakeLists.txt
> 
> .include <bsd.port.mk>
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 369993)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -1,6 +1,14 @@
>---- CMakeLists.txt.orig	2012-09-22 12:55:02.000000000 +0400
>-+++ CMakeLists.txt	2012-09-22 12:55:27.000000000 +0400
>-@@ -83,7 +83,7 @@ endif(LIBRT)
>+--- CMakeLists.txt.orig	2012-09-02 19:00:41.000000000 +0200
>++++ CMakeLists.txt	2013-05-18 21:41:36.907149619 +0200
>+@@ -69,6 +69,7 @@
>+ 
>+ include_directories(.)
>+ include_directories(include)
>++include_directories(/usr/local/include)
>+ include_directories(src)
>+ link_libraries(${CMAKE_THREAD_LIBS_INIT})
>+ find_library(LIBDL dl)
>+@@ -83,7 +84,7 @@
>  add_subdirectory(samples)
>  add_subdirectory(src)
>  
>Index: files/patch-src-utils-threadpool.cpp
>===================================================================
>--- files/patch-src-utils-threadpool.cpp	(revision 369993)
>+++ files/patch-src-utils-threadpool.cpp	(working copy)
>@@ -1,10 +0,0 @@
>---- src/utils/threadpool.cpp.orig	2014-07-04 08:45:34.000000000 +0200
>-+++ src/utils/threadpool.cpp	2014-07-04 08:46:03.000000000 +0200
>-@@ -18,6 +18,7 @@
>- #include "threadpool.h"
>- #include <FreeOCL/config.h>
>- #include <sched.h>
>-+#include <xmmintrin.h>
>- #include <atomic_ops.h>
>- #include <utils/time.h>
>- 
>Index: files/patch-src__device.cpp
>===================================================================
>--- files/patch-src__device.cpp	(revision 0)
>+++ files/patch-src__device.cpp	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/device.cpp.orig	2013-05-18 20:12:03.000000000 +0200
>++++ src/device.cpp	2013-05-18 20:13:30.000000000 +0200
>+@@ -345,7 +345,11 @@
>+ 
>+ 	pool = new FreeOCL::threadpool();
>+ 
>++#ifdef	__FreeBSD__
>++	std::string ostype = trim(run_command("/sbin/sysctl -e kern.ostype | awk '{ print $NF }'"));
>++#else
>+ 	std::string ostype = trim(run_command("/sbin/sysctl -e kernel.ostype | awk '{ print $NF }'"));
>++#endif
>+ 	if (ostype.empty())
>+ 		ostype = trim(run_command("/sbin/sysctl -e kern.ostype | awk '{ print $NF }'"));
>+ 	if (ostype.empty())
>
>Property changes on: files/patch-src__device.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src__freeocl.h
>===================================================================
>--- files/patch-src__freeocl.h	(revision 369993)
>+++ files/patch-src__freeocl.h	(working copy)
>@@ -1,11 +1,14 @@
>---- src/freeocl.h.orig	2012-09-02 19:00:41.000000000 +0200
>-+++ src/freeocl.h	2014-07-04 08:42:48.000000000 +0200
>-@@ -26,6 +26,8 @@
>- #include "dispatch.h"
>- #include <iostream>
>- #include <deque>
>-+#include <sys/types.h>
>-+#include <xmmintrin.h>
>+--- src/freeocl.h.orig	2014-10-04 21:20:27.000000000 +0200
>++++ src/freeocl.h	2014-10-04 21:21:50.000000000 +0200
>+@@ -35,6 +35,11 @@
>+ #define CRASH()
>+ #endif
>  
>- #ifdef DEBUG_UTILS
>- #define MSG(X)	std::cout << #X << std::endl
>++#ifdef __FreeBSD__
>++typedef	unsigned int uint;
>++typedef	uint64_t u_int64_t;
>++#endif
>++
>+ namespace FreeOCL
>+ {
>+ 	extern cl_platform_id platform;
>Index: files/patch-src__utils__threadpool.h
>===================================================================
>--- files/patch-src__utils__threadpool.h	(revision 0)
>+++ files/patch-src__utils__threadpool.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/utils/threadpool.h.orig	2014-10-04 21:23:27.000000000 +0200
>++++ src/utils/threadpool.h	2014-10-04 21:23:44.000000000 +0200
>+@@ -22,6 +22,7 @@
>+ #include <deque>
>+ #include <vector>
>+ #include <ucontext.h>
>++#include <xmmintrin.h>
>+ 
>+ namespace FreeOCL
>+ {
>
>Property changes on: files/patch-src__utils__threadpool.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-src_freeocl.h
>===================================================================
>--- files/patch-src_freeocl.h	(revision 369993)
>+++ files/patch-src_freeocl.h	(working copy)
>@@ -1,11 +0,0 @@
>---- src/freeocl.h.orig	2012-09-02 19:00:41.000000000 +0200
>-+++ src/freeocl.h	2014-07-04 08:42:48.000000000 +0200
>-@@ -26,6 +26,8 @@
>- #include "dispatch.h"
>- #include <iostream>
>- #include <deque>
>-+#include <sys/types.h>
>-+#include <xmmintrin.h>
>- 
>- #ifdef DEBUG_UTILS
>- #define MSG(X)	std::cout << #X << std::endl
>Index: files/patch-src_icd_icd_loader.cpp
>===================================================================
>--- files/patch-src_icd_icd_loader.cpp	(revision 369993)
>+++ files/patch-src_icd_icd_loader.cpp	(working copy)
>@@ -1,13 +0,0 @@
>---- src/icd/icd_loader.cpp.orig	2012-09-22 13:14:12.000000000 +0400
>-+++ src/icd/icd_loader.cpp	2012-09-22 13:15:03.000000000 +0400
>-@@ -53,8 +53,8 @@ namespace FreeOCL
>- 
>- 	icd_loader::icd_loader()
>- 	{
>--		// Get the list of all *.icd files in /etc/OpenCL/vendors/
>--		const std::deque<std::string> &files = list_files("/etc/OpenCL/vendors/", ".icd");
>-+		// Get the list of all *.icd files in %%PREFIX%%/etc/OpenCL/vendors/
>-+		const std::deque<std::string> &files = list_files("%%PREFIX%%/etc/OpenCL/vendors/", ".icd");
>- 		// For each file
>- 		for(std::deque<std::string>::const_iterator i = files.begin() ; i != files.end() ; ++i)
>- 		{
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 369993)
>+++ pkg-descr	(working copy)
>@@ -1 +1,5 @@
>-FreeOCL - a free OpenCL implementation for CPU
>+FreeOCL is an implementation of OpenCL 1.2 specifications 
>+targeting CPUs. Instead of using a built-in or dedicated 
>+compiler, it relies on an external C++ compiler. 
>+
>+See: https://code.google.com/p/freeocl/

Actions: View | Diff

Attachments on bug 179180: 134492 | 147984 | 148213