Skip to content

Commit

Permalink
Fix 64-bit dependencies
Browse files Browse the repository at this point in the history
This also symlinks busted to busted_bootstrap to avoid a bug caused by luarocks
update
  • Loading branch information
tarruda committed Aug 30, 2014
1 parent 44d9b93 commit b18127a
Show file tree
Hide file tree
Showing 28 changed files with 14 additions and 94 deletions.
41 changes: 0 additions & 41 deletions 32/bin/busted

This file was deleted.

1 change: 1 addition & 0 deletions 32/bin/busted
Binary file modified 32/bin/luajit-2.0.3
Binary file not shown.
Binary file modified 32/lib/libluajit-5.1.a
Binary file not shown.
Binary file modified 32/lib/libmsgpack.a
Binary file not shown.
Binary file modified 32/lib/libmsgpackc.a
Binary file not shown.
Binary file modified 32/lib/libuv.a
Binary file not shown.
2 changes: 1 addition & 1 deletion 32/lib/libuv.la
@@ -1,5 +1,5 @@
# libuv.la - a libtool library file
# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
Expand Down
Binary file modified 32/lib/lua/5.1/cmsgpack.so
Binary file not shown.
Binary file modified 32/lib/lua/5.1/lfs.so
Binary file not shown.
Binary file modified 32/lib/lua/5.1/lpeg.so
Binary file not shown.
2 changes: 1 addition & 1 deletion 32/lib/luarocks/rocks/lpeg/0.12-1/rock_manifest
@@ -1,6 +1,6 @@
rock_manifest = {
lib = {
['lpeg.so'] = "63aa0a113a4a68411914a459125ae9dc"
['lpeg.so'] = "036420f4b64516da3fc86a0429b027e1"
},
['lpeg-0.12-1.rockspec'] = "71500f98f925c5ba73ae9a2a4ae72949",
lua = {
Expand Down
2 changes: 1 addition & 1 deletion 32/lib/luarocks/rocks/lua-cmsgpack/0.3-2/rock_manifest
Expand Up @@ -3,7 +3,7 @@ rock_manifest = {
README = "7f0d4508a2045b1a02a7c2a7a372b891"
},
lib = {
['cmsgpack.so'] = "ba5de6a0202077ebf1f541c67490cbb8"
['cmsgpack.so'] = "a6039c6ce3ff2285a4aab87568a2cb40"
},
['lua-cmsgpack-0.3-2.rockspec'] = "52b998f6f58d0d76ecd05548a328959b"
}
2 changes: 1 addition & 1 deletion 32/lib/luarocks/rocks/luafilesystem/1.6.2-2/rock_manifest
Expand Up @@ -9,7 +9,7 @@ rock_manifest = {
}
},
lib = {
['lfs.so'] = "4c8e6fb2291cc08f32c749cfd0abadd8"
['lfs.so'] = "9df37df9ffea857d69229232a02ba0d9"
},
['luafilesystem-1.6.2-2.rockspec'] = "80f009943cd50342ee4c2779a0e9a9f8",
tests = {
Expand Down
2 changes: 1 addition & 1 deletion 32/share/lua/5.1/luarocks/site_config.lua
Expand Up @@ -10,7 +10,7 @@ site_config.LUAROCKS_FORCE_CONFIG=true
site_config.LUAROCKS_ROCKS_SUBDIR=[[/lib/luarocks/rocks]]
site_config.LUA_DIR_SET=true
site_config.LUAROCKS_UNAME_S=[[Linux]]
site_config.LUAROCKS_UNAME_M=[[i686]]
site_config.LUAROCKS_UNAME_M=[[x86_64]]
site_config.LUAROCKS_DOWNLOADER=[[curl]]
site_config.LUAROCKS_MD5CHECKER=[[md5sum]]
site_config.LUAROCKS_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[lib/i386-linux-gnu]] }, include="include" }
Expand Down
41 changes: 0 additions & 41 deletions bin/busted

This file was deleted.

1 change: 1 addition & 0 deletions bin/busted
Binary file modified bin/luajit-2.0.3
Binary file not shown.
Binary file modified lib/libluajit-5.1.a
Binary file not shown.
Binary file modified lib/libmsgpack.a
Binary file not shown.
Binary file modified lib/libmsgpackc.a
Binary file not shown.
Binary file modified lib/libuv.a
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/libuv.la
@@ -1,5 +1,5 @@
# libuv.la - a libtool library file
# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
Expand Down
Binary file modified lib/lua/5.1/cmsgpack.so
Binary file not shown.
Binary file modified lib/lua/5.1/lfs.so
Binary file not shown.
Binary file modified lib/lua/5.1/lpeg.so
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/luarocks/rocks/lpeg/0.12-1/rock_manifest
@@ -1,6 +1,6 @@
rock_manifest = {
lib = {
['lpeg.so'] = "63aa0a113a4a68411914a459125ae9dc"
['lpeg.so'] = "a327dab54b9ffdb50393d12ce76efb04"
},
['lpeg-0.12-1.rockspec'] = "71500f98f925c5ba73ae9a2a4ae72949",
lua = {
Expand Down
2 changes: 1 addition & 1 deletion lib/luarocks/rocks/lua-cmsgpack/0.3-2/rock_manifest
Expand Up @@ -3,7 +3,7 @@ rock_manifest = {
README = "7f0d4508a2045b1a02a7c2a7a372b891"
},
lib = {
['cmsgpack.so'] = "ba5de6a0202077ebf1f541c67490cbb8"
['cmsgpack.so'] = "7ad00a18c1393d32706da3646e69675f"
},
['lua-cmsgpack-0.3-2.rockspec'] = "52b998f6f58d0d76ecd05548a328959b"
}
2 changes: 1 addition & 1 deletion lib/luarocks/rocks/luafilesystem/1.6.2-2/rock_manifest
Expand Up @@ -9,7 +9,7 @@ rock_manifest = {
}
},
lib = {
['lfs.so'] = "4c8e6fb2291cc08f32c749cfd0abadd8"
['lfs.so'] = "9b5eb53383b95390391191d787bc170b"
},
['luafilesystem-1.6.2-2.rockspec'] = "80f009943cd50342ee4c2779a0e9a9f8",
tests = {
Expand Down
6 changes: 3 additions & 3 deletions share/lua/5.1/luarocks/site_config.lua
Expand Up @@ -10,9 +10,9 @@ site_config.LUAROCKS_FORCE_CONFIG=true
site_config.LUAROCKS_ROCKS_SUBDIR=[[/lib/luarocks/rocks]]
site_config.LUA_DIR_SET=true
site_config.LUAROCKS_UNAME_S=[[Linux]]
site_config.LUAROCKS_UNAME_M=[[i686]]
site_config.LUAROCKS_UNAME_M=[[x86_64]]
site_config.LUAROCKS_DOWNLOADER=[[curl]]
site_config.LUAROCKS_MD5CHECKER=[[md5sum]]
site_config.LUAROCKS_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[lib/i386-linux-gnu]] }, include="include" }
site_config.LUAROCKS_RUNTIME_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[lib/i386-linux-gnu]] }, include="include" }
site_config.LUAROCKS_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[lib/x86_64-linux-gnu]] }, include="include" }
site_config.LUAROCKS_RUNTIME_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[lib/x86_64-linux-gnu]] }, include="include" }
return site_config

0 comments on commit b18127a

Please sign in to comment.