Fixes for cross-compilation on OS X (to iOS)

Introduce SDKDIRNAME as a configury variable and use it instead of the
gbuild gb_Package_SDKDIRNAME. Then we can easily construct the
SDKDIRNAME_FOR_BUILD variant that is needed to find the specially
named SDK in instdir on OS X when cross-compiling.

Move the version number section in configure.ac earlier.

Change-Id: Iee3db1a50ad4c7a9f91bbc5e0d0b01d76a76f701

12 files changed, 10 insertions, 31 deletions

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 2fd5c1d7444a..328b6398801d 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -25,13 +25,13 @@
 gb_Executable_LAYER_DIRS := \
 	UREBIN:$(INSTROOT)/$(LIBO_URE_BIN_FOLDER) \
 	OOO:$(INSTROOT)/$(LIBO_BIN_FOLDER) \
-	SDKBIN:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/bin \
+	SDKBIN:$(INSTDIR)/$(SDKDIRNAME)/bin \
 	NONE:$(gb_Executable_BINDIR) \
 
 gb_Executable_LAYER_DIRS_FOR_BUILD := \
 	UREBIN:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_BIN_FOLDER_FOR_BUILD) \
 	OOO:$(INSTROOT_FOR_BUILD)/$(LIBO_BIN_FOLDER_FOR_BUILD) \
-	SDKBIN:$(INSTDIR_FOR_BUILD)/$(gb_Package_SDKDIRNAME)/bin \
+	SDKBIN:$(INSTDIR_FOR_BUILD)/$(SDKDIRNAME_FOR_BUILD)/bin \
 	NONE:$(gb_Executable_BINDIR_FOR_BUILD) \
 
 $(dir $(call gb_Executable_get_runtime_target,%)).dir :
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index e0ad137a1cfd..5eb7c2adb824 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -50,7 +50,7 @@ gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library
 gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1)))
 gb_Library_get_install_target = $(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1))
 
-gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(INSTDIR)/$(gb_Package_SDKDIRNAME)/lib/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1)))
+gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(INSTDIR)/$(SDKDIRNAME)/lib/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1)))
 
 define gb_Library_Library
 $(call gb_Postprocess_register_target,AllLibraries,Library,$(1))
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 606bca3501df..595ad859aabd 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -65,9 +65,6 @@ endef
 
 gb_Package_PROGRAMDIRNAME := $(LIBO_BIN_FOLDER)
 
-# defined by platform
-#  gb_Package_SDKDIRNAME
-
 $(dir $(call gb_Package_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 6cf9434177b6..747c50b5a20a 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -231,7 +231,7 @@ $(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)).export
 endef
 
 define gb_Library_get_versionlink_target
-$(INSTDIR)/$(gb_Package_SDKDIRNAME)/lib/$(basename $(call gb_Library_get_filename,$(1)))
+$(INSTDIR)/$(SDKDIRNAME)/lib/$(basename $(call gb_Library_get_filename,$(1)))
 endef
 
 gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 455cbec814a6..1b6494116f3c 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -55,7 +55,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1
 endef
 
 define gb_UnoApi__add_idlfile
-$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/idl/%,$(2).idl),$(2).idl)
+$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(SDKDIRNAME)/idl/%,$(2).idl),$(2).idl)
 
 endef
 
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 8d4f7ebd3835..a5f241f2925f 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -196,10 +196,10 @@ gb_Executable_EXT :=
 gb_Executable_TARGETTYPEFLAGS := 
 
 gb_Executable_LAYER := \
-	$(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \
-	$(foreach exe,$(gb_Executable_SDK),$(exe):OOO) \
+	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
 	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
-	$(foreach exe,$(gb_Executable_NONE),$(exe):OOO) \
+	$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
 
 
 define gb_Executable_Executable_platform
@@ -257,9 +257,6 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
-# Package class
-gb_Package_SDKDIRNAME := sdk
-
 # UIMenubarTarget class
 
 define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 6fef56eb0a65..7fd6c50e118d 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -221,7 +221,7 @@ gb_StaticLibrary_StaticLibrary_platform :=
 
 gb_LinkTarget_get_linksearchpath_for_layer = \
 	-L$(WORKDIR)/LinkTarget/StaticLibrary \
-	-L$(INSTDIR)/$(gb_Package_SDKDIRNAME)/lib \
+	-L$(INSTDIR)/$(SDKDIRNAME)/lib \
 	$(foreach layer,\
 		$(subst +, ,$(patsubst $(1):%.,%,\
 			$(filter $(1):%.,$(gb_LinkTarget_LAYER_LINKPATHS)))),\
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 61e452737e84..421a02029386 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -144,7 +144,7 @@ gb_LinkTarget_get_manifestfile = \
 
 gb_LinkTarget_get_linksearchpath_for_layer = \
 	-LIBPATH:$(WORKDIR)/LinkTarget/StaticLibrary \
-	-LIBPATH:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/lib \
+	-LIBPATH:$(INSTDIR)/$(SDKDIRNAME)/lib \
 	$(if $(filter OXT,$(1)),\
 		-LIBPATH:$(WORKDIR)/LinkTarget/ExtensionLibrary, \
 		-LIBPATH:$(WORKDIR)/LinkTarget/Library)
@@ -559,9 +559,6 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
-# Package class
-gb_Package_SDKDIRNAME := sdk
-
 # UIMenubarTarget class
 
 define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index be5a01980e23..fbef9ba13750 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -368,9 +368,6 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
-# Package class
-gb_Package_SDKDIRNAME := LibreOffice$(PRODUCTVERSION)_SDK
-
 # UIMenubarTarget class
 
 define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index 5b13981737ea..acdf23c5e7e8 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -370,9 +370,6 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
-# Package class
-gb_Package_SDKDIRNAME := sdk
-
 # UIMenubarTarget class
 
 define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index b9ad99d9d768..4877af41e008 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -393,9 +393,6 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
-# Package class
-gb_Package_SDKDIRNAME := sdk
-
 # UIMenubarTarget class
 
 define gb_UIMenubarTarget__command
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index bda7cfa702f9..f77fd993b1f2 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -390,9 +390,6 @@ else
 gb_UnoApiHeadersTarget_select_variant = $(2)
 endif
 
-# Package class
-gb_Package_SDKDIRNAME := sdk
-
 # UIMenubarTarget class
 
 define gb_UIMenubarTarget__command