--- elwix/build_3thparty.sh	2014/01/05 23:14:22	1.4
+++ elwix/build_3thparty.sh	2014/09/15 19:06:41	1.5
@@ -5,10 +5,17 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_3thparty.sh,v 1.4 2014/01/05 23:14:22 misho Exp $
+# $Id: build_3thparty.sh,v 1.5 2014/09/15 19:06:41 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
+if [ ! -r ./config/rc.3thparty_helper ]; then
+	echo
+	echo "ELWIX project is not configured - Missing rc.3thparty_helper script"
+	echo
+	exit 1
+fi
+
 if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
 	echo
 	echo "ELWIX project is not configured !?!"
@@ -62,76 +69,75 @@ compile_3th()
 {
 	echo "+++ Compile ELWIX 3th party ..."
 
-	cd $CROSS_3TH
-	./build.sh expat ${CBUILD} ${PKG} ${TARGET_BUILD}
+	BUILD_SH="./config/rc.3thparty_helper"
+
+	${BUILD_SH} expat ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh libevent ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} libevent ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh libiconv ${CGBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} libiconv ${CGBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh pcre ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} readline ${CGBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh mini_sendmail ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} pcre ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh choparp ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} mini_sendmail ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh scan_ffs ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} choparp ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh istgt ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} scan_ffs ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh rsync ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} rsync ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh ttcp ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} ttcp ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh mpd ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} mpd ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh mrouted ${CGBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} igmpproxy ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh igmpproxy ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} sudo ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh sudo ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} bmon ${CGBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh bmon ${CGBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} mtr ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh mtr ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} ipguard ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh ipguard ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} smartmontools ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh smartmontools ${CBUILD} ${PKG} ${TARGET_BUILD}
+	env CFLAGS="-I${PKG}/include" LDFLAGS="-L${PKG}/lib" ${BUILD_SH} quagga ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh quagga ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} iftop ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh iftop ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} arping ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh arping ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} hping2 ${CGBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh hping2 ${CGBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} trafshow ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh trafshow ${CBUILD} ${PKG} ${TARGET_BUILD}
+#	${BUILD_SH} ipsec-tools ${CGBUILD} ${PKG} ${TARGET_BUILD}
+#	[ $? -ne 0 ] && exit 1
+#	${BUILD_SH} dhcp ${CBUILD} ${PKG} ${TARGET_BUILD}
+#	[ $? -ne 0 ] && exit 1
+#	${BUILD_SH} dhcping ${CBUILD} ${PKG} ${TARGET_BUILD}
+#	[ $? -ne 0 ] && exit 1
+	${BUILD_SH} dnsmasq ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh ipsec-tools ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-#	./build.sh dhcp ${CBUILD} ${PKG} ${TARGET_BUILD}
+#	${BUILD_SH} miniupnpd ${CBUILD} ${PKG} ${TARGET_BUILD}
 #	[ $? -ne 0 ] && exit 1
-#	./build.sh dhcping ${CBUILD} ${PKG} ${TARGET_BUILD}
+#	${BUILD_SH} miniupnpc ${CGBUILD} ${PKG} ${TARGET_BUILD}
 #	[ $? -ne 0 ] && exit 1
-	./build.sh dnsmasq ${CBUILD} ${PKG} ${TARGET_BUILD}
+	${BUILD_SH} ntp ${CBUILD} ${PKG} ${TARGET_BUILD}
 	[ $? -ne 0 ] && exit 1
-	./build.sh miniupnpd ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	./build.sh miniupnpc ${CGBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	./build.sh ntp ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	./build.sh spawn-fcgi ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	./build.sh lighttpd ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	./build.sh libxml2 ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	./build.sh php ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	cd -
+#	${BUILD_SH} spawn-fcgi ${CBUILD} ${PKG} ${TARGET_BUILD}
+#	[ $? -ne 0 ] && exit 1
+#	${BUILD_SH} lighttpd ${CBUILD} ${PKG} ${TARGET_BUILD}
+#	[ $? -ne 0 ] && exit 1
+#	${BUILD_SH} libxml2 ${CBUILD} ${PKG} ${TARGET_BUILD}
+#	[ $? -ne 0 ] && exit 1
+#	${BUILD_SH} php ${CBUILD} ${PKG} ${TARGET_BUILD}
+#	[ $? -ne 0 ] && exit 1
+	echo
 }
 
 install_3th()
@@ -180,11 +186,11 @@ build_3th()
 
 ### main()
 if ! SnitVer ${PKG}/elwix.ver; then
-	clean_3th
-	compile_3th
+	clean_3th || exit 1
+	compile_3th || exit 1
 
-	install_3th
-	build_3th
+	install_3th || exit 1
+	build_3th || exit 1
 
 	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${PKG}/elwix.ver
 else