github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minimize CREW_MESON_OPTIONS (& fix datadir), minimize CREW_CMAKE_OPTIONS* (#4522)

Browse Source 
* datadir should be /share

* Adjust CREW_MESON_OPTIONS

* Minimal meson options to minimize error messages.

As per discussion in https://github.com/skycocker/chromebrew/pull/4525#issuecomment-716221538

* Bump crew version

* Clear out DATADIR & SYSCONFDIR options from cmake

* cleanup CREW_CMAKE_OPTIONS

Remove:
 -DCMAKE_INSTALL_LIBDIR=#{ARCH_LIB}
 -DCMAKE_INSTALL_MANDIR=#{CREW_MAN_PREFIX}
Add:
logic for -DLIB_SUFFIX predicated upon architecture in separate option
This commit is contained in:
satmandu
2020-10-26 18:21:30 -04:00
committed by GitHub
parent 66d3682c52
commit 1497c00f8d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/const.rb
View File

@@ -1,6 +1,6 @@
# Defines common constants used in different parts of crew
CREW_VERSION = '1.4.7'
CREW_VERSION = '1.4.8'
ARCH_ACTUAL = `uname -m`.strip
# This helps with virtualized builds on aarch64 machines
@@ -60,6 +60,14 @@ when 'i686'
when 'x86_64'
CREW_BUILD = 'x86_64-cros-linux-gnu'
end
CREW_OPTIONS = "--prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} --mandir=#{CREW_MAN_PREFIX} --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}"
CREW_MESON_OPTIONS = "-Dprefix=#{CREW_PREFIX} -Dlibdir=#{CREW_LIB_PREFIX} -DLIB_INSTALL_DIR=#{CREW_LIB_PREFIX} -Dmandir=#{CREW_MAN_PREFIX} -DSYSCONFDIR=#{CREW_PREFIX}/etc -Ddatadir=#{CREW_LIB_PREFIX} -Dbuildtype=release"
CREW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} -DCMAKE_INSTALL_LIBDIR=#{ARCH_LIB} -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX} -DCMAKE_INSTALL_MANDIR=#{CREW_MAN_PREFIX} -DCMAKE_INSTALL_SYSCONFDIR=#{CREW_PREFIX}/etc -DCMAKE_INSTALL_DATADIR=#{CREW_PREFIX}/share -DCMAKE_BUILD_TYPE=Release --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}"
CREW_MESON_OPTIONS = "-Dprefix=#{CREW_PREFIX} -Dlibdir=#{CREW_LIB_PREFIX} -Dmandir=#{CREW_MAN_PREFIX} -Dbuildtype=release"
# Cmake sometimes wants to use LIB_SUFFIX to install libs in LIB64, so specify such for x86_64
# This is often considered deprecated. See discussio at https://gitlab.kitware.com/cmake/cmake/-/issues/18640
# and also https://bugzilla.redhat.com/show_bug.cgi?id=1425064
# Let's have two CREW_CMAKE_OPTIONS since this avoids the logic in the recipe file.
CREW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX} -DCMAKE_BUILD_TYPE=Release --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}"
CMAKELIBSUFFIX = if ARCH == 'x86_64' then '64' else '' end
CREW_CMAKE_LIBSUFFIX_OPTIONS = "-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX} -DLIB_SUFFIX=#{CMAKELIBSUFFIX} -DCMAKE_BUILD_TYPE=Release --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}"