From owner-svn-ports-all@freebsd.org Mon Nov 27 13:38:27 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAF50E51871; Mon, 27 Nov 2017 13:38:27 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A23B17175F; Mon, 27 Nov 2017 13:38:27 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARDcQrK056936; Mon, 27 Nov 2017 13:38:26 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARDcQki056934; Mon, 27 Nov 2017 13:38:26 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201711271338.vARDcQki056934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 27 Nov 2017 13:38:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r454952 - branches/2017Q4/lang/beignet/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2017Q4/lang/beignet/files X-SVN-Commit-Revision: 454952 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Nov 2017 13:38:27 -0000 Author: jbeich Date: Mon Nov 27 13:38:26 2017 New Revision: 454952 URL: https://svnweb.freebsd.org/changeset/ports/454952 Log: MFH: r451411 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 Approved by: ports-secteam (swills) Added: branches/2017Q4/lang/beignet/files/patch-src_cl__program.c - copied unchanged from r451411, head/lang/beignet/files/patch-src_cl__program.c Modified: branches/2017Q4/lang/beignet/files/patch-utests_CMakeLists.txt (contents, props changed) Directory Properties: branches/2017Q4/ (props changed) Copied: branches/2017Q4/lang/beignet/files/patch-src_cl__program.c (from r451411, head/lang/beignet/files/patch-src_cl__program.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q4/lang/beignet/files/patch-src_cl__program.c Mon Nov 27 13:38:26 2017 (r454952, copy of r451411, head/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){ Modified: branches/2017Q4/lang/beignet/files/patch-utests_CMakeLists.txt ============================================================================== --- branches/2017Q4/lang/beignet/files/patch-utests_CMakeLists.txt Mon Nov 27 13:29:27 2017 (r454951) +++ branches/2017Q4/lang/beignet/files/patch-utests_CMakeLists.txt Mon Nov 27 13:38:26 2017 (r454952) @@ -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}