qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2025-02-18 00:04:43 +02:00
Code

update the wordgrinder-0.3.3 patch.

Browse Source 
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.
This commit is contained in:
Alan Post 2010-09-14 23:12:13 -06:00
parent 2f685c01b0
commit 77694b3b61
1 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
wordgrinder/patches/001-pmfile.patch
View File

@ -1,5 +1,5 @@
--- wordgrinder-0.3.3/pmfile 2009-12-13 14:44:53.000000000 +0100 --- a/pmfile 2009-12-13 06:44:53.000000000 -0700
+++ wordgrinder-0.3.3/pmfile-openwrt 2010-08-15 16:06:45.000000000 +0200 +++ b/pmfile 2010-09-14 22:36:03.000000000 -0600
@@ -12,6 +12,9 @@ @@ -12,6 +12,9 @@
DATE = "13 December 2009" DATE = "13 December 2009"
VERSION = "0.3.3" VERSION = "0.3.3"
@ -7,38 +7,32 @@
+STAGING_DIR = os.getenv("STAGING_DIR") +STAGING_DIR = os.getenv("STAGING_DIR")
+CCOMPILER = os.getenv("TARGET_CC") +CCOMPILER = os.getenv("TARGET_CC")
+LUAC = "cat %in% > %out%" +LUAC = "cat %in% > %out%"
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- User configurable settings start here! -- User configurable settings start here!
@@ -19,8 +22,8 @@ @@ -19,8 +22,8 @@
-- Where do you want WordGrinder installed? By default, it goes into your -- Where do you want WordGrinder installed? By default, it goes into your
-- home directory. -- home directory.
-PREFIX = HOME -PREFIX = HOME
--- PREFIX = "/usr/local" --- PREFIX = "/usr/local"
+-- PREFIX = HOME +-- PREFIX = HOME
+PREFIX = "/usr/" +PREFIX = "/usr/"
-- What build flags do you want to use? (Not including -g or -Os, which are -- What build flags do you want to use? (Not including -g or -Os, which are
-- added later automatically.) -- added later automatically.)
@@ -32,10 +35,12 @@ @@ -36,6 +39,8 @@
-- Any other build options go in these three sections. Note the lack of -l, -D
-- or -I. We need the XOPEN stuff to make the wide-character curses library
-- work.
CLIBRARIES = { CLIBRARIES = {
'm', 'm',
+ 'crypt', + 'crypt',
+ 'dl', + 'dl',
} }
CDEFINES = { CDEFINES = {
@@ -43,10 +48,10 @@ @@ -45,8 +50,8 @@
'FILEFORMAT=%FILEFORMAT%',
'PREFIX="%PREFIX%"'
} }
CINCLUDES = { CINCLUDES = {
- "/usr/include/ncursesw", - "/usr/include/ncursesw",
- "/usr/include/lua5.1", - "/usr/include/lua5.1",
@ -46,12 +40,9 @@
+ "%STAGING_DIR%/usr/include/", + "%STAGING_DIR%/usr/include/",
"src/c" "src/c"
} }
@@ -211,11 +216,11 @@ @@ -214,8 +219,8 @@
'_XOPEN_SOURCE_EXTENDED',
'_XOPEN_SOURCE',
},
CLIBRARIES = { CLIBRARIES = {
PARENT, PARENT,
- 'ncursesw', - 'ncursesw',
@ -60,21 +51,13 @@
+ '%STAGING_DIR%/usr/lib/liblua.a' + '%STAGING_DIR%/usr/lib/liblua.a'
} }
} }
@@ -238,15 +243,15 @@ @@ -246,7 +251,7 @@
"EMULATED_WCWIDTH",
"BUILTIN_LFS",
},
CINCLUDES = {
PARENT,
"src/c/luacore"
},
CLIBRARIES = { CLIBRARIES = {
PARENT, PARENT,
- 'ncursesw', - 'ncursesw',
+ '%STAGING_DIR%/usr/lib/ncursesw.a', + '%STAGING_DIR%/usr/lib/ncursesw.a',
}, },
install = pm.install("bin/wordgrinder-static") install = pm.install("bin/wordgrinder-static")