From b3ca84430d98f5338b9b1bc817c3656efb71cff1 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 13 Sep 2011 15:32:16 -0500 Subject: [PATCH] xfree86: Work around issue where ar may be told to make an archive with no contents Automake: "Be careful when selecting library components conditionally. Because building an empty library is not portable, you should ensure that any library always contains at least one object." Signed-off-by: Jeremy Huddleston Reviewed-by: Gaetan Nadon --- hw/xfree86/os-support/bus/Makefile.am | 2 +- hw/xfree86/os-support/bus/nobus.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 hw/xfree86/os-support/bus/nobus.c diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index b1ca8f98f..16c10213c 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -12,7 +12,7 @@ PLATFORM_SOURCES = Sbus.c sdk_HEADERS += xf86Sbus.h endif -libbus_la_SOURCES = $(PCI_SOURCES) $(PLATFORM_SOURCES) +libbus_la_SOURCES = $(PCI_SOURCES) $(PLATFORM_SOURCES) nobus.c INCLUDES = $(XORG_INCS) diff --git a/hw/xfree86/os-support/bus/nobus.c b/hw/xfree86/os-support/bus/nobus.c new file mode 100644 index 000000000..ad23f5288 --- /dev/null +++ b/hw/xfree86/os-support/bus/nobus.c @@ -0,0 +1 @@ +static void __noop_to_appease_ar__() { return; }