Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=bfb0288907f493d38c857889249059f9868eec3b
commit bfb0288907f493d38c857889249059f9868eec3b
Author: crazy <cr...@frugalware.org>
Date: Sun Oct 16 13:11:57 2016 +0200
prepare for cross32
* added CMAKE_{LIB,BIN,SBIN} set to =lib =bin =sbin by default
* need these so we can re-use cmake.sh without to much hacks ( more to be done )
* try to set host und target = Fbuildchost too in ./configure
diff --git a/source/include/cmake.sh b/source/include/cmake.sh
index 0c36d1b..6fa45ac 100644
--- a/source/include/cmake.sh
+++ b/source/include/cmake.sh
@@ -55,6 +55,11 @@ else
makedepends+=('ninja')
fi
+### hmmm
+CMAKE_LIB="lib"
+CMAKE_BIN="bin"
+CMAKE_SBIN="sbin"
+
###
# == APPENDED VARIABLES
# * makedepends(): add cmake and pkgconfig
@@ -101,7 +106,9 @@ CMake_conf()
cmake \
${cmake_generator} \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_INSTALL_LIBDIR=${CMAKE_LIB} \
+ -DCMAKE_INSTALL_BINDIR=${CMAKE_BIN} \
+ -DCMAKE_INSTALL_SBINDIR=${CMAKE_SBIN} \
-DSYSCONF_INSTALL_DIR=/etc \
-DCMAKE_BUILD_TYPE="$_F_cmake_type" \
-DCMAKE_VERBOSE_MAKEFILE="$_F_cmake_verbose" \
diff --git a/source/include/util.sh b/source/include/util.sh
index 77b8798..4e997c9 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -858,6 +858,8 @@ Fbuildsystem_configure() {
Fconfoptstryset "infodir" "$Finfodir"
Fconfoptstryset "mandir" "$Fmandir"
Fconfoptstryset "build" "$Fbuildchost"
+ Fconfoptstryset "host" "$Fbuildchost"
+ Fconfoptstryset "target" "$Fbuildchost"
## try to disable silent rules
## we already set V=1 by default but this isn't going to work
## when apps using enabled silence rules on ./configure..
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
