Browse files

Add possibility to specify make program, configure script and configu…

…re program to each package.
  • Loading branch information...
1 parent aaecc78 commit 4c5d5c4b5f4ab3784e1da873a78169a72b3ae94e @Alexpux Alexpux committed Oct 5, 2013
Showing with 10 additions and 4 deletions.
  1. +6 −3 build
  2. +4 −1 library/functions.sh
View
9 build
@@ -553,6 +553,9 @@ for rule in ${SUBTARGETS[@]}; do
}
[[ -z $PKG_LNDIR ]] && { PKG_LNDIR=no; }
+ [[ -z $PKG_CONFIGURE_SCRIPT ]] && { PKG_CONFIGURE_SCRIPT=configure; }
+ [[ -z $PKG_MAKE_PROG ]] && { PKG_MAKE_PROG=/bin/make; }
+ [[ -z $PKG_CONFIGURE_PROG ]] && { PKG_CONFIGURE_PROG=/bin/sh; }
[[ ${#PKG_CONFIGURE_FLAGS[@]} >0 ]] && {
configure_flags="${PKG_CONFIGURE_FLAGS[@]}"
@@ -577,7 +580,7 @@ for rule in ${SUBTARGETS[@]}; do
}
[[ ${#PKG_MAKE_FLAGS[@]} >0 ]] && {
- make_flags="/bin/make ${PKG_MAKE_FLAGS[@]}"
+ make_flags="$PKG_MAKE_PROG ${PKG_MAKE_FLAGS[@]}"
func_make \
$PKG_NAME \
$PKG_DIR_NAME \
@@ -590,7 +593,7 @@ for rule in ${SUBTARGETS[@]}; do
}
[[ ${#PKG_INSTALL_FLAGS[@]} >0 ]] && {
- install_flags="/bin/make ${PKG_INSTALL_FLAGS[@]}"
+ install_flags="$PKG_MAKE_PROG ${PKG_INSTALL_FLAGS[@]}"
func_make \
$PKG_NAME \
$PKG_DIR_NAME \
@@ -614,7 +617,7 @@ for rule in ${SUBTARGETS[@]}; do
[[ $PKG_RUN_TESTSUITE == yes ]] && {
[[ ${#PKG_TESTSUITE_FLAGS[@]} >0 ]] && {
- testsuite_flags="/bin/make ${PKG_TESTSUITE_FLAGS[@]}"
+ testsuite_flags="$PKG_MAKE_PROG ${PKG_TESTSUITE_FLAGS[@]}"
func_make \
$PKG_NAME \
$PKG_DIR_NAME \
View
5 library/functions.sh
@@ -55,6 +55,9 @@ function func_clear_env {
unset PKG_INSTALL_FLAGS
unset PKG_EXECUTE_AFTER_INSTALL
unset PKG_TESTSUITE_FLAGS
+ unset PKG_CONFIGURE_SCRIPT
+ unset PKG_MAKE_PROG
+ unset PKG_CONFIGURE_PROG
}
function switch_to_reverse_arch {
@@ -673,7 +676,7 @@ function func_configure {
} || {
local _rel_dir=$( func_absolute_to_relative $5/$_subbuilddir $SRCS_DIR/$_subsrcdir )
}
- eval $_rel_dir/configure "${3}" > $4 2>&1
+ eval "$PKG_CONFIGURE_PROG $_rel_dir/$PKG_CONFIGURE_SCRIPT \"${3}\"" > $4 2>&1
_result=$?
popd > /dev/null
[[ $_result == 0 ]] && {

0 comments on commit 4c5d5c4

Please sign in to comment.