diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-03-16 13:11:38 +0200 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-03-22 16:30:20 +0100 |
| commit | 2cbc13e8d14aabb4523a3a0e4439d8a25839110c (patch) | |
| tree | 17482bfbd55776c0c613e11ba9c143ed9c85e504 | |
| parent | f2f55a80cbd7a439d1cb23b50815949ff8a2f423 (diff) | |
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@gmail.com>
Reviewed-on: http://review.coreboot.org/2771
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | SerialICE/patches/lua-5.2.0-shared.diff | 2 | ||||
| -rw-r--r-- | qemu-0.15.x/build.sh | 2 | ||||
| -rwxr-xr-x | 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 |