Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b49fc9c167f7537fe14c1930ae2055309423db5
commit 5b49fc9c167f7537fe14c1930ae2055309423db5 Author: crazy <[email protected]> Date: Sun Jul 23 06:52:02 2017 +0200 cmake , cross32: use generic names for some vars * change CMAKE_* to CROSS_* so we can reuse the vars for cross32 * without the need to add $schema_FOO all the time to cross32 diff --git a/source/include/cmake.sh b/source/include/cmake.sh index 8a9422b..adb4a34 100644 --- a/source/include/cmake.sh +++ b/source/include/cmake.sh @@ -56,9 +56,9 @@ else fi ### hmmm -CMAKE_LIB="lib" -CMAKE_BIN="bin" -CMAKE_SBIN="sbin" +CROSS_LIB="lib" +CROSS_BIN="bin" +CROSS_SBIN="sbin" ### # == APPENDED VARIABLES @@ -106,9 +106,9 @@ CMake_conf() cmake \ ${cmake_generator} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=${CMAKE_LIB} \ - -DCMAKE_INSTALL_BINDIR=${CMAKE_BIN} \ - -DCMAKE_INSTALL_SBINDIR=${CMAKE_SBIN} \ + -DCMAKE_INSTALL_LIBDIR=${CROSS_LIB} \ + -DCMAKE_INSTALL_BINDIR=${CROSS_BIN} \ + -DCMAKE_INSTALL_SBINDIR=${CROSS_SBIN} \ -DSYSCONF_INSTALL_DIR=/etc \ -DCMAKE_BUILD_TYPE="$_F_cmake_type" \ -DCMAKE_VERBOSE_MAKEFILE="$_F_cmake_verbose" \ diff --git a/source/include/cross32.sh b/source/include/cross32.sh index 749dbba..338287c 100644 --- a/source/include/cross32.sh +++ b/source/include/cross32.sh @@ -79,8 +79,8 @@ __cross32_unset_vars() { ## common unset CFLAGS CXXFLAGS CHOST PKG_CONFIG_PATH PATH - ## cmake.sh - unset CMAKE_LIB CMAKE_BIN CMAKE_SBIN + ## cmake.sh , meson.sh + unset CROSS_LIB CROSS_BIN CROSS_SBIN ## util.sh unset Fbuildchost @@ -106,10 +106,9 @@ __cross32_set_vars() { export PATH=/usr/${CHOST}/bin:usr/${CHOST}/sbin:$PATH_ORIG - ## cmake.sh - export CMAKE_LIB="lib32" - export CMAKE_BIN="lib32/${CHOST}/bin" - export CMAKE_SBIN="lib32/${CHOST}/sbin" + export CROSS_LIB="lib32" + export CROSS_BIN="lib32/${CHOST}/bin" + export CROSS_SBIN="lib32/${CHOST}/sbin" ## util.sh export Fbuildchost="${CHOST}" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
