Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=b8109c3552c0bd4ee5abd494c0384f6fdbdeb5a0
commit b8109c3552c0bd4ee5abd494c0384f6fdbdeb5a0 Author: crazy <[email protected]> Date: Mon Nov 7 17:35:00 2016 +0100 errm *opts mess.. * until we merge/fix how we use all the F* and _F_*.. * move _F_conf_opts and Fconfopts hacks from __cross32_common_build() * to own helper functions and use in Fcross32_repare , Fcross32_reset_and_fix * that way we can Fb's with custom build() does the same like auto Fbuild_cross32 diff --git a/source/include/cross32.sh b/source/include/cross32.sh index 63c3341..749dbba 100644 --- a/source/include/cross32.sh +++ b/source/include/cross32.sh @@ -184,21 +184,44 @@ __cross32_bug_me_reset() { msg2 "PATH to $PATH" } +__cross32_conf_make_opts_pre_save() { + + ## this is .. + F_CONFOPTS="$Fconfopts" + if [ -n "$_F32_make_opts" ]; then + FMAKEOPTS="$_F_make_opts" + _F_make_opts="" + else + _F32_make_opts="$_F_make_opts" + fi +} + +__cross32_conf_make_opts_reset() { + + + Fconfopts="" + if [ -n "$_F32_make_opts" ]; then + _F_make_opts="$FMAKEOPTS" + fi + Fconfopts+=" $F_CONFOPTS" +} + Fcross32_prepare() { + __cross32_conf_make_opts_pre_save __cross32_save_orig_vars __cross32_unset_vars __cross32_set_vars - __cross32_bug_me_set + __cross32_bug_me_set } - Fcross32_reset_and_fix() { __cross32_unset_vars __cross32_export_orig_vars __cross32_bug_me_reset __cross32_delete_files + __cross32_conf_make_opts_reset } @@ -240,26 +263,13 @@ Fcross32_copy_back_source() { __cross32_common_build() { - - ## this is .. - F_CONFOPTS="$Fconfopts" - if [ -n "$_F32_make_opts" ]; then - FMAKEOPTS="$_F_make_opts" - _F_make_opts="" - else - _F32_make_opts="$_F_make_opts" - fi Fcross32_prepare Fcross32_copy_source Fbuild $F32confopts $_F32_make_opts ## HACK2 Fcross32_copy_back_source Fcross32_reset_and_fix - Fconfopts="" - if [ -n "$_F32_make_opts" ]; then - _F_make_opts="$FMAKEOPTS" - fi - Fconfopts+=" $F_CONFOPTS" + } Fcross32_common_build() { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
