support for tables in (runtime_)external_deps_subdirs.*

author: Philipp Janda <siffiejoe@gmx.net> 2013-09-26 09:02:33 +0200
committer: Philipp Janda <siffiejoe@gmx.net> 2013-09-26 09:02:33 +0200
commit: 4745a6e42598414fb38565c75e84bd13723372ba (patch)
tree: 7a74038ae3237bd55c32e386ecf2e685c8643539 /configure
parent: f63fa840457558595364eec980082f9ae921d086 (diff)
download: luarocks-4745a6e42598414fb38565c75e84bd13723372ba.tar.gz
luarocks-4745a6e42598414fb38565c75e84bd13723372ba.tar.bz2
luarocks-4745a6e42598414fb38565c75e84bd13723372ba.zip
1 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index ee1106dd..0e64fb55 100755
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@ LUA_BINDIR="/usr/bin"
 LUA_INCDIR="/usr/include"
 LUA_LIBDIR="/usr/lib"
 LUA_VERSION="5.1"
-MULTIARCHDIR=""
+MULTIARCH_SUBDIR=""
 # ----------------------------------------------------------------------------
 # FUNCTION DEFINITIONS
@@ -399,10 +399,10 @@ fi
 if [ "$LUAROCKS_UNAME_S" = Linux ]
 then
-   CC_ARCH=`cc -dumpmachine 2>/dev/null`
+   GCC_ARCH=`gcc -dumpspecs 2>/dev/null | grep -A 1 "^*multilib:$" | tail -1 | cut -d: -f3 | cut -d' ' -f1`
-   if [ -n "$CC_ARCH" ]
+   if [ -n "$GCC_ARCH" -a -d "/usr/lib/$GCC_ARCH" ]
   then
-      MULTIARCHDIR="/usr/lib/$CC_ARCH"
+      MULTIARCH_SUBDIR="lib/$GCC_ARCH"
   fi
 fi
@@ -436,7 +436,7 @@ LUAROCKS_UNAME_S=$LUAROCKS_UNAME_S
 LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER
 LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER
 LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR
-LUAROCKS_MULTIARCHDIR=$MULTIARCHDIR
+MULTIARCH_SUBDIR=$MULTIARCH_SUBDIR
 EOF
author	Philipp Janda <siffiejoe@gmx.net>	2013-09-26 09:02:33 +0200
committer	Philipp Janda <siffiejoe@gmx.net>	2013-09-26 09:02:33 +0200
commit	4745a6e42598414fb38565c75e84bd13723372ba (patch)
tree	7a74038ae3237bd55c32e386ecf2e685c8643539 /configure
parent	f63fa840457558595364eec980082f9ae921d086 (diff)
download	luarocks-4745a6e42598414fb38565c75e84bd13723372ba.tar.gz luarocks-4745a6e42598414fb38565c75e84bd13723372ba.tar.bz2 luarocks-4745a6e42598414fb38565c75e84bd13723372ba.zip

diff --git a/configure b/configure index ee1106dd..0e64fb55 100755 --- a/configure +++ b/configure
@@ -14,7 +14,7 @@ LUA_BINDIR="/usr/bin"
14	LUA_INCDIR="/usr/include"	14	LUA_INCDIR="/usr/include"
15	LUA_LIBDIR="/usr/lib"	15	LUA_LIBDIR="/usr/lib"
16	LUA_VERSION="5.1"	16	LUA_VERSION="5.1"
17	MULTIARCHDIR=""	17	MULTIARCH_SUBDIR=""
18		18
19	# ----------------------------------------------------------------------------	19	# ----------------------------------------------------------------------------
20	# FUNCTION DEFINITIONS	20	# FUNCTION DEFINITIONS
@@ -399,10 +399,10 @@ fi
399		399
400	if [ "$LUAROCKS_UNAME_S" = Linux ]	400	if [ "$LUAROCKS_UNAME_S" = Linux ]
401	then	401	then
402	CC_ARCH=`cc -dumpmachine 2>/dev/null`	402	GCC_ARCH=`gcc -dumpspecs 2>/dev/null \| grep -A 1 "^*multilib:$" \| tail -1 \| cut -d: -f3 \| cut -d' ' -f1`
403	if [ -n "$CC_ARCH" ]	403	if [ -n "$GCC_ARCH" -a -d "/usr/lib/$GCC_ARCH" ]
404	then	404	then
405	MULTIARCHDIR="/usr/lib/$CC_ARCH"	405	MULTIARCH_SUBDIR="lib/$GCC_ARCH"
406	fi	406	fi
407	fi	407	fi
408		408
@@ -436,7 +436,7 @@ LUAROCKS_UNAME_S=$LUAROCKS_UNAME_S
436	LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER	436	LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER
437	LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER	437	LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER
438	LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR	438	LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR
439	LUAROCKS_MULTIARCHDIR=$MULTIARCHDIR	439	MULTIARCH_SUBDIR=$MULTIARCH_SUBDIR
440		440
441	EOF	441	EOF
442		442