Add EGREP
Allow overriding the makefile build target to use Allow skipping the configure step in generic_build
This commit is contained in:
parent
4bbc8a32d1
commit
c58a2bad9c
@ -56,6 +56,7 @@ MKDIR=/usr/bin/mkdir
|
|||||||
CP=/usr/bin/cp
|
CP=/usr/bin/cp
|
||||||
TEE=/bin/tee
|
TEE=/bin/tee
|
||||||
GREP=/bin/grep
|
GREP=/bin/grep
|
||||||
|
EGREP=/bin/egrep
|
||||||
UNIQ=/bin/uniq
|
UNIQ=/bin/uniq
|
||||||
BASENAME=/bin/basename
|
BASENAME=/bin/basename
|
||||||
DIRNAME=/bin/dirname
|
DIRNAME=/bin/dirname
|
||||||
@ -139,6 +140,13 @@ custom_install=0
|
|||||||
# but if set to 0 it will try to use run_configure function instead
|
# but if set to 0 it will try to use run_configure function instead
|
||||||
generic_configure=1
|
generic_configure=1
|
||||||
|
|
||||||
|
# Allow overriding the make target for building
|
||||||
|
# We default to an empty string so the default target will be built
|
||||||
|
make_build_target=""
|
||||||
|
|
||||||
|
# Allow skipping the configure run
|
||||||
|
no_configure=0
|
||||||
|
|
||||||
# Distfiles should be named like this
|
# Distfiles should be named like this
|
||||||
# <name>-<version>-<pkgver>.sb-<os>-<cpu>-<pkgdirdesig>
|
# <name>-<version>-<pkgver>.sb-<os>-<cpu>-<pkgdirdesig>
|
||||||
# ie: libmad-0.14.2b-1.sb-sol5.8-sparcv9-local
|
# ie: libmad-0.14.2b-1.sb-sol5.8-sparcv9-local
|
||||||
@ -603,16 +611,18 @@ generic_build()
|
|||||||
{
|
{
|
||||||
setdir ${srcdir}/${topsrcdir}/$1
|
setdir ${srcdir}/${topsrcdir}/$1
|
||||||
|
|
||||||
if [ $generic_configure -eq 1 ]; then
|
if [ $no_configure -eq 0 ]; then
|
||||||
./configure $(_upls $configure_args)
|
if [ $generic_configure -eq 1 ]; then
|
||||||
else
|
./configure $(_upls $configure_args)
|
||||||
# Platform specific configure run
|
else
|
||||||
run_configure
|
# Platform specific configure run
|
||||||
|
run_configure
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
error $E_BAD_CONFIG generic_build
|
error $E_BAD_CONFIG generic_build
|
||||||
fi
|
fi
|
||||||
$MAKE_PROG
|
$MAKE_PROG $(_upls $make_build_target)
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
error $E_BAD_MAKE generic_build
|
error $E_BAD_MAKE generic_build
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user