Date:2010-09-15 07:12:13 (4 years 2 months ago)
Author:Alan Post
Commit:77694b3b610ccc57f39048bd8aafa0db6a207dd7
Message:update the wordgrinder-0.3.3 patch.

I believe upstream modified the wordgrinder-0.3.3 release in place.
Only whitespace is different between this patch and the previous
patch.

This now applies cleanly.
Files: wordgrinder/patches/001-pmfile.patch (4 diffs)

Change Details

wordgrinder/patches/001-pmfile.patch
1+++ wordgrinder-0.3.3/pmfile-openwrt 2010-08-15 16:06:45.000000000 +0200
1--- a/pmfile 2009-12-13 06:44:53.000000000 -0700
22@@ -12,6 +12,9 @@
33 DATE = "13 December 2009"
44 VERSION = "0.3.3"
...... 
77+STAGING_DIR = os.getenv("STAGING_DIR")
88+CCOMPILER = os.getenv("TARGET_CC")
99+LUAC = "cat %in% > %out%"
10
10
1111 -----------------------------------------------------------------------------
1212 -- User configurable settings start here!
1313@@ -19,8 +22,8 @@
1414 -- Where do you want WordGrinder installed? By default, it goes into your
1515 -- home directory.
16
16
1717-PREFIX = HOME
1818--- PREFIX = "/usr/local"
1919+-- PREFIX = HOME
2020+PREFIX = "/usr/"
21
21
2222 -- What build flags do you want to use? (Not including -g or -Os, which are
2323 -- added later automatically.)
24@@ -32,10 +35,12 @@
25
26 -- Any other build options go in these three sections. Note the lack of -l, -D
27 -- or -I. We need the XOPEN stuff to make the wide-character curses library
28 -- work.
29
24@@ -36,6 +39,8 @@
25
3026 CLIBRARIES = {
3127     'm',
3228+ 'crypt',
3329+ 'dl',
3430 }
35
31
3632 CDEFINES = {
37@@ -43,10 +48,10 @@
38     'FILEFORMAT=%FILEFORMAT%',
39     'PREFIX="%PREFIX%"'
33@@ -45,8 +50,8 @@
4034 }
41
35
4236 CINCLUDES = {
4337- "/usr/include/ncursesw",
4438- "/usr/include/lua5.1",
...... 
4640+ "%STAGING_DIR%/usr/include/",
4741     "src/c"
4842 }
49
50@@ -211,11 +216,11 @@
51         '_XOPEN_SOURCE_EXTENDED',
52         '_XOPEN_SOURCE',
53     },
54
43
44@@ -214,8 +219,8 @@
45
5546     CLIBRARIES = {
5647         PARENT,
5748- 'ncursesw',
...... 
6051+ '%STAGING_DIR%/usr/lib/liblua.a'
6152     }
6253 }
63
64@@ -238,15 +243,15 @@
65         "EMULATED_WCWIDTH",
66         "BUILTIN_LFS",
67     },
68
69     CINCLUDES = {
70         PARENT,
71         "src/c/luacore"
72     },
73
54
55@@ -246,7 +251,7 @@
56
7457     CLIBRARIES = {
7558         PARENT,
7659- 'ncursesw',
7760+ '%STAGING_DIR%/usr/lib/ncursesw.a',
7861     },
79
62
8063     install = pm.install("bin/wordgrinder-static")

Archive Download the corresponding diff file



interactive