jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Some fixes missed in the import.

Browse source 
Fix _MKDIR_CMD... wrong var.
Check var's value before exporting it.

--HG--
extra : convert_revision : cec5c47afaa94daa7f2f3d2b9ebe4d37b1bd46a8
This commit is contained in:
Juan RP 2008-09-26 22:30:14 +02:00
parent df02cbad60
commit d2d10e9ecd
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgfs.sh
View file

@ -187,7 +187,7 @@ fetch_source_distfiles()
check_build_dirs() check_build_dirs()
{ {
if [ ! -d "$PKGFS_DESTDIR" ]; then if [ ! -d "$PKGFS_DESTDIR" ]; then
${MKDIR_CMD} "$PKGFS_DESTDIR" ${_MKDIR_CMD} "$PKGFS_DESTDIR"
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo -n "*** ERROR: couldn't create PKGFS_DESTDIR " echo -n "*** ERROR: couldn't create PKGFS_DESTDIR "
echo "directory, aborting ***" echo "directory, aborting ***"
@ -196,7 +196,7 @@ check_build_dirs()
fi fi
if [ ! -d "$PKGFS_BUILDDIR" ]; then if [ ! -d "$PKGFS_BUILDDIR" ]; then
${MKDIR_CMD} "$PKGFS_BUILDDIR" ${_MKDIR_CMD} "$PKGFS_BUILDDIR"
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo -n "*** ERROR: couldn't create PKFS_BUILDDIR " echo -n "*** ERROR: couldn't create PKFS_BUILDDIR "
echo "directory, aborting ***" echo "directory, aborting ***"
@ -209,7 +209,7 @@ check_build_dirs()
exit 1 exit 1
fi fi
${MKDIR_CMD} "$PKGFS_SRC_DISTDIR" ${_MKDIR_CMD} "$PKGFS_SRC_DISTDIR"
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo "*** ERROR couldn't create PKGFS_SRC_DISTDIR, aborting ***" echo "*** ERROR couldn't create PKGFS_SRC_DISTDIR, aborting ***"
exit 1 exit 1
@ -244,7 +244,7 @@ build_pkg()
# #
if [ "$build_style" = "gnu_configure" ]; then if [ "$build_style" = "gnu_configure" ]; then
for i in "${configure_env}"; do for i in "${configure_env}"; do
export "$i" [ -n "$i" ] && export "$i"
done done
./configure --prefix="${PKGFS_DESTDIR}" "${configure_args}" ./configure --prefix="${PKGFS_DESTDIR}" "${configure_args}"
@ -259,7 +259,8 @@ build_pkg()
MAKE_CMD="$make_cmd" MAKE_CMD="$make_cmd"
fi fi
$MAKE_CMD ${make_build_args} /usr/bin/env CFLAGS="$PKGFS_CFLAGS" CXXFLAGS="$PKGFS_CXXFLAGS" \
$MAKE_CMD ${make_build_args}
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo "*** ERROR building (make stage) $pkgname ***" echo "*** ERROR building (make stage) $pkgname ***"
exit 1 exit 1
@ -273,10 +274,6 @@ build_pkg()
fi fi
echo "*** SUCCESSFUL build for $pkgname ***" echo "*** SUCCESSFUL build for $pkgname ***"
for i in "${configure_env}"; do
unset "$i"
done
fi fi
} }