Changeset b84b14f in freewrt

Timestamp:

Jun 16, 2006, 10:53:08 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

bd55056

Parents:

cb49195

Message:

• instead of using a $(VARS_TO_PASS) write the variables into a *.mk include file, so that people can cd to some package direc- tory and invoke gmake directly
• fake OpenBSD as uname for MirBSD, so that we get a little further in the build process there (stops at linux requiring bash now)

Tested with a full build (standard config) on Linux.
Invoking gmake in a subdirectory *not* tested, but
that didn't work before at all, so it's not a problem.

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

Files:

• Makefile (modified) (2 diffs)
• build.mk (modified) (1 diff)
• rules.mk (modified) (1 diff)
• scripts/uname.fake (added)

Makefile

@@ -31 +31 @@
 
 GMAKE?=         $(PWD)/lbin/gmake
-GMAKE_INV=      PATH=$(PWD)/lbin:$(PATH) ${GMAKE} --no-print-directory \
-                -f $(PWD)/build.mk ${VARS_TO_PASS}
-
-VARS_TO_PASS=   HOSTCC='${CC}' MAKE='${GMAKE}' LC_ALL=C \
-                HOSTCFLAGS="$$(set +x; x=$$(echo \
-                    'f:\n\techo P:$${CFLAGS}\n.include <bsd.prog.mk>' | \
-                    ${MAKE} -f - f EXPERIMENTAL=yes 2>/dev/null | grep '^P:' \
-                    2>/dev/null | sed 's/^P://'); echo $${x:--O2 ${CFLAGS}})"
+GMAKE_INV=      ${GMAKE} --no-print-directory -f $(PWD)/build.mk
 
 all: prereq
@@ -99 +92 @@
                 chmod 555 lbin/md5sum; \
         fi
+        @if test x"$$(uname)" = x"MirBSD"; then \
+                sed -e 's!@@FromOS@@!MirBSD!g' -e 's!@@ToOS@@!OpenBSD!g' \
+                    -e "s!@@PROG@@!$$(which uname)!g" \
+                    <scripts/uname.fake >lbin/uname; \
+                chmod 555 lbin/uname; \
+        fi
+        @echo 'HOSTCC=${CC}' >>lbin/prereq.mk
+        @x="$$(echo 'f:\n\techo P:$${CFLAGS}\n.include <bsd.prog.mk>' | \
+            ${MAKE} -f - f EXPERIMENTAL=yes 2>/dev/null | grep '^P:' \
+            2>/dev/null | sed 's/^P://')"; \
+            echo "HOSTCFLAGS=$${x:--O2 ${CFLAGS}}" | sed 's/ *$$//' \
+            >>lbin/prereq.mk
+        @echo 'LC_ALL=C' >>lbin/prereq.mk
+        @echo 'MAKE=${GMAKE}' >>lbin/prereq.mk
+        @echo "OStype=$$(env NOFAKE=yes uname)" >>lbin/prereq.mk
+        @echo "PATH=$$(pwd)/lbin:$$PATH" >>lbin/prereq.mk
+        @echo "export HOSTCC HOSTCFLAGS LC_ALL MAKE OStype PATH" \
+            >>lbin/prereq.mk
         @touch $@

build.mk

@@ -118 +118 @@
 else # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 
+include $(TOPDIR)/lbin/prereq.mk
+
 all: menuconfig
 

rules.mk

@@ +1 @@
+include $(TOPDIR)/lbin/prereq.mk
 include $(TOPDIR)/.config
 #SHELL=/bin/bash