Patchwork [1/1] UBUNTU: [Config] include include/generated/compile.h

login
register
mail settings
Submitter Andy Whitcroft
Date May 22, 2012, 11:39 a.m.
Message ID <1337686748-2954-2-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/160615/
State New
Headers show

Comments

Andy Whitcroft - May 22, 2012, 11:39 a.m.
When we prepare the headers all the generated header files are
built and installed into the new headers directory, all except for
include/generated/compile.h which is actually only made when version.o
is built.  This header is used and needed by several external modules
for their version checks.

As we build the headers after we build the main build directory we are
able to pull this header out of the binary build directory.  All other
generated headers are build during the prepare phase.

BugLink: http://bugs.launchpad.net/bugs/942569
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/rules.d/2-binary-arch.mk |    3 +++
 1 file changed, 3 insertions(+)
Tim Gardner - May 22, 2012, 12:17 p.m.

Patch

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 4f8fdaf..ad8c812 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -184,6 +184,9 @@  endif
 	# We'll symlink this stuff
 	rm -f $(hdrdir)/Makefile
 	rm -rf $(hdrdir)/include2
+	# Copy over the compilation version.
+	cp "$(builddir)/build-$*/include/generated/compile.h" \
+		"$(hdrdir)/include/generated/compile.h"
 	# powerpc seems to need some .o files for external module linking. Add them in.
 ifeq ($(arch),powerpc)
 	mkdir -p $(hdrdir)/arch/powerpc/lib