| author | pnyc <petr.nyc@oracle.com> |
| Thu, 14 Jan 2016 11:42:28 -0800 | |
| branch | s11u3-sru4-backport |
| changeset 5277 | 33c800398785 |
| parent 4226 | efcbdc9d6dd8 |
| permissions | -rw-r--r-- |
|
4226
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
1 |
Patch to src/luaconf.h is to adjust lua's default path for where it |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
2 |
looks for .lua and lua related .so's |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
3 |
|
|
97
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
4 |
--- lua-5.1.4/src/lua.h.orig 2009-01-06 02:15:11.179130113 -0800 |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
5 |
+++ lua-5.1.4/src/lua.h 2009-01-06 02:15:56.570695998 -0800 |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
6 |
@@ -9,6 +9,10 @@ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
7 |
#ifndef lua_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
8 |
#define lua_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
9 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
10 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
11 |
+extern "C" {
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
12 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
13 |
+ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
14 |
#include <stdarg.h> |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
15 |
#include <stddef.h> |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
16 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
17 |
@@ -384,5 +388,8 @@ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
18 |
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
19 |
******************************************************************************/ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
20 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
21 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
22 |
+} |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
23 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
24 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
25 |
#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
26 |
--- lua-5.1.4/src/lualib.h.orig 2009-01-06 02:15:19.193417835 -0800 |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
27 |
+++ lua-5.1.4/src/lualib.h 2009-01-06 02:16:20.502288036 -0800 |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
28 |
@@ -8,6 +8,10 @@ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
29 |
#ifndef lualib_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
30 |
#define lualib_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
31 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
32 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
33 |
+extern "C" {
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
34 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
35 |
+ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
36 |
#include "lua.h" |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
37 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
38 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
39 |
@@ -49,5 +53,8 @@ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
40 |
#define lua_assert(x) ((void)0) |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
41 |
#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
42 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
43 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
44 |
+} |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
45 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
46 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
47 |
#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
48 |
--- lua-5.1.4/src/lauxlib.h.orig 2009-01-06 02:15:37.967244620 -0800 |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
49 |
+++ lua-5.1.4/src/lauxlib.h 2009-01-06 02:16:26.398180986 -0800 |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
50 |
@@ -8,6 +8,9 @@ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
51 |
#ifndef lauxlib_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
52 |
#define lauxlib_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
53 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
54 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
55 |
+extern "C" {
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
56 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
57 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
58 |
#include <stddef.h> |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
59 |
#include <stdio.h> |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
60 |
@@ -169,6 +172,10 @@ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
61 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
62 |
#define luaL_reg luaL_Reg |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
63 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
64 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
65 |
+} |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
66 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
67 |
+ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
68 |
#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
69 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
70 |
|
|
4226
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
71 |
--- lua-5.1.4/src/luaconf.h Wed Apr 29 11:49:07 2015 |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
72 |
+++ lua-5.1.4/src/luaconf.h Wed Apr 29 12:50:39 2015 |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
73 |
@@ -94,7 +94,7 @@ |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
74 |
".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
75 |
|
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
76 |
#else |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
77 |
-#define LUA_ROOT "/usr/local/" |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
78 |
+#define LUA_ROOT "/usr/" |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
79 |
#define LUA_LDIR LUA_ROOT "share/lua/5.1/" |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
80 |
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/" |
|
efcbdc9d6dd8
20983056 lua looks for modules in the wrong place
Danek Duvall <danek.duvall@oracle.com>
parents:
115
diff
changeset
|
81 |
#define LUA_PATH_DEFAULT \ |