1 | From: Ben Hutchings <ben@decadent.org.uk> |
---|
2 | Date: Sun, 14 Mar 2010 18:41:56 +0000 |
---|
3 | Subject: Fix klibc Debian specific build trouble |
---|
4 | |
---|
5 | Simply remove the headers_install invocation and rely on linux-libc-dev. |
---|
6 | |
---|
7 | With these changes: |
---|
8 | |
---|
9 | (the extra chmod was needed to allow for umask > 022) I could compile, |
---|
10 | link and run this program: |
---|
11 | |
---|
12 | #include <unistd.h> |
---|
13 | |
---|
14 | int main(void) |
---|
15 | { |
---|
16 | write(1, "Hello world\n", 12); |
---|
17 | return 0; |
---|
18 | } |
---|
19 | |
---|
20 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
---|
21 | [ added multi arch support ] |
---|
22 | Signed-off-by: Colin Watson <cjwatson@ubuntu.com> |
---|
23 | Signed-off-by: maximilian attems <max@stro.at> |
---|
24 | [ fixed cross building ] |
---|
25 | Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> |
---|
26 | --- |
---|
27 | Index: klibc-2.0~rc2/scripts/Kbuild.install |
---|
28 | =================================================================== |
---|
29 | --- klibc-2.0~rc2.orig/scripts/Kbuild.install 2012-02-11 18:50:21.000000000 +0000 |
---|
30 | +++ klibc-2.0~rc2/scripts/Kbuild.install 2012-02-11 19:04:52.000000000 +0000 |
---|
31 | @@ -95,7 +95,12 @@ |
---|
32 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include |
---|
33 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib |
---|
34 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin |
---|
35 | - $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install |
---|
36 | + $(Q)for x in /usr/include/linux /usr/include/asm*; do \ |
---|
37 | + ln -s $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ |
---|
38 | + done |
---|
39 | + $(Q)if [ -n "$(DEB_HOST_MULTIARCH)" ]; then \ |
---|
40 | + ln -sf /usr/include/$(DEB_HOST_MULTIARCH)/asm $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ |
---|
41 | + fi |
---|
42 | $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. |
---|
43 | $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include |
---|
44 | $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 |
---|
45 | |
---|