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 /xmlsecurity | |
| 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 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index e8fb908e9162..164bec2a983b 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -32,17 +32,6 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_NO_XSLT \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - xmlsec1 \ -)) -else -$(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\ - xmlsec1 \ -)) -endif - - $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ comphelper \ cppu \ @@ -88,6 +77,7 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ )) $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ + xmlsec1 \ xmlsec1-mscrypto \ )) @@ -115,11 +105,13 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ ifeq ($(OS)$(CROSS_COMPILING),WNTYES) $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ + xmlsec1 \ xmlsec1-nss \ )) else -$(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\ - xmlsec1-nss \ +$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ + $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \ + $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \ )) endif |