From 6d465e0a43e579149525208d3e7bf0697dbb5b5a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 7 Apr 2015 12:34:23 +0200
Subject: [PATCH] xbps-src/bulk: simplify and make the toposort work again.

---
 common/xbps-src/shutils/bulk.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 9a7e3c6614..ff02d555a1 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -42,11 +42,7 @@ bulk_build() {
     # Perform a topological sort of all pkgs but only with build dependencies
     # that are found in previous step.
     for pkg in ${pkgs}; do
-        for x in ${XBPS_COMMONDIR}/environment/setup/*.sh; do
-            . $x
-        done
-        . ${XBPS_SRCPKGDIR}/${pkg}/template
-        _pkgs="$(show_pkg_build_deps 2>/dev/null| sed -e 's|[<>].*\$||g')"
+        _pkgs="$(./xbps-src show-build-deps $pkg 2>/dev/null)"
         found=0
         for x in ${_pkgs}; do
             _pkg=$(bulk_getlink $x)
@@ -60,7 +56,7 @@ bulk_build() {
         done
         [ $found -eq 0 ] && echo "${pkg} ${pkg}" >> $tmpf
     done
-    tsort $tmpf
+    tsort $tmpf|tac
     rm -f $tmpf
 }