Revision: 5380
http://ipcop.svn.sourceforge.net/ipcop/?rev=5380&view=rev
Author: gespinasse
Date: 2011-01-28 07:41:31 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
Use bash -x for toolchain_make, so we could see in log when WRAPPER_32BIT is
used
Place install near make as that does not matter where it is vs the env variables
we create and it look more clear so, at least for me.
Change make.sh to compile pcre before glib, so glib could use system pcre
Minor simplification on PASS handling
Modified Paths:
--------------
ipcop/trunk/make.sh
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2011-01-27 21:08:24 UTC (rev 5379)
+++ ipcop/trunk/make.sh 2011-01-28 07:41:31 UTC (rev 5380)
@@ -1409,7 +1409,7 @@
# Split log per package
LOGFILE="${BASEDIR}/log_${MACHINE}/${STAGE_ORDER}_${STAGE}/${1}-${PKG_VER}"
# Add a separator and PASS if PASS is not empty
- [ -n "${PASS}" ] &&
LOGFILE="${BASEDIR}/log_${MACHINE}/${STAGE_ORDER}_${STAGE}/${1}-${PKG_VER}_${PASS}"
+ [ -n "${PASS}" ] && LOGFILE="${LOGFILE}_${PASS}"
return 0 # pass all!
else
@@ -1445,7 +1445,7 @@
# CFLAGS and CXXFLAGS are not set on purpose (recommended to be empty
by lfs)
# Not all machines have /tmp writable by non-root, so use ${LFS}/tmp
made for the chroot
- cd ${BASEDIR}/lfs && ${WRAPPER_32BIT} make -f $* \
+ bash -x -c "cd ${BASEDIR}/lfs && ${WRAPPER_32BIT} make -f $* install \
CONFIG_ROOT=${CONFIG_ROOT} \
LFS_TGT=${LFS_TGT} \
TARGET_2=${TARGET_2} \
@@ -1463,7 +1463,7 @@
STAGE_ORDER=${STAGE_ORDER} \
SHELL='/bin/bash' \
TMPDIR=${LFS}/tmp \
- install >> ${LOGFILE} 2>&1
+ " >> ${LOGFILE} 2>&1
# the >> is needed to keep log on rebuild or log is replaced by
# make: Nothing to be done for `install'.
@@ -1768,6 +1768,7 @@
chroot_make libgcrypt # radiusplugin for OpenVPN
chroot_make libnet
chroot_make libpng
+ chroot_make pcre # glib use system pcre
chroot_make glib
chroot_make dejavu
chroot_make freetype
@@ -1779,7 +1780,6 @@
chroot_make popt # logrotate
chroot_make libcap
chroot_make pciutils
- chroot_make pcre
chroot_make usbutils
chroot_make acpid
chroot_make apache
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
