On 03/20/2015 05:41 AM, Zhigang Gong wrote: > Thanks for the patch, could you reply with your signed-by signature > for the patch? Then I can merge it.
I'm happy to contribute. Attached you will find my signed patch. Kind regards, Brian
>From 5f1ad80e2263cee50493399f7c63d229b33ae6fe Mon Sep 17 00:00:00 2001 From: Brian Kloppenborg <[email protected]> Date: Thu, 19 Mar 2015 13:56:21 -0400 Subject: [PATCH] BUGFIX: Prohibit 'make package' from doing system install of ICD vendor file To: [email protected] As presently written, a 'make package' will attempt to INSTALL the Beignet ICD loader to /etc/OpenCL/vendors whereas it should just do a local install and then package the file. The proposed change instructs CPack to include the `DESTDIR` variable when it calls `make install`, thus directing the desination for the ICD loader to a local directory instead of a system path. Signed-off-by: Brian Kloppenborg <[email protected]> --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e11a3d0..a230e4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,6 +234,7 @@ IF(BUILD_EXAMPLES) ADD_SUBDIRECTORY(examples) ENDIF(BUILD_EXAMPLES) +SET(CPACK_SET_DESTDIR ON) SET(CPACK_PACKAGE_VERSION_MAJOR "${LIBCL_DRIVER_VERSION_MAJOR}") SET(CPACK_PACKAGE_VERSION_MINOR "${LIBCL_DRIVER_VERSION_MINOR}") SET(CPACK_PACKAGE_VERSION_PATCH "${LIBCL_DRIVER_VERSION_PATCH}") -- 2.1.0
_______________________________________________ Beignet mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/beignet
