xbps-src: do_configure func can now be used in custom-install tmpls.
This commit is contained in:
parent
316936b82a
commit
a405c67ef7
1 changed files with 4 additions and 4 deletions
|
@ -42,7 +42,7 @@ do_gnu_configure()
|
||||||
${configure_script} ${CONFIGURE_SHARED_ARGS} ${configure_args}
|
${configure_script} ${CONFIGURE_SHARED_ARGS} ${configure_args}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_configure()
|
do_nongnu_configure()
|
||||||
{
|
{
|
||||||
#
|
#
|
||||||
# Packages using custom configure scripts.
|
# Packages using custom configure scripts.
|
||||||
|
@ -72,12 +72,11 @@ configure_src_phase()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
# Skip this phase for: meta-template, only-install, custom-install,
|
# Skip this phase for: meta-template, only-install,
|
||||||
# gnu_makefile and python-module style builds.
|
# gnu_makefile and python-module style builds.
|
||||||
#
|
#
|
||||||
[ "$build_style" = "meta-template" -o \
|
[ "$build_style" = "meta-template" -o \
|
||||||
"$build_style" = "only-install" -o \
|
"$build_style" = "only-install" -o \
|
||||||
"$build_style" = "custom-install" -o \
|
|
||||||
"$build_style" = "gnu_makefile" -o \
|
"$build_style" = "gnu_makefile" -o \
|
||||||
"$build_style" = "python-module" ] && return 0
|
"$build_style" = "python-module" ] && return 0
|
||||||
|
|
||||||
|
@ -107,8 +106,9 @@ configure_src_phase()
|
||||||
|
|
||||||
case "$build_style" in
|
case "$build_style" in
|
||||||
gnu_configure|gnu-configure) run_func do_gnu_configure ;;
|
gnu_configure|gnu-configure) run_func do_gnu_configure ;;
|
||||||
configure) run_func do_configure ;;
|
configure) run_func do_nongnu_configure ;;
|
||||||
perl-module|perl_module) run_func do_perl_configure ;;
|
perl-module|perl_module) run_func do_perl_configure ;;
|
||||||
|
custom-install) run_func do_configure;;
|
||||||
*)
|
*)
|
||||||
#
|
#
|
||||||
# Unknown build_style type won't work :-)
|
# Unknown build_style type won't work :-)
|
||||||
|
|
Loading…
Reference in a new issue