1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
|
diff -ru LuaJIT-2.0.0-beta10.orig/etc/luajit.pc LuaJIT-2.0.0-beta10/etc/luajit.pc
--- LuaJIT-2.0.0-beta10.orig/etc/luajit.pc 2012-05-12 22:55:18.768282860 -0300
+++ LuaJIT-2.0.0-beta10/etc/luajit.pc 2012-05-12 22:55:48.412282447 -0300
@@ -3,13 +3,13 @@
minver=0
relver=0
version=${majver}.${minver}.${relver}-beta10
-abiver=5.1
+abiver=jit-5.1
-prefix=/usr/local
+prefix=/usr
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@LIBDIR@
libname=luajit-${abiver}
-includedir=${prefix}/include/luajit-${majver}.${minver}
+includedir=${prefix}/include/luajit-@SHORTVER@
INSTALL_LMOD=${prefix}/share/lua/${abiver}
INSTALL_CMOD=${prefix}/lib/lua/${abiver}
diff -ru LuaJIT-2.0.0-beta10.orig/Makefile LuaJIT-2.0.0-beta10/Makefile
--- LuaJIT-2.0.0-beta10.orig/Makefile 2012-05-12 22:55:18.764282863 -0300
+++ LuaJIT-2.0.0-beta10/Makefile 2012-05-12 22:58:17.928279877 -0300
@@ -18,37 +18,38 @@
RELVER= 0
PREREL= -beta10
VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
-ABIVER= 5.1
-NODOTABIVER= 51
+SHORTVER= $(MAJVER).$(MINVER)
+ABIVER= jit-$(SHORTVER)
+NODOTSHORTVER= $(MAJVER)$(MINVER)
##############################################################################
#
# Change the installation path as needed. This automatically adjusts
# the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
#
-export PREFIX= /usr/local
+export PREFIX= /usr
##############################################################################
DPREFIX= $(DESTDIR)$(PREFIX)
INSTALL_BIN= $(DPREFIX)/bin
-INSTALL_LIB= $(DPREFIX)/lib
+INSTALL_LIB= $(DPREFIX)/$(LIBDIR)
INSTALL_SHARE= $(DPREFIX)/share
-INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
+INSTALL_INC= $(DPREFIX)/include/luajit-$(SHORTVER)
-INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit
+INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(SHORTVER)/jit
INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER)
INSTALL_CMOD= $(INSTALL_LIB)/lua/$(ABIVER)
INSTALL_MAN= $(INSTALL_SHARE)/man/man1
INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
-INSTALL_TNAME= luajit-$(VERSION)
+INSTALL_TNAME= luajit-$(SHORTVER)
INSTALL_TSYMNAME= luajit
-INSTALL_ANAME= libluajit-$(ABIVER).a
-INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
-INSTALL_SOSHORT= libluajit-$(ABIVER).so
-INSTALL_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib
-INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(MAJVER).dylib
+INSTALL_ANAME= libluajit-$(SHORTVER).a
+INSTALL_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
+INSTALL_SOSHORT= libluajit-$(SHORTVER).so
+INSTALL_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+INSTALL_DYLIBSHORT1= libluajit-$(NODOTSHORTVER).dylib
+INSTALL_DYLIBSHORT2= libluajit-$(NODOTSHORTVER).$(MAJVER).dylib
INSTALL_PCNAME= luajit.pc
INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
@@ -57,7 +58,7 @@
INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
-INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
+INSTALL_PC= $(INSTALL_PKGCONFIG)/luajit-$(SHORTVER).pc
INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
$(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
@@ -68,7 +69,7 @@
INSTALL_X= install -m 0755
INSTALL_F= install -m 0644
LDCONFIG= ldconfig -n
-SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|"
+SED_PC= sed -e "s|@SHORTVER@|$(SHORTVER)|" -e "s|@LIBDIR@|$(LIBDIR)|"
FILE_T= luajit
FILE_A= libluajit.a
@@ -108,7 +109,7 @@
$(LDCONFIG) $(INSTALL_LIB) && \
$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
- cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
+ cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)/luajit-$(SHORTVER).1
cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
$(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
$(RM) $(FILE_PC).tmp
diff -ru LuaJIT-2.0.0-beta10.orig/src/luaconf.h LuaJIT-2.0.0-beta10/src/luaconf.h
--- LuaJIT-2.0.0-beta10.orig/src/luaconf.h 2012-05-12 22:55:18.776282852 -0300
+++ LuaJIT-2.0.0-beta10/src/luaconf.h 2012-05-12 23:00:29.024277594 -0300
@@ -22,16 +22,16 @@
#define LUA_CPATH_DEFAULT \
".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
#else
-#define LUA_ROOT "/usr/local/"
-#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
-#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+#define LUA_ROOT "/usr/"
+#define LUA_LDIR LUA_ROOT "share/lua/jit-2.0/"
+#define LUA_CDIR LUA_ROOT "lib/lua/jit-2.0/"
#ifdef LUA_XROOT
-#define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta10/"
+#define LUA_JDIR LUA_XROOT "share/luajit-2.0/"
#define LUA_XPATH \
- ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
-#define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;"
+ ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/jit-2.0/?/init.lua"
+#define LUA_XCPATH LUA_XROOT "lib/lua/jit-2.0/?.so;"
#else
-#define LUA_JDIR LUA_ROOT "share/luajit-2.0.0-beta10/"
+#define LUA_JDIR LUA_ROOT "share/luajit-2.0/"
#define LUA_XPATH
#define LUA_XCPATH
#endif
diff -ru LuaJIT-2.0.0-beta10.orig/src/Makefile LuaJIT-2.0.0-beta10/src/Makefile
--- LuaJIT-2.0.0-beta10.orig/src/Makefile 2012-05-12 22:55:18.772282855 -0300
+++ LuaJIT-2.0.0-beta10/src/Makefile 2012-05-12 23:01:37.340276596 -0300
@@ -13,8 +13,8 @@
MAJVER= 2
MINVER= 0
RELVER= 0
-ABIVER= 5.1
-NODOTABIVER= 51
+SHORTVER= $(MAJVER).$(MINVER)
+NODOTSHORTVER= $(MAJVER)$(MINVER)
##############################################################################
############################# COMPILER OPTIONS #############################
@@ -204,10 +204,9 @@
TARGET_AR= $(CROSS)ar rcus
TARGET_STRIP= $(CROSS)strip
-TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)
-TARGET_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).dylib
-TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/lib/$(TARGET_DYLIBNAME)
-TARGET_DLLNAME= lua$(NODOTABIVER).dll
+TARGET_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
+TARGET_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+TARGET_DLLNAME= lua$(NODOTSHORTVER).dll
TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
TARGET_DYNXLDOPTS=
@@ -476,10 +475,8 @@
endif
endif
-Q= @
-E= @echo
-#Q=
-#E= @:
+Q=
+E= @:
##############################################################################
# Make targets.
|
GitWeb