/[gentoo-x86]/dev-lang/luajit/files/LuaJIT-2.0.0-beta10-gentoo.patch
Gentoo

Contents of /dev-lang/luajit/files/LuaJIT-2.0.0-beta10-gentoo.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun May 13 20:37:14 2012 UTC (2 years, 1 month ago) by rafaelmartins
Branch: MAIN
CVS Tags: HEAD
Version bump. Thanks to Paulo Matias.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

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

  ViewVC Help
Powered by ViewVC 1.1.20