liborcus/ExternalPackage_liborcus.mk | 22 ----------------------
liborcus/Module_liborcus.mk | 1 -
solenv/gbuild/Library.mk | 1 -
solenv/gbuild/TargetLocations.mk | 2 --
solenv/gbuild/platform/IOS_ARM_GCC.mk | 1 -
solenv/gbuild/platform/com_MSC_class.mk | 1 -
solenv/gbuild/platform/macosx.mk | 1 -
solenv/gbuild/platform/solaris.mk | 6 +-----
solenv/gbuild/platform/unxgcc.mk | 1 -
9 files changed, 1 insertion(+), 35 deletions(-)
New commits:
commit 337e983a0eec62a69297df7f7c611ca3a9fdbb14
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Sep 24 09:45:18 2013 +0200
stop delivering orcus static libraries
They are missing in 425d8fd12e5f782739a970871ec8f9832dea720c
Change-Id: Ia624fc2fcd5637b82f819f4b54d8dbcc288e185d
diff --git a/liborcus/ExternalPackage_liborcus.mk
b/liborcus/ExternalPackage_liborcus.mk
deleted file mode 100644
index 8381e76..0000000
--- a/liborcus/ExternalPackage_liborcus.mk
+++ /dev/null
@@ -1,22 +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_ExternalPackage_ExternalPackage,liborcus,liborcus))
-
-$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
-
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call
gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,src/liborcus/.libs/liborcus-0.6.lib))
-$(eval $(call
gb_ExternalPackage_add_file,liborcus,lib/orcus-parser.lib,src/parser/.libs/liborcus-parser-0.6.lib))
-else
-$(eval $(call
gb_ExternalPackage_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.6.a))
-$(eval $(call
gb_ExternalPackage_add_file,liborcus,lib/liborcus-parser.a,src/parser/.libs/liborcus-parser-0.6.a))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/liborcus/Module_liborcus.mk b/liborcus/Module_liborcus.mk
index d290e86..e3c9639 100644
--- a/liborcus/Module_liborcus.mk
+++ b/liborcus/Module_liborcus.mk
@@ -13,7 +13,6 @@ ifeq ($(ENABLE_ORCUS)-$(SYSTEM_LIBORCUS),TRUE-NO)
$(eval $(call gb_Module_add_targets,liborcus,\
ExternalProject_liborcus \
- ExternalPackage_liborcus \
UnpackedTarball_liborcus \
))
commit a2a5483ba69bcedaed5aa18a99fc56f2ce6a2c40
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Sep 23 16:59:41 2013 +0200
gbuild: remove unused gb_CppunitTest_LIBDIR
Change-Id: I42ffe7c32d249bdd9cfa03800e78c431df0bb52f
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index a5f241f..b151a16 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -211,7 +211,6 @@ endef
# CppunitTest class
gb_CppunitTest_CPPTESTPRECOMMAND := :
-gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
gb_CppunitTest_get_filename = libtest_(1).a
gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 421a020..2648591 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -389,7 +389,6 @@ gb_CppunitTest_DEFS := -D_DLL
# thus it won't find its DLLs unless ${OUTDIR}/bin is added to PATH.
gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path):"$(shell cygpath
-w $(gb_Library_DLLDIR))"
-gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
gb_CppunitTest_get_filename = test_$(1).dll
gb_CppunitTest_get_ilibfilename = itest_$(1).lib
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index fbef9ba..670d625 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -279,7 +279,6 @@ endef
# CppunitTest class
gb_CppunitTest_CPPTESTPRECOMMAND :=
$(gb_Helper_set_ld_path):"$(gb_Library_DLLDIR)"
-gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
gb_CppunitTest_get_filename = libtest_$(1).dylib
gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 3f3891c..e0f7055 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -302,7 +302,6 @@ endef
gb_CppunitTest_CPPTESTPRECOMMAND := \
$(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
-gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
gb_CppunitTest_get_filename = libtest_$(1).so
gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index f6063be..a6f4f62 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -301,7 +301,6 @@ endef
gb_CppunitTest_CPPTESTPRECOMMAND := \
$(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
-gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
gb_CppunitTest_get_filename = libtest_$(1).so
gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
commit 94159a7ffdd50bcd362794c474043d6d3d8723b5
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Sep 23 16:17:46 2013 +0200
gbuild: remove now unused gb_Library_OUTDIRLOCATION
Change-Id: I696b550b495d1bf6549e3c54a3157d467a7ead8d
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 5febb97..dd42286 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -21,7 +21,6 @@
# Library class
# defined globally in TargetLocations.mk
-# gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib
# gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library
# defined by platform
# gb_Library_DEFS
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index f607ffe..5e16f47 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -432,8 +432,6 @@ gb_StaticLibrary_WORKDIR =
$(WORKDIR)/LinkTarget/StaticLibrary
gb_Library_WORKDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Library
gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable
gb_Executable_BINDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Executable
-# FIXME move platform
-gb_Library_OUTDIRLOCATION = $(if $(filter
WNT,$(OS)),$(OUTDIR)/bin,$(OUTDIR)/lib)
gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 4877af4..3f3891c 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -259,7 +259,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
-#JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
define gb_Library__get_rpath
$(if $(1),$(strip '-Wl,-rpath,$(1)'))
endef
@@ -286,9 +285,7 @@ gb_Executable_LAYER := \
define gb_Executable__get_rpath
-$(strip $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') \
--L$(gb_Library_OUTDIRLOCATION))
-#JAD#-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
+$(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)')
endef
define gb_Executable_get_rpath
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
