From libclc-dev at lists.llvm.org Thu Dec 6 14:40:08 2018 From: libclc-dev at lists.llvm.org (Jan Vesely via Libclc-dev) Date: Thu, 6 Dec 2018 17:40:08 -0500 Subject: [Libclc-dev] [PATCH 1/1] cmake: Install libraries to DATADIR from GNUInstallDirs Message-ID: <20181206224008.15210-1-jan.vesely@rutgers.edu> This moves default installation location of device libraries to /usr/share. Note that libclc.pc was already installed to /usr/share. Signed-off-by: Jan Vesely --- I was not sure if this should use LIBDIR or DATADIR, but in the end the libraries are independent of CPU architecture and it can be easily overridden. I don't have a strong preference, let me know if LIBDIR looks better to you. Jan CMakeLists.txt | 11 ++++++----- libclc.pc.in | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41bd5f6..440eab0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required( VERSION 3.9.2 ) project( libclc VERSION 0.2.0 LANGUAGES CXX ) +include( GNUInstallDirs ) # List of all targets set( LIBCLC_TARGETS_ALL @@ -145,8 +146,8 @@ endif() # pkg-config file configure_file( libclc.pc.in libclc.pc @ONLY ) -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION share/pkgconfig ) -install( DIRECTORY generic/include/clc DESTINATION include ) +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig ) +install( DIRECTORY generic/include/clc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) if( ENABLE_RUNTIME_SUBNORMAL ) add_library( subnormal_use_default STATIC @@ -154,7 +155,7 @@ if( ENABLE_RUNTIME_SUBNORMAL ) add_library( subnormal_disable STATIC generic/lib/subnormal_disable.ll ) install( TARGETS subnormal_use_default subnormal_disable ARCHIVE - DESTINATION lib/clc ) + DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) endif() find_program( PYTHON python ) @@ -274,7 +275,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) prepare_builtins ) add_custom_target( "prepare-${obj_suffix}" ALL DEPENDS "${obj_suffix}" ) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION lib/clc ) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) # nvptx-- targets don't include workitem builtins if( NOT ${t} MATCHES ".*ptx.*--$" ) add_test( NAME external-calls-${obj_suffix} @@ -292,7 +293,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) create_symlink ${obj_suffix} ${alias_suffix} DEPENDS "prepare-${obj_suffix}" ) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION lib/clc ) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) endforeach( a ) endforeach( d ) endforeach( t ) diff --git a/libclc.pc.in b/libclc.pc.in index 82e4e94..b6e06c9 100644 --- a/libclc.pc.in +++ b/libclc.pc.in @@ -1,5 +1,5 @@ -includedir=@CMAKE_INSTALL_PREFIX@/include -libexecdir=@CMAKE_INSTALL_PREFIX@/lib/clc +includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ +libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc Name: libclc Description: Library requirements of the OpenCL C programming language -- 2.19.2 From libclc-dev at lists.llvm.org Mon Dec 17 10:18:44 2018 From: libclc-dev at lists.llvm.org (Jan Vesely via Libclc-dev) Date: Mon, 17 Dec 2018 19:18:44 +0100 Subject: [Libclc-dev] [PATCH 1/1] cmake: Install libraries to DATADIR from GNUInstallDirs In-Reply-To: <20181206224008.15210-1-jan.vesely@rutgers.edu> References: <20181206224008.15210-1-jan.vesely@rutgers.edu> Message-ID: <1545070724.10148.3.camel@rutgers.edu> On Thu, 2018-12-06 at 17:40 -0500, Jan Vesely wrote: > This moves default installation location of device libraries to /usr/share. > Note that libclc.pc was already installed to /usr/share. > Signed-off-by: Jan Vesely > --- > I was not sure if this should use LIBDIR or DATADIR, but in the end the > libraries are independent of CPU architecture and it can be easily > overridden. > I don't have a strong preference, let me know if LIBDIR looks better to > you. ping. Dave, Tom, do you have a preference for the default location? thanks, Jan > > Jan > > CMakeLists.txt | 11 ++++++----- > libclc.pc.in | 4 ++-- > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 41bd5f6..440eab0 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -1,6 +1,7 @@ > cmake_minimum_required( VERSION 3.9.2 ) > > project( libclc VERSION 0.2.0 LANGUAGES CXX ) > +include( GNUInstallDirs ) > > # List of all targets > set( LIBCLC_TARGETS_ALL > @@ -145,8 +146,8 @@ endif() > > # pkg-config file > configure_file( libclc.pc.in libclc.pc @ONLY ) > -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION share/pkgconfig ) > -install( DIRECTORY generic/include/clc DESTINATION include ) > +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig ) > +install( DIRECTORY generic/include/clc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) > > if( ENABLE_RUNTIME_SUBNORMAL ) > add_library( subnormal_use_default STATIC > @@ -154,7 +155,7 @@ if( ENABLE_RUNTIME_SUBNORMAL ) > add_library( subnormal_disable STATIC > generic/lib/subnormal_disable.ll ) > install( TARGETS subnormal_use_default subnormal_disable ARCHIVE > - DESTINATION lib/clc ) > + DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) > endif() > > find_program( PYTHON python ) > @@ -274,7 +275,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > prepare_builtins ) > add_custom_target( "prepare-${obj_suffix}" ALL > DEPENDS "${obj_suffix}" ) > - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION lib/clc ) > + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) > # nvptx-- targets don't include workitem builtins > if( NOT ${t} MATCHES ".*ptx.*--$" ) > add_test( NAME external-calls-${obj_suffix} > @@ -292,7 +293,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > create_symlink ${obj_suffix} > ${alias_suffix} > DEPENDS "prepare-${obj_suffix}" ) > - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION lib/clc ) > + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) > endforeach( a ) > endforeach( d ) > endforeach( t ) > diff --git a/libclc.pc.in b/libclc.pc.in > index 82e4e94..b6e06c9 100644 > --- a/libclc.pc.in > +++ b/libclc.pc.in > @@ -1,5 +1,5 @@ > -includedir=@CMAKE_INSTALL_PREFIX@/include > -libexecdir=@CMAKE_INSTALL_PREFIX@/lib/clc > +includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ > +libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc > > Name: libclc > Description: Library requirements of the OpenCL C programming language -- Jan Vesely -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: This is a digitally signed message part URL: From libclc-dev at lists.llvm.org Mon Dec 17 10:22:45 2018 From: libclc-dev at lists.llvm.org (Tom Stellard via Libclc-dev) Date: Mon, 17 Dec 2018 10:22:45 -0800 Subject: [Libclc-dev] [PATCH 1/1] cmake: Install libraries to DATADIR from GNUInstallDirs In-Reply-To: <20181206224008.15210-1-jan.vesely@rutgers.edu> References: <20181206224008.15210-1-jan.vesely@rutgers.edu> Message-ID: <0e7ae315-b722-1b4b-1d46-e09e5cee5974@redhat.com> On 12/06/2018 02:40 PM, Jan Vesely via Libclc-dev wrote: > This moves default installation location of device libraries to /usr/share. > Note that libclc.pc was already installed to /usr/share. > Signed-off-by: Jan Vesely > --- > I was not sure if this should use LIBDIR or DATADIR, but in the end the > libraries are independent of CPU architecture and it can be easily > overridden. > I don't have a strong preference, let me know if LIBDIR looks better to > you. > There was a bug filed by one of the OS packages to put the libs in DATADIR, which is why it was done that way. The rationale was that the contents are the same on all arches, so it is really an architecture independent package, so it doesn't belong in LIBDIR. -Tom > Jan > > CMakeLists.txt | 11 ++++++----- > libclc.pc.in | 4 ++-- > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 41bd5f6..440eab0 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -1,6 +1,7 @@ > cmake_minimum_required( VERSION 3.9.2 ) > > project( libclc VERSION 0.2.0 LANGUAGES CXX ) > +include( GNUInstallDirs ) > > # List of all targets > set( LIBCLC_TARGETS_ALL > @@ -145,8 +146,8 @@ endif() > > # pkg-config file > configure_file( libclc.pc.in libclc.pc @ONLY ) > -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION share/pkgconfig ) > -install( DIRECTORY generic/include/clc DESTINATION include ) > +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig ) > +install( DIRECTORY generic/include/clc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) > > if( ENABLE_RUNTIME_SUBNORMAL ) > add_library( subnormal_use_default STATIC > @@ -154,7 +155,7 @@ if( ENABLE_RUNTIME_SUBNORMAL ) > add_library( subnormal_disable STATIC > generic/lib/subnormal_disable.ll ) > install( TARGETS subnormal_use_default subnormal_disable ARCHIVE > - DESTINATION lib/clc ) > + DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) > endif() > > find_program( PYTHON python ) > @@ -274,7 +275,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > prepare_builtins ) > add_custom_target( "prepare-${obj_suffix}" ALL > DEPENDS "${obj_suffix}" ) > - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION lib/clc ) > + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) > # nvptx-- targets don't include workitem builtins > if( NOT ${t} MATCHES ".*ptx.*--$" ) > add_test( NAME external-calls-${obj_suffix} > @@ -292,7 +293,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > create_symlink ${obj_suffix} > ${alias_suffix} > DEPENDS "prepare-${obj_suffix}" ) > - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION lib/clc ) > + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) > endforeach( a ) > endforeach( d ) > endforeach( t ) > diff --git a/libclc.pc.in b/libclc.pc.in > index 82e4e94..b6e06c9 100644 > --- a/libclc.pc.in > +++ b/libclc.pc.in > @@ -1,5 +1,5 @@ > -includedir=@CMAKE_INSTALL_PREFIX@/include > -libexecdir=@CMAKE_INSTALL_PREFIX@/lib/clc > +includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ > +libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc > > Name: libclc > Description: Library requirements of the OpenCL C programming language > From libclc-dev at lists.llvm.org Thu Dec 20 17:38:15 2018 From: libclc-dev at lists.llvm.org (Chandler Carruth via Libclc-dev) Date: Thu, 20 Dec 2018 17:38:15 -0800 Subject: [Libclc-dev] Holiday update on LLVM's Relicensing effort Message-ID: I wanted to send out a general but brief update on relicensing as holiday season (at least in my part of the world) approaches. (If you don't know what the relicensing effort is, or want background, see our website: http://llvm.org/foundation/relicensing/) First off, a huge thank you to everyone who has gone through the relicensing form and individual agreement. We are making fantastic progress, with well over 500 individual agreements completed. This covers over 73% of committers and over 80% of commits in the last 6 months, and over 63% of committers and over 74% of commits in the last 2 years. But we need to get these higher, so if you haven't already.... *Please send me the best holiday gift you can by filling out the agreement form below:* https://goo.gl/forms/X4HiyYRcRHOnTSvC3 =D We plan to install the new developer policy on *January 14th*, at which point commit access will be disabled for anyone not covered by an agreement. We have emailed every committer in the last 6 months who hasn't gone through the form twice about this already, and will be sending weekly emails from now until the switch happens. We have emailed every committer in the last 2 years who hasn't gone through the form once, and will send at least two more direct emails before the 14th. Also, please, if at all possible, *sign the agreement as part of this*. While you may in fact be 100% certain that all of your contributions are owned by your employer, in many cases the LLVM Foundation will end up having to verify this which is a very expensive operation and may significantly delay us confirming that you are covered so we can restore commit access. And last but not least, if relevant, please forward the information on our relicensing page to your current employer as we will need to get them to sign the corporate agreement by January as well: http://llvm.org/foundation/relicensing/#corporate_agreement (Note that companies that have already signed or we are in active discussions with are listed.) Thank you again to everyone who has helped with this, is working with their employers to get these things taken care of, and who has gone through the individual agreement process. -Chandler -------------- next part -------------- An HTML attachment was scrubbed... URL: From libclc-dev at lists.llvm.org Sat Dec 22 00:49:15 2018 From: libclc-dev at lists.llvm.org (Jan Vesely via Libclc-dev) Date: Sat, 22 Dec 2018 09:49:15 +0100 Subject: [Libclc-dev] [PATCH 1/1] cmake: Install libraries to DATADIR from GNUInstallDirs In-Reply-To: <0e7ae315-b722-1b4b-1d46-e09e5cee5974@redhat.com> References: <20181206224008.15210-1-jan.vesely@rutgers.edu> <0e7ae315-b722-1b4b-1d46-e09e5cee5974@redhat.com> Message-ID: <1545468555.7140.5.camel@rutgers.edu> On Mon, 2018-12-17 at 10:22 -0800, Tom Stellard via Libclc-dev wrote: > On 12/06/2018 02:40 PM, Jan Vesely via Libclc-dev wrote: > > This moves default installation location of device libraries to /usr/share. > > Note that libclc.pc was already installed to /usr/share. > > Signed-off-by: Jan Vesely > > --- > > I was not sure if this should use LIBDIR or DATADIR, but in the end the > > libraries are independent of CPU architecture and it can be easily > > overridden. > > I don't have a strong preference, let me know if LIBDIR looks better to > > you. > > > > There was a bug filed by one of the OS packages to put the libs in DATADIR, > which is why it was done that way. The rationale was that the contents > are the same on all arches, so it is really an architecture independent > package, so it doesn't belong in LIBDIR. thanks. that's what this patch does for cmake, does it look ok to you? the defaults in configure.py are libclc.pc to $PREFIX/share/pkgconfig and *.bc to $PREFIX/lib/clc which was a bit confusing. Jan > > -Tom > > Jan > > > > CMakeLists.txt | 11 ++++++----- > > libclc.pc.in | 4 ++-- > > 2 files changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/CMakeLists.txt b/CMakeLists.txt > > index 41bd5f6..440eab0 100644 > > --- a/CMakeLists.txt > > +++ b/CMakeLists.txt > > @@ -1,6 +1,7 @@ > > cmake_minimum_required( VERSION 3.9.2 ) > > > > project( libclc VERSION 0.2.0 LANGUAGES CXX ) > > +include( GNUInstallDirs ) > > > > # List of all targets > > set( LIBCLC_TARGETS_ALL > > @@ -145,8 +146,8 @@ endif() > > > > # pkg-config file > > configure_file( libclc.pc.in libclc.pc @ONLY ) > > -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION share/pkgconfig ) > > -install( DIRECTORY generic/include/clc DESTINATION include ) > > +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig ) > > +install( DIRECTORY generic/include/clc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) > > > > if( ENABLE_RUNTIME_SUBNORMAL ) > > add_library( subnormal_use_default STATIC > > @@ -154,7 +155,7 @@ if( ENABLE_RUNTIME_SUBNORMAL ) > > add_library( subnormal_disable STATIC > > generic/lib/subnormal_disable.ll ) > > install( TARGETS subnormal_use_default subnormal_disable ARCHIVE > > - DESTINATION lib/clc ) > > + DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) > > endif() > > > > find_program( PYTHON python ) > > @@ -274,7 +275,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > > prepare_builtins ) > > add_custom_target( "prepare-${obj_suffix}" ALL > > DEPENDS "${obj_suffix}" ) > > - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION lib/clc ) > > + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) > > # nvptx-- targets don't include workitem builtins > > if( NOT ${t} MATCHES ".*ptx.*--$" ) > > add_test( NAME external-calls-${obj_suffix} > > @@ -292,7 +293,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > > create_symlink ${obj_suffix} > > ${alias_suffix} > > DEPENDS "prepare-${obj_suffix}" ) > > - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION lib/clc ) > > + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION ${CMAKE_INSTALL_DATADIR}/clc ) > > endforeach( a ) > > endforeach( d ) > > endforeach( t ) > > diff --git a/libclc.pc.in b/libclc.pc.in > > index 82e4e94..b6e06c9 100644 > > --- a/libclc.pc.in > > +++ b/libclc.pc.in > > @@ -1,5 +1,5 @@ > > -includedir=@CMAKE_INSTALL_PREFIX@/include > > -libexecdir=@CMAKE_INSTALL_PREFIX@/lib/clc > > +includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ > > +libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc > > > > Name: libclc > > Description: Library requirements of the OpenCL C programming language > > > > _______________________________________________ > Libclc-dev mailing list > Libclc-dev at lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/libclc-dev -- Jan Vesely -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: This is a digitally signed message part URL: