RepositoryExternal.mk | 24 ++++++++++++++++++--- bean/Library_officebean.mk | 4 --- configure.ac | 2 - external/mingw-externals/Module_mingw-externals.mk | 1 external/mingw-externals/Package_jawt.mk | 16 -------------- external/mingw-externals/Package_mingw_gccdlls.mk | 4 +-- solenv/gbuild/TargetLocations.mk | 6 ++++- 7 files changed, 29 insertions(+), 28 deletions(-)
New commits: commit c5dd6eb9789dce2c23087ba75cf39bf0f91297fb Author: David Tardon <[email protected]> Date: Sat Apr 26 16:43:50 2014 +0200 mixing build path and host exec. name doesn't work Change-Id: I54785205e3884ddf7b94ef7f43617bd329c4e780 diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 4958d4d..0157cd3 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -333,6 +333,10 @@ define gb_Executable_get_filename $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Executable_FILENAMES))) endef +define gb_Executable_get_filename_for_build +$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Executable_FILENAMES_FOR_BUILD))) +endef + # Get dependencies needed for running the executable # # This is not strictly necessary, but it makes the use more similar to @@ -361,7 +365,7 @@ endef ifneq ($(CROSS_COMPILING),) # Can we assume this is used only for executables registered for "NONE"? define gb_Executable_get_target_for_build -$(call gb_Executable__get_dir_for_exe_for_build,$(1))/$(call gb_Executable_get_filename,$(1)) +$(call gb_Executable__get_dir_for_exe_for_build,$(1))/$(call gb_Executable_get_filename_for_build,$(1)) endef else gb_Executable_get_target_for_build = $(gb_Executable_get_target) commit 2a71e15589c9d4304b744aadad77f1b8e4925ca2 Author: David Tardon <[email protected]> Date: Sat Apr 26 16:08:07 2014 +0200 specify linking opts for jawt centrally Change-Id: Idb8d97d44b16bbe41372d97c46199ec786c38218 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ccd2f5b..e9031c6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -762,6 +762,8 @@ endef endif # SYSTEM_CMIS +ifeq ($(ENABLE_JAVA),YES) + ifeq ($(OS)$(COM),WNTGCC) define gb_LinkTarget__use_jawt @@ -772,17 +774,27 @@ $(call gb_LinkTarget_add_ldflags,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - -ljawt \ + $(JAWTLIB) \ ) endef else # $(OS)$(COM) != WNTGCC -gb_LinkTarget__use_jawt := +define gb_LinkTarget__use_jawt +$(call gb_LinkTarget_add_libs,$(1),\ + $(JAWTLIB) \ +) + +endef endif # $(OS)$(COM) = WNTGCC +else # !ENABLE_JAVA + +gb_LinkTarget__use_jawt := + +endif # ENABLE_JAVA ifneq ($(SYSTEM_LIBATOMIC_OPS),) diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 3a66ed2..f05fa30 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -33,8 +33,4 @@ $(eval $(call gb_Library_use_libraries,officebean,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_libs,officebean,\ - $(JAWTLIB) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/configure.ac b/configure.ac index d377325..0f743b9 100644 --- a/configure.ac +++ b/configure.ac @@ -7074,7 +7074,7 @@ then AC_MSG_CHECKING([for JAWT lib]) if test "$_os" = WINNT; then if test "$WITH_MINGW" = yes; then - # The path is presumably taken care of in gb_LinkTarget__use_jawt + # The path is taken care of in gb_LinkTarget__use_jawt # in RepositoryExternal.mk: JAWTLIB=-ljawt else commit 943dedc59c87b15cbccfb7b6b3fc39525de06ff1 Author: David Tardon <[email protected]> Date: Sat Apr 26 15:50:10 2014 +0200 mingw: fix use of jawt Change-Id: I47b4a1f5ca5b8ce3cde11d4db599d6afb54a2886 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a8b9516..ccd2f5b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -765,8 +765,14 @@ endif # SYSTEM_CMIS ifeq ($(OS)$(COM),WNTGCC) define gb_LinkTarget__use_jawt -$(call gb_LinkTarget_use_packages,$(1),\ - jawt \ +$(call gb_LinkTarget_use_custom_headers,$(1),external/jawt) + +$(call gb_LinkTarget_add_ldflags,$(1),\ + -L$(call gb_CustomTarget_get_workdir,external/jawt) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + -ljawt \ ) endef diff --git a/external/mingw-externals/Module_mingw-externals.mk b/external/mingw-externals/Module_mingw-externals.mk index 6d262d8..e630162 100644 --- a/external/mingw-externals/Module_mingw-externals.mk +++ b/external/mingw-externals/Module_mingw-externals.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,mingw-externals)) ifeq ($(OS)$(COM),WNTGCC) $(eval $(call gb_Module_add_targets,mingw-externals,\ CustomTarget_jawt \ - Package_jawt \ Package_mingw_dlls \ Package_mingw_gccdlls \ )) diff --git a/external/mingw-externals/Package_jawt.mk b/external/mingw-externals/Package_jawt.mk deleted file mode 100644 index bd2ed1a..0000000 --- a/external/mingw-externals/Package_jawt.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,jawt,$(call gb_CustomTarget_get_workdir,external/jawt))) - -$(error FIXME do not deliver this stuff to OUTDIR) - -$(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a)) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: commit d9b76eea1c0e534eadf1c57f2fda4b041d258393 Author: David Tardon <[email protected]> Date: Sat Apr 26 15:57:48 2014 +0200 mingw: fix delivery of gcc libs Change-Id: I03c55ceb685b4de580bfc3125792e7a75e133821 diff --git a/external/mingw-externals/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk index 7b30ae1..b5d37c5 100644 --- a/external/mingw-externals/Package_mingw_gccdlls.mk +++ b/external/mingw-externals/Package_mingw_gccdlls.mk @@ -9,9 +9,9 @@ $(eval $(call gb_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin)) -$(error FIXME do not deliver this stuff to OUTDIR) +$(eval $(call gb_Package_set_outdir,mingw_gccdlls,$(INSTDIR))) -$(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\ +$(eval $(call gb_Package_add_files,mingw_gccdlls,program,\ $(if $(MINGW_SHARED_GCCLIB),$(MINGW_GCCDLL)) \ $(if $(MINGW_SHARED_GXXLIB),$(MINGW_GXXDLL)) \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
