diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-19 19:28:36 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:33 +0200 |
| commit | 2f6261fa07e496439e4476d2be2c4c9bca9e6e52 (patch) | |
| tree | b4d42a82b581c1ab0c47d14eb2b066a191e2264b /cairo | |
| parent | 8b4deabeedd09f5968fa90ae04209ded4a717f6f (diff) | |
find lots of external static libraries in UnpackedTarball dir
Note: do NOT put file paths to static libraries into FOO_LIBS variables
that are passed to bundled externals that are built with --enable-static:
on Mac OS X this will result in .a archives that contain other .a
archives as entries, and trying to link those results in errors like:
ld: warning: ignoring file .../libodfgen-0.0.a, file was built for
archive which is not the architecture being linked (i386)
Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/ExternalProject_cairo.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index 1aac70226948..90420f63dde3 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -33,12 +33,11 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : ./configure \ $(if $(debug),STRIP=" ") \ CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" \ - LDFLAGS='-L$(OUTDIR)/lib' \ $(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \ - ZLIB3RDLIB=-lz \ + ZLIB3RDLIB="$(if $(filter YES,$(SYSTEM_ZLIB)),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \ png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ |