[SerialICE] New patch to review for serialice: 836b5a1 Fix generation of shared LUA library.

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2771

-gerrit

commit 836b5a11c3f1703b781e4e526c392346bee86a8d
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sat Mar 16 13:11:38 2013 +0200

    Fix generation of shared LUA library.
    
    Include library dependencies '-lm -ldl' in the generation
    of the shared LUA library already, in case user has to install
    patched LUA from source.
    
    Change-Id: I90e46828ea72862f7d06002df230dd6f348437eb
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 SerialICE/patches/lua-5.2.0-shared.diff | 2 +-
 qemu-0.15.x/build.sh                    | 2 +-
 qemu-0.15.x/configure                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SerialICE/patches/lua-5.2.0-shared.diff b/SerialICE/patches/lua-5.2.0-shared.diff
index 465adf2..4b8aaaf 100644
--- a/SerialICE/patches/lua-5.2.0-shared.diff
+++ b/SerialICE/patches/lua-5.2.0-shared.diff
@@ -35,7 +35,7 @@ diff -ur lua-5.2.0/src/Makefile lua-5.2.0-shared/src/Makefile
  	$(RANLIB) $@
  
 +$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -o $@ -shared $?
++	$(CC) -o $@ -shared $? -lm -ldl
 +
  $(LUA_T): $(LUA_O) $(LUA_A)
  	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
diff --git a/qemu-0.15.x/build.sh b/qemu-0.15.x/build.sh
index 2cac6f5..34b564c 100644
--- a/qemu-0.15.x/build.sh
+++ b/qemu-0.15.x/build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-./configure --extra-ldflags="-ldl" --disable-kvm --disable-sdl --enable-serialice \
+./configure --disable-kvm --disable-sdl --enable-serialice \
 	    --target-list="x86_64-softmmu, i386-softmmu"
 
 make
diff --git a/qemu-0.15.x/configure b/qemu-0.15.x/configure
index 29f4a1b..5eed581 100755
--- a/qemu-0.15.x/configure
+++ b/qemu-0.15.x/configure
@@ -1738,7 +1738,7 @@ EOF
 
   if test "$got_lua" != "yes" ; then
     lua_cflags="-I/usr/local/include"
-    lua_ldflags="-L/usr/local/lib -llua -lm"
+    lua_ldflags="-L/usr/local/lib -llua"
     if compile_prog "$lua_cflags" "$lua_ldflags" > /dev/null 2> /dev/null ; then
       got_lua=yes
     fi