Changeset f1b0356 in freewrt

Timestamp:

Jun 19, 2007, 3:28:24 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

4ec102d

Parents:

c534048

Message:

austriancoder suggested that I pack tsort(1) into tools/ for these
whose tsort doesn't do -r

Now, GNU tsort doesn't do -r, and the only other tsort I know comes
bundled with mirmake (and depends too much on libmirmake and its other
inner workings to separate it from it), and mirmake has a dependency
on guess what…

This is untested, but seems to work.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2858 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• Makefile (modified) (2 diffs)
• package/mksh/Makefile (modified) (1 diff)
• package/mksh/Makefile.inc (added)
• scripts/scan-tools.sh (modified) (1 diff)
• tools/Makefile (modified) (1 diff)
• tools/mirmake/Makefile (added)
• tools/mksh/Makefile (added)

Makefile

@@ -148 +148 @@
         @echo "TOPDIR:=$$(readlink -nf .)" >lbin/prereq.mk
         @echo "BASH:=$$(lbin/which bash)" >>lbin/prereq.mk
-        @if lbin/which mksh >/dev/null 2>&1; then \
-                echo "MBSH:=$$(lbin/which mksh)" >>lbin/prereq.mk; \
-        else \
-                echo "MBSH:=$$(lbin/which bash)" >>lbin/prereq.mk; \
-        fi
         @echo 'GMAKE:=$${TOPDIR}/lbin/gmake' >>lbin/prereq.mk
         @echo "GNU_HOST_NAME:=$$(${CC} -dumpmachine | sed \
@@ -196 +191 @@
         fi
         @${GMAKE_INV} tools/install-lbin
+        @if lbin/which mksh >/dev/null 2>&1; then \
+                echo "MBSH:=$$(lbin/which mksh)" >>lbin/prereq.mk; \
+        else \
+                echo "MBSH:=$$(lbin/which bash)" >>lbin/prereq.mk; \
+        fi
         @echo '===> Prerequisites checked successfully.'
         @touch $@

package/mksh/Makefile

@@ -6 +6 @@
 
 include ${TOPDIR}/rules.mk
-
-PKG_NAME=               mksh
-PKG_VERSION=            29.6
-PKG_RELEASE=            2
-DISTFILES=              ${PKG_NAME}-R29f.cpio.gz
-#DISTFILES=             mksh_${PKG_VERSION}.tar.gz
-PKG_MD5SUM=             83b4ca84faa1a1ea4cf6db6eb41a0384
-
-MASTER_SITES=           ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
-#MASTER_SITES=          http://users.unixforge.de/~tglaser/
-WRKDIST=                ${WRKDIR}/${PKG_NAME}
-
+include Makefile.inc
 include ${TOPDIR}/mk/package.mk
 

scripts/scan-tools.sh

@@ -387 +387 @@
 fi
 
-if ! which tsort >/dev/null 2>&1; then
-        echo You must install \"tsort\" to continue.
-        echo
-        out=1
-fi
-v=$(printf 'a b\nb c\n' | tsort -r 2>/dev/null | md5sum)
-if [[ ${v%% *} != 0617bc44e824dd65da71d04b29c85e63 ]]; then
-        echo Your tsort does not support the -r option.
-        echo Install one which does to continue.
-        out=1
-fi
+have_tsort=0
+if which tsort >/dev/null 2>&1; then
+        v=$(printf 'a b\nb c\n' | tsort -r 2>/dev/null | md5sum)
+        [[ ${v%% *} = 0617bc44e824dd65da71d04b29c85e63 ]] && have_tsort=1
+fi
+
+if [[ $have_tsort=0 ]]; then
+        echo USE_TOOLS_MIRMAKE=1 >>$topdir/lbin/prereq.mk
+        if ! which mksh >/dev/null 2>&1; then
+                echo USE_TOOLS_MKSH=1 >>$topdir/lbin/prereq.mk
+        fi
+fi
+
 
 cd $topdir

tools/Makefile

@@ -12 +12 @@
 TARGETS+=       paxmirabilis
 TARGETS+=       sed
+
+# Conditionals
+ifneq (${USE_TOOLS_MKSH},)
+TARGETS+=       mksh
+endif
+ifneq (${USE_TOOLS_MIRMAKE},)
+TARGETS+=       mirmake         # depends on mksh
+endif
 
 TARGETS+=       brcm-utils