aboutsummaryrefslogtreecommitdiff
path: root/lang/beignet
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-12-25 01:38:38 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-12-25 01:38:38 +0000
commit689dad71ffae7e9167c36e6505806193488c0af4 (patch)
tree87747f83feacbcde8045f2de46967cb358ac7645 /lang/beignet
parentc835f150cdbac9783953e1dfd940b19cf8b4725f (diff)
downloadports-689dad71ffae7e9167c36e6505806193488c0af4.tar.gz
ports-689dad71ffae7e9167c36e6505806193488c0af4.zip
lang/beignet: fix order of flags for mkdir(1) and rm(1)
BSD versions of commands don't support specifiying flags after arguments. Obtained from: DPorts Pointy hat to: jbeich (lost in r451413)
Notes
Notes: svn path=/head/; revision=457203
Diffstat (limited to 'lang/beignet')
-rw-r--r--lang/beignet/Makefile1
-rw-r--r--lang/beignet/files/patch-src_cl__program.c13
-rw-r--r--lang/beignet/files/patch-utests_CMakeLists.txt20
3 files changed, 33 insertions, 1 deletions
diff --git a/lang/beignet/Makefile b/lang/beignet/Makefile
index da9b49f80bda..9a89f12756a3 100644
--- a/lang/beignet/Makefile
+++ b/lang/beignet/Makefile
@@ -4,6 +4,7 @@
PORTNAME= beignet
DISTVERSION= 1.3.2
DISTVERSIONSUFFIX= -source
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= https://01.org/sites/default/files/
diff --git a/lang/beignet/files/patch-src_cl__program.c b/lang/beignet/files/patch-src_cl__program.c
new file mode 100644
index 000000000000..67514ced7dee
--- /dev/null
+++ b/lang/beignet/files/patch-src_cl__program.c
@@ -0,0 +1,13 @@
+--- src/cl_program.c.orig 2017-09-22 08:59:52 UTC
++++ src/cl_program.c
+@@ -861,9 +861,8 @@ cl_program_compile(cl_program p,
+ p->opaque = compiler_program_compile_from_source(p->ctx->devices[0]->device_id, p->source, temp_header_path,
+ p->build_log_max_sz, options, p->build_log, &p->build_log_sz);
+
+- char rm_path[255]="rm ";
++ char rm_path[255]="rm -rf ";
+ strncat(rm_path, temp_header_path, strlen(temp_header_path));
+- strncat(rm_path, " -rf", 4);
+ int temp = system(rm_path);
+
+ if(temp){
diff --git a/lang/beignet/files/patch-utests_CMakeLists.txt b/lang/beignet/files/patch-utests_CMakeLists.txt
index e3649c4adedd..82e74a90f948 100644
--- a/lang/beignet/files/patch-utests_CMakeLists.txt
+++ b/lang/beignet/files/patch-utests_CMakeLists.txt
@@ -1,6 +1,15 @@
--- utests/CMakeLists.txt.orig 2017-01-20 10:40:51 UTC
+++ utests/CMakeLists.txt
-@@ -333,12 +333,12 @@ list (GET GBE_BIN_GENERATER -1 GBE_BIN_F
+@@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+
+
+ ##### Math Function Part:
+-EXECUTE_PROCESS(COMMAND mkdir generated -p WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
++EXECUTE_PROCESS(COMMAND mkdir -p generated WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} utest_math_gen.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GEN_MATH_STRING)
+ string(REGEX REPLACE " " ";" ADDMATHFUNC ${GEN_MATH_STRING})
+
+@@ -332,12 +332,12 @@ list (GET GBE_BIN_GENERATER -1 GBE_BIN_FILE)
if(GEN_PCI_ID)
ADD_CUSTOM_COMMAND(
OUTPUT ${kernel_bin}.bin
@@ -15,3 +24,12 @@
DEPENDS ${GBE_BIN_FILE} ${kernel_bin}.cl)
endif(GEN_PCI_ID)
+@@ -346,7 +346,7 @@ if (NOT_BUILD_STAND_ALONE_UTEST)
+ endif (NOT_BUILD_STAND_ALONE_UTEST)
+
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/generated
+- COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/generated -p
++ COMMAND mkdir -p ${CMAKE_CURRENT_SOURCE_DIR}/generated
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utest_math_gen.py > /dev/null 2>&1
+ COMMAND echo ${KERNEL_GITIGNORE_LIST} |sed 's/ /\\n/g' > ${CMAKE_CURRENT_SOURCE_DIR}/../kernels/.gitignore
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}