From 6fa2f65fa28c0eebb736108d55b723e1a207c243 Mon Sep 17 00:00:00 2001 From: Jeremie Koenig Date: Mon, 16 Aug 2010 13:51:21 +0200 Subject: Fix the build system to handle part stores Part stores are used for debian-installer, and they're considered more elegant than kernel partition devices. This patch makes sure they're included in the build unless the user disables them explicitely. * Makeconf: add $(PARTED_LIBS) to static binaries which use libstore_part.a. * configure.in: look for libparted again (see also 7c7a04eb). * libstore/Makefile (store-types): include the 'part' store type when appropriate, remove the previous attempt. Signed-off-by: Jeremie Koenig --- Makeconf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makeconf') diff --git a/Makeconf b/Makeconf index 282437d4..8c2bd0c9 100644 --- a/Makeconf +++ b/Makeconf @@ -325,7 +325,8 @@ $(progtarg): %$(target-suffix): $(BUGADDR) $(addsuffix .static,$(progtarg)): %$(target-suffix).static: $(BUGADDR) $(link-executable) -static \ '-Wl,-(' $(patsubst %.so,%.a,$^) $($*-LDLIBS) $(LDLIBS) \ - '-Wl,-)' + '-Wl,-)' \ + $(and $(filter %/libstore_part.a,$^), $(PARTED_LIBS)) endif # Just like above, but tell how to make .prof versions of programs. @@ -468,6 +469,7 @@ relink: # Tell make where to find other -l libraries that we use vpath libutil.% $(libdir)/ +# The libstore_%.a files fetch symbols from libstore.so ifneq ($(dir),libstore) $(boot-store-types:%=../libstore/libstore_%.a): ../libstore/libstore.so endif -- cgit v1.2.3