diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-09-16 08:20:31 -0400 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-09-16 12:58:57 -0400 |
| commit | 4fe31cee83c91b6dacdaa3448a1e0e69126efb25 (patch) | |
| tree | fd1c63d65a37426da244d0cec48949348e2e822c /scripts/Makefile.headersinst | |
| parent | 2c0baa0bed5f6b374d069074bd29d8a1a9dbab01 (diff) | |
UBUNTU: SAUCE: headers_install: fix #include "..." usage for userspace
When headers are converted to userspace headers they may include
relative includes. For example x86 has the following in its
asm/posix_types.h:
# ifdef __i386__
# include "posix_types_32.h"
# else
# include "posix_types_64.h"
# endif
However this is not safe in the face of the gcc option -I- which removes
"the directory the file I am being included from" from the search list.
Convert these references to <dir/...> form avoiding this.
BugLink: http://bugs.launchpad.net/bugs/824377
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'scripts/Makefile.headersinst')
| -rw-r--r-- | scripts/Makefile.headersinst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index a57f5bd5a13..b4018c57989 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst | |||
| @@ -50,8 +50,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) | |||
| 50 | quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ | 50 | quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ |
| 51 | file$(if $(word 2, $(all-files)),s)) | 51 | file$(if $(word 2, $(all-files)),s)) |
| 52 | cmd_install = \ | 52 | cmd_install = \ |
| 53 | $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \ | 53 | $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(printdir) $(header-y); \ |
| 54 | $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \ | 54 | $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(printdir) $(objhdr-y); \ |
| 55 | for F in $(wrapper-files); do \ | 55 | for F in $(wrapper-files); do \ |
| 56 | echo "\#include <asm-generic/$$F>" > $(install)/$$F; \ | 56 | echo "\#include <asm-generic/$$F>" > $(install)/$$F; \ |
| 57 | done; \ | 57 | done; \ |
