From 9c955da155512ae91a33ec536c0050460c2a7e35 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 14 Mar 2010 18:41:56 +0000 Subject: [PATCH] Fix klibc Debian specific build trouble Simply remove the headers_install invocation and rely on linux-libc-dev. With these changes: (the extra chmod was needed to allow for umask > 022) I could compile, link and run this program: #include int main(void) { write(1, "Hello world\n", 12); return 0; } Signed-off-by: Ben Hutchings [ added multi arch support ] Signed-off-by: Colin Watson Signed-off-by: maximilian attems [ fixed cross building ] Signed-off-by: Marcin Juszkiewicz Gbp-Pq: Name klibc-linux-libc-dev --- scripts/Kbuild.install | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install index 78c30aa..93c0396 100644 --- a/scripts/Kbuild.install +++ b/scripts/Kbuild.install @@ -95,7 +95,12 @@ header: $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin - $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install + $(Q)for x in /usr/include/linux /usr/include/asm*; do \ + ln -s $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ + done + $(Q)if [ -n "$(DEB_HOST_MULTIARCH)" ]; then \ + ln -sf /usr/include/$(DEB_HOST_MULTIARCH)/asm $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ + fi $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 -- 2.30.2