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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Oct 30 21:21:57 2011 UTC (2 years, 10 months ago) by flameeyes
Branch: MAIN
CVS Tags: HEAD
As discussed with Rafael: version bump with a twist: cleanup versioning so that it's more reliable. Consider this experimental as it breaks compatibility with about everything, and it might just be dropped if upstream takes a different road.

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

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

  ViewVC Help
Powered by ViewVC 1.1.20