From f89670bb962dd0182ddea051ba0efa44815d2023 Mon Sep 17 00:00:00 2001
From: Silvio fricke <silvio.fricke@gmail.com>
Date: Fri, 13 Jun 2008 19:54:31 +0200
Subject: [PATCH] makepkg, splitt packages logging enabled
 	* logging
 	* value-sorted

Signed-off-by: Silvio fricke <silvio.fricke@gmail.com>
---
 scripts/makepkg.sh.in |   49 +++++++++++++++++++++++++++++++------------------
 1 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index dacabb6..3c0c6f7 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -675,6 +675,8 @@ run_build() {
 			mv "$BUILDLOG" "$BUILDLOG.$i"
 		fi
 
+		export BUILDLOG
+
 		build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]}
 	else
 		build 2>&1 || ret=$?
@@ -1390,18 +1392,18 @@ if [ "$INFAKEROOT" = "1" ]; then
 	fi
 
 	if [ "$splitinstall" != "" ] ; then
-		replaces_o=$replaces
-		groups_o=$groups
-		depends_o=$depends
 		backup_o=$backup
+		conflicts_o=$conflicts
+		depends_o=$depends
+		groups_o=$groups
+		install_o=$install
+		license_o=$license
 		pkgdesc_o=$pkgdesc
-		pkgver_o=$pkgver
 		pkgname_o=$pkgname
-		license_o=$license
-		url_o=$url
+		pkgver_o=$pkgver
 		provides_o=$provides
-		conflicts_o=$conflicts
-		install_o=$install
+		replaces_o=$replaces
+		url_o=$url
 		create_package
 		for it in "${splitinstall[@]}" ; do
 			if [ -d "$pkgdir" ]; then
@@ -1410,20 +1412,31 @@ if [ "$INFAKEROOT" = "1" ]; then
 			fi
 			mkdir -p "$pkgdir"
 			msg "Building split package using function: $it"
-			$it
+
+			if [ "$LOGGING" = "1" ]; then
+				[ "x$BUILDLOG" == "x" ] && BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log"
+				echo >> "$BUILDLOG"
+				echo >> "$BUILDLOG"
+				echo "--- Logging for $it ------------" >> "$BUILDLOG"
+
+				$it 2>&1 | tee -a "$BUILDLOG"
+			else
+				$it 2>&1
+			fi
+
 			create_package
-			[ "$pkgdesc_o" != "" ]   && pkgdesc=$pkgdesc_o     || unset pkgdesc
-			[ "$pkgver_o" != "" ]    && pkgver=$pkgver_o       || unset pkgver
-			[ "$pkgname_o" != "" ]   && pkgname=$pkgname_o     || unset pkgname
-			[ "$url_o" != "" ]       && url=$url_o             || unset url
-			[ "$replaces_o" != "" ]  && replaces=$replaces_o   || unset replaces
-			[ "$groups_o" != "" ]    && groups=$groups_o       || unset groups
-			[ "$depends_o" != "" ]   && depends=$depends_o     || unset depends
 			[ "$backup_o" != "" ]    && backup=$backup_o       || unset backup
-			[ "$license_o" != "" ]   && license=$license_o     || unset license
-			[ "$provides_o" != "" ]  && provides=$provides_o   || unset provides
 			[ "$conflicts_o" != "" ] && conflicts=$conflicts_o || unset conflicts
+			[ "$depends_o" != "" ]   && depends=$depends_o     || unset depends
+			[ "$groups_o" != "" ]    && groups=$groups_o       || unset groups
 			[ "$install_o" != "" ]   && install=$install_o     || unset install
+			[ "$license_o" != "" ]   && license=$license_o     || unset license
+			[ "$pkgdesc_o" != "" ]   && pkgdesc=$pkgdesc_o     || unset pkgdesc
+			[ "$pkgname_o" != "" ]   && pkgname=$pkgname_o     || unset pkgname
+			[ "$pkgver_o" != "" ]    && pkgver=$pkgver_o       || unset pkgver
+			[ "$provides_o" != "" ]  && provides=$provides_o   || unset provides
+			[ "$replaces_o" != "" ]  && replaces=$replaces_o   || unset replaces
+			[ "$url_o" != "" ]       && url=$url_o             || unset url
 		done
 		msg "All split packages built!"
 	else
-- 
1.5.5.3