On 22 December 2011 15:53, Korrawit Pruegsanusak <[email protected]> wrote: > [ build MOD ] hwpfilter > R=/cygdrive/d && S=$R/libo && O=$S/solver/wntmsci12.pro && > W=$S/workdir/wntmsci12.pro && mkdir -p $W/Module/ && touch > $W/Module/hwpfilter > D:/libo/solenv/gbuild/StaticLibrary.mk:49: *** gb_Deliver_deliver: > file does not exist in solver, and cannot be delivered: > /cygdrive/d/libo/solver/wntmsci12.pro/lib/iexttextcat.lib. Stop.
Hmm, strange.. it fails in hwpfilter ? There is no StaticLibrary. I could understand if it were Library_guesslang from lingucomponent.. I wonder if you are the first one trying to build on windows with internal libexttextcat after f9fc46c1ef035516287d09ddca86e1668a79c701 .. > Seems it doesn't found iexttextcat.lib, which I try finding it in > libexttextcat\wntmsci12.pro\lib\ and found only ilibexttextcat.lib and > ilibexttextcat.exp. I tried clean build in both hwpfilter and > libexttextcat but no avail. Maybe do I need to make clean in > tail_build? (I don't like this, because it's very time-consuming) or > git pull -r again? Well, you can try attached patch. Just run make in tail_build, no need for clean. I will test tomorrow for MinGW, if it works we can push.. But I'm a little confused. Matus
From 60d11a0fe90041afd28d4a8a447a8b89c7c148a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <[email protected]> Date: Fri, 23 Dec 2011 01:16:38 +0100 Subject: [PATCH] Repository: fix Windows name for internal libexttextcat --- RepositoryExternal.mk | 4 ++-- RepositoryFixes.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 11896cd..6b9ebc0 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -224,7 +224,7 @@ else # !SYSTEM_LIBEXTTEXTCAT ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - exttextcat \ + libexttextcat \ )) else $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ @@ -235,7 +235,7 @@ endif define gb_LinkTarget__use_libexttextcat ifeq ($(OS),WNT) $(call gb_LinkTarget_add_linked_libs,$(1),\ - exttextcat \ + libexttextcat \ ) else $(call gb_LinkTarget_add_linked_static_libs,$(1),\ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index ff1eb34..ac349ea 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -56,7 +56,6 @@ gb_Library_DLLFILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$ gb_Library_DLLFILENAMES := $(patsubst unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) -gb_Library_FILENAMES := $(patsubst exttextcat:libexttextcat%,exttextcat:libilibexttextcat%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)) @@ -68,6 +67,7 @@ gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dl ifeq ($(COM),GCC) gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst exttextcat:liblibext%,exttextcat:libilibext%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) -- 1.7.1
_______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
