projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-Cleaned-up name of ipkg functions in package definition files.
[hvlinux.git]
/
stage1
/
cis-ac
diff --git
a/stage1/cis-ac
b/stage1/cis-ac
index
cf16137
..
de929c3
100755
(executable)
--- a/
stage1/cis-ac
+++ b/
stage1/cis-ac
@@
-13,24
+13,23
@@
source ${SCRDIR}/../sysinfos
source ${SCRDIR}/../functions
source ${SCRDIR}/../packages-list
source ${SCRDIR}/../functions
source ${SCRDIR}/../packages-list
-DEFAULT_CONFIGURE_PREFIX=/tools
+# Setting default configure options for all scripts
+CONFIGURE_OPTS="\
+ --prefix=/tools \
+ --build=${CLFS_HOST} \
+ --host=${CLFS_TARGET} \
+ ${CONFIGURE_OPTS}"
# Default configure function
# Default configure function
-hvconfig
ure
()
+hvconfig()
{
cd ${LFS_TMP}/${PACKAGE}-build
{
cd ${LFS_TMP}/${PACKAGE}-build
- FINAL_CFG_OPTS="\
- --prefix=${DEFAULT_CONFIGURE_PREFIX} \
- --build=${CLFS_HOST} \
- --host=${CLFS_TARGET} \
- ${CONFIGURE_OPTS}"
-
echo "Running configure with options:"
echo "Running configure with options:"
- echo " <${
FINAL_CFG
_OPTS}>"
+ echo " <${
CONFIGURE
_OPTS}>"
CC="${CC} ${CLFS_BUILDFLAGS}" CXX="${CXX} ${CLFS_BUILDFLAGS}" \
CC="${CC} ${CLFS_BUILDFLAGS}" CXX="${CXX} ${CLFS_BUILDFLAGS}" \
- ../${PACKAGE}/configure ${
FINAL_CFG
_OPTS}
+ ../${PACKAGE}/configure ${
CONFIGURE
_OPTS}
}
# Default build function
}
# Default build function
@@
-56,31
+55,37
@@
fi
hvpatch
# Execute config-cache function if applicable
hvpatch
# Execute config-cache function if applicable
-if function_exists config_cache ; then
+if function_exists
hv
config_cache ; then
echo "Running configure cache script"
echo "Running configure cache script"
- config_cache
+
hv
config_cache
CONFIGURE_OPTS="${CONFIGURE_OPTS} --cache-file=${LFS_TMP}/${PACKAGE}-build/config.cache"
fi
# Execute pre-configure function if applicable
CONFIGURE_OPTS="${CONFIGURE_OPTS} --cache-file=${LFS_TMP}/${PACKAGE}-build/config.cache"
fi
# Execute pre-configure function if applicable
-if function_exists
configure
_pre ; then
+if function_exists
hvconfig
_pre ; then
echo "Running configure pre-script"
echo "Running configure pre-script"
-
configure
_pre
+
hvconfig
_pre
fi
if [ -n "${HV_NO_CONFIGURE_SCRIPT}" ]; then
echo "Not calling configure because ${PACKAGE} has no configure script"
else
fi
if [ -n "${HV_NO_CONFIGURE_SCRIPT}" ]; then
echo "Not calling configure because ${PACKAGE} has no configure script"
else
- hvconfig
ure
+ hvconfig
fi
# Execute post-configure function if applicable
fi
# Execute post-configure function if applicable
-if function_exists
configure
_post ; then
+if function_exists
hvconfig
_post ; then
echo "Running configure post-script"
echo "Running configure post-script"
-
configure
_post
+
hvconfig
_post
fi
hvbuild
fi
hvbuild
+# Execute post-build function if applicable
+if function_exists hvbuild_post ; then
+ echo "Running build post-script"
+ hvbuild_post
+fi
+
exit $?
exit $?