diff options
| author | Brad <brad@comstyle.com> | 2011-08-22 16:39:59 -0400 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-08-27 15:42:02 +0000 |
| commit | 0fc6b5828ff23d81aff6f48cb168bfe82548e1d7 (patch) | |
| tree | 9e9c005ce3f83f4292e178d13271c0cbc3a4f728 /libcacard | |
| parent | cb9c626888c5aa46d440db473e18806c72feb69e (diff) | |
| download | qemu-0fc6b5828ff23d81aff6f48cb168bfe82548e1d7.tar.gz qemu-0fc6b5828ff23d81aff6f48cb168bfe82548e1d7.tar.bz2 qemu-0fc6b5828ff23d81aff6f48cb168bfe82548e1d7.zip | |
Fix build on OpenBSD with BSD userland emu and smartcard NSS enabled
The first issue is the hard coded POSIX Real Time extensions library in the
libcacard/Makefile. From looking at the code it doesn't seem this is necessary
anyway. Robert Relyea seems to think it most likely isn't necessary.
The second issue was the missing exclusion of the BSD userland binary
builds from the addition of this Makefile target for the smartcard NSS
code which breaks the builds if smartcard NSS support is enabled.
pastebin clip of the build failure..
http://pastebin.com/raw.php?i=BLCKd3s6
Signed-off-by: Brad Smith <brad@comstyle.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'libcacard')
| -rw-r--r-- | libcacard/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcacard/Makefile b/libcacard/Makefile index b3f5e6c011..bf052bcc12 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -20,7 +20,7 @@ QEMU_CFLAGS+=$(GLIB_CFLAGS) libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y))) vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o - $(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS) -lrt," LINK $@") + $(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") clean: rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc @@ -39,7 +39,7 @@ install-libcacard: @echo "libtool is missing, please install and rerun configure"; exit 1 else libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB) - $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs) -lrt," lt LINK $@") + $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs)," lt LINK $@") libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in sed -e 's|@LIBDIR@|$(libdir)|' \ |