diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-11-09 16:49:59 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-11-15 13:42:34 +0100 |
| commit | b8bd25548eb8d13db07ed976c47071a951ded786 (patch) | |
| tree | a812e78c867ebf57cc62338dfb5c6dc8dee29e32 | |
| parent | d106203216ca2dc741994b4275df9424e5f3466a (diff) | |
let's have only one orcus library in solver
Change-Id: Ida46affca95fcd582206d79ff7a5b4d48ed92e12
| -rw-r--r-- | RepositoryFixes.mk | 2 | ||||
| -rw-r--r-- | liborcus/Package_liborcus.mk | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 51e82413ac91..55f5ed726db4 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -91,8 +91,6 @@ gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) -gb_StaticLibrary_FILENAMES := $(patsubst orcus:liborcus%,orcus:liborcus-0.2%,$(gb_StaticLibrary_FILENAMES)) - # Libraries not provided by mingw(-w64), available only in the Windows # SDK. So if these actually are liked with somewhere, we can't # cross-compile that module then using MinGW. That needs to be fixed diff --git a/liborcus/Package_liborcus.mk b/liborcus/Package_liborcus.mk index bfd9b9f994ad..57e5ea9b8d7b 100644 --- a/liborcus/Package_liborcus.mk +++ b/liborcus/Package_liborcus.mk @@ -14,7 +14,6 @@ $(eval $(call gb_Package_use_external_project,liborcus,liborcus)) ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Package_add_file,liborcus,lib/orcus.lib,vsprojects/liborcus-static-nozip/Release/orcus.lib)) else -$(eval $(call gb_Package_add_file,liborcus,lib/liborcus-0.2.a,src/liborcus/.libs/liborcus-0.2.a)) $(eval $(call gb_Package_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.2.a)) endif |