diff options
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/ExternalProject_cairo.mk | 13 | ||||
| -rw-r--r-- | cairo/ExternalProject_pixman.mk | 16 |
2 files changed, 15 insertions, 14 deletions
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index 54a220b459e1..8d2118989fcf 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -20,9 +20,10 @@ $(eval $(call gb_ExternalProject_register_targets,cairo,\ ifeq ($(OS)$(COM),WNTMSC) $(call gb_ExternalProject_get_state_target,cairo,build) : - cd $(EXTERNAL_WORKDIR) \ - && $(MAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=zlib.lib \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + $(MAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=zlib.lib \ + ) + else @@ -30,8 +31,8 @@ else # from cairo.h in non-overridable way $(call gb_ExternalProject_get_state_target,cairo,build) : - cd $(EXTERNAL_WORKDIR) \ - && ./configure \ + $(call gb_ExternalProject_run,build,\ + ./configure \ $(if $(debug),STRIP=" ") \ CFLAGS="$(if $(debug),-g) $(SOLARINC)" \ LDFLAGS='-L$(OUTDIR)/lib' \ @@ -51,7 +52,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && cp cairo-version.h src/cairo-version.h \ && cd src && $(MAKE) \ - && touch $@ + ) endif diff --git a/cairo/ExternalProject_pixman.mk b/cairo/ExternalProject_pixman.mk index 4cc3dc9232dc..c8cad9be625e 100644 --- a/cairo/ExternalProject_pixman.mk +++ b/cairo/ExternalProject_pixman.mk @@ -18,27 +18,27 @@ $(eval $(call gb_ExternalProject_register_targets,pixman,\ ifeq ($(OS)$(COM),WNTMSC) $(call gb_ExternalProject_get_state_target,pixman,build) : - cd $(EXTERNAL_WORKDIR)/pixman \ - && $(MAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + $(MAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release \ + ,pixman) else # ANDROID: -# The pixman-cpu.c code wants to read /proc/<pid>/auxv, but +# The pixman-cpu.c code wants to read /proc/<pid>/auxv, but # the Android headers don't define Elf32_auxv_t. # # Maybe we should instead just patch the arm_has_* booleans in # pixman-cpu.c to be hardcoded as TRUE and patch out the run-time # check? $(call gb_ExternalProject_get_state_target,pixman,build) : - cd $(EXTERNAL_WORKDIR) \ - && ./configure \ + $(call gb_ExternalProject_run,build,\ + ./configure \ $(if $(filter MACOSX IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(MAKE) \ - && touch $@ + && $(MAKE) \ + ) endif |