diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-20 22:24:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-20 22:26:33 +0100 |
| commit | adbe531ef00b8149f9c09c27928746a6ed595043 (patch) | |
| tree | 17049ffc0306cc09022284be11d6c98f830c741d /cairo | |
| parent | de14220ae5b5e512007df004acec16812992f5f4 (diff) | |
cairo: to actually use the right cairo-version.h...
...it is necessary to overwrite dummy src/cairo-version.h because that
is included with "" from src/cairo.h which means that at least GCC 4.7
looks in the current directory src/ first...
Change-Id: I4a254021ad318ffb428242443f7e1e29c876915c
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/ExternalProject_cairo.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index cb51d62be093..54a220b459e1 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -26,6 +26,9 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : else +# overwrite src/cairo-version.h because that is just a dummy file and included +# from cairo.h in non-overridable way + $(call gb_ExternalProject_get_state_target,cairo,build) : cd $(EXTERNAL_WORKDIR) \ && ./configure \ @@ -46,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && cp cairo-version.h src/cairo-version.h \ && cd src && $(MAKE) \ && touch $@ |