From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 19 Dec 2009 22:53:46 +0059
Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all
 Makefiles

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 package/depmaker | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 package/depmaker

(limited to 'package/depmaker')

diff --git a/package/depmaker b/package/depmaker
new file mode 100644
index 000000000..06f5a9e28
--- /dev/null
+++ b/package/depmaker
@@ -0,0 +1,20 @@
+cd "$(dirname "$0")"
+export TOPDIR=$(realpath ..)
+if gmake --help >/dev/null 2>&1; then
+	export GMAKE=gmake
+else
+	export GMAKE=make
+fi
+
+for subdir in */Makefile; do
+	subdir=${subdir%/*}
+	cd $subdir
+	deps=$($GMAKE show=PKG_BUILDDEP)
+	cd ..
+	[[ -n $deps ]] || continue
+	x="${subdir}-compile:"
+	for dep in $deps; do
+		x="$x ${dep}-compile"
+	done
+	print -r -- $x
+done >Depends.mk
-- 
cgit v1.2.3


From 1b111741aee8028b8bbb0dc3ad7b456e953f9aad Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 19 Dec 2009 23:06:42 +0059
Subject: also create list of package subdirs automatically; fix name mangling

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 package/depmaker | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'package/depmaker')

diff --git a/package/depmaker b/package/depmaker
index 06f5a9e28..0e683ff8c 100644
--- a/package/depmaker
+++ b/package/depmaker
@@ -8,6 +8,14 @@ fi
 
 for subdir in */Makefile; do
 	subdir=${subdir%/*}
+	case $subdir {
+	(@(?(e)g|uc|)libc|libpthread|uclibc++) ;;
+	(*)
+		typeset -u dnu=${subdir//-/_}
+		dnu=${dnu//+/X}
+		print "package-\$(ADK_COMPILE_${dnu}) += $subdir"
+		;;
+	}
 	cd $subdir
 	deps=$($GMAKE show=PKG_BUILDDEP)
 	cd ..
-- 
cgit v1.2.3


From 82b3f66f50f608723a2d388bf933ec08a0fefda4 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sun, 20 Dec 2009 14:40:27 +0059
Subject: =?UTF-8?q?Use=20the=20optimisation=20of=20the=20=E2=80=9Cdump?=
 =?UTF-8?q?=E2=80=9D=20option=20to=20speed=20up=2010x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 package/depmaker | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'package/depmaker')

diff --git a/package/depmaker b/package/depmaker
index 0e683ff8c..43d4327eb 100644
--- a/package/depmaker
+++ b/package/depmaker
@@ -6,21 +6,22 @@ else
 	export GMAKE=make
 fi
 
-for subdir in */Makefile; do
-	subdir=${subdir%/*}
-	case $subdir {
+for dn in */Makefile; do
+	dn=${dn%/*}
+	case $dn {
 	(@(?(e)g|uc|)libc|libpthread|uclibc++) ;;
 	(*)
-		typeset -u dnu=${subdir//-/_}
+		# dnu: directory name, uppercase, y/-+/_X/
+		typeset -u dnu=${dn//-/_}
 		dnu=${dnu//+/X}
-		print "package-\$(ADK_COMPILE_${dnu}) += $subdir"
+		print "package-\$(ADK_COMPILE_${dnu}) += $dn"
 		;;
 	}
-	cd $subdir
+	cd $dn
 	deps=$($GMAKE show=PKG_BUILDDEP)
 	cd ..
 	[[ -n $deps ]] || continue
-	x="${subdir}-compile:"
+	x="${dn}-compile:"
 	for dep in $deps; do
 		x="$x ${dep}-compile"
 	done
-- 
cgit v1.2.3


From 77a222d5094d902128d355685501c7b30c8cccca Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sun, 20 Dec 2009 14:52:58 +0059
Subject: Pimp up the progress bar

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 package/depmaker | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'package/depmaker')

diff --git a/package/depmaker b/package/depmaker
index 43d4327eb..edbacc6f1 100644
--- a/package/depmaker
+++ b/package/depmaker
@@ -5,9 +5,13 @@ if gmake --help >/dev/null 2>&1; then
 else
 	export GMAKE=make
 fi
+(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 ))
+typeset -L$x_cols pbar
 
 for dn in */Makefile; do
 	dn=${dn%/*}
+	pbar="$dn ..."
+	print -nu2 "$pbar\r"
 	case $dn {
 	(@(?(e)g|uc|)libc|libpthread|uclibc++) ;;
 	(*)
@@ -27,3 +31,5 @@ for dn in */Makefile; do
 	done
 	print -r -- $x
 done >Depends.mk
+pbar=done
+print -u2 "$pbar"
-- 
cgit v1.2.3


From 9183b983ea3f2b20359eaa7cf3a8776af301c059 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 21 Dec 2009 12:50:59 +0100
Subject: make pkgmaker and depmaker less verbose, fix build

---
 package/depmaker | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'package/depmaker')

diff --git a/package/depmaker b/package/depmaker
index edbacc6f1..da3923554 100644
--- a/package/depmaker
+++ b/package/depmaker
@@ -1,3 +1,5 @@
+unset MAKEFLAGS
+export MAKEFLAGS=s
 cd "$(dirname "$0")"
 export TOPDIR=$(realpath ..)
 if gmake --help >/dev/null 2>&1; then
@@ -5,6 +7,7 @@ if gmake --help >/dev/null 2>&1; then
 else
 	export GMAKE=make
 fi
+GMAKE="$GMAKE --no-print-directory"
 (( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 ))
 typeset -L$x_cols pbar
 
-- 
cgit v1.2.3