From 4bfce3b6e2ea095ea3d9f5d2d1018cc0a1e5ce09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20K=C3=BChling?= Date: Sat, 18 Sep 2010 20:47:21 +0200 Subject: Major overhaul and cleanup. Support for .ubi image file installations. Only compile&install a minimum host Gforth for bootstrapping the target Gforth, removing strange emacs-dependencies that cropped up earlier. Image file can now be built on the nanonote using 'gforth-update-image' command. Also, Gforth is now run through a wrapper that calls 'gforth-update-image' automatically, if necessary. Also first attempts at supporting libcc C-interface libraries pre-compiled on the host. Tested to compile on amd64 and i386. --- wordgrinder/patches/001-pmfile.patch | 63 ++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 wordgrinder/patches/001-pmfile.patch (limited to 'wordgrinder/patches') diff --git a/wordgrinder/patches/001-pmfile.patch b/wordgrinder/patches/001-pmfile.patch new file mode 100644 index 0000000..9362584 --- /dev/null +++ b/wordgrinder/patches/001-pmfile.patch @@ -0,0 +1,63 @@ +--- a/pmfile 2009-12-13 06:44:53.000000000 -0700 ++++ b/pmfile 2010-09-14 22:36:03.000000000 -0600 +@@ -12,6 +12,9 @@ + DATE = "13 December 2009" + VERSION = "0.3.3" + FILEFORMAT = 3 ++STAGING_DIR = os.getenv("STAGING_DIR") ++CCOMPILER = os.getenv("TARGET_CC") ++LUAC = "cat %in% > %out%" + + ----------------------------------------------------------------------------- + -- User configurable settings start here! +@@ -19,8 +22,8 @@ + -- Where do you want WordGrinder installed? By default, it goes into your + -- home directory. + +-PREFIX = HOME +--- PREFIX = "/usr/local" ++-- PREFIX = HOME ++PREFIX = "/usr/" + + -- What build flags do you want to use? (Not including -g or -Os, which are + -- added later automatically.) +@@ -36,6 +39,8 @@ + + CLIBRARIES = { + 'm', ++ 'crypt', ++ 'dl', + } + + CDEFINES = { +@@ -45,8 +50,8 @@ + } + + CINCLUDES = { +- "/usr/include/ncursesw", +- "/usr/include/lua5.1", ++ "%STAGING_DIR%/usr/include/ncursesw", ++ "%STAGING_DIR%/usr/include/", + "src/c" + } + +@@ -214,8 +219,8 @@ + + CLIBRARIES = { + PARENT, +- 'ncursesw', +- 'lua5.1' ++ '%STAGING_DIR%/usr/lib/libncursesw.a', ++ '%STAGING_DIR%/usr/lib/liblua.a' + } + } + +@@ -246,7 +251,7 @@ + + CLIBRARIES = { + PARENT, +- 'ncursesw', ++ '%STAGING_DIR%/usr/lib/ncursesw.a', + }, + + install = pm.install("bin/wordgrinder-static") -- cgit v1.2.3