[Libreoffice-commits] .: 2 commits - configure.in set_soenv.in solenv/inc

[Tor Lillqvist]

 configure.in           |   20 --------------------
 set_soenv.in           |    1 -
 solenv/inc/settings.mk |    1 +
 solenv/inc/unx.mk      |    2 +-
 solenv/inc/unxiosr.mk  |    1 -
 5 files changed, 2 insertions(+), 23 deletions(-)

New commits:
commit ba7dd6cf4afa12a8b04a2f998a3a583fa7ced627
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 5 01:28:11 2011 +0300

    Use the build platform SOLARLIB for SOLARSHAREDBIN

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 7f2cbf4..e3036c7 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -775,6 +775,7 @@ SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl
 SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res
 SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res
 SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib
+SOLARLIBDIR_FOR_BUILD=$(SOLARVERSION)/$(INPATH_FOR_BUILD)/lib
 SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java
 SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc
 SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index f53ec1e..74ed8d5 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -158,7 +158,7 @@ YACCFLAGS*=-d -t
 EXECPOST=
 SCPPOST=.ins
 DLLDEST=$(LB)
-SOLARSHAREDBIN=$(SOLARLIBDIR)
+SOLARSHAREDBIN=$(SOLARLIBDIR_FOR_BUILD)
 SONAME_SWITCH*=-h
 
 .IF "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 797873b..5f6b079 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -72,4 +72,3 @@ YACCFLAGS*=-d -t
 EXECPOST=
 SCPPOST=.ins
 DLLDEST=$(LB)
-SOLARSHAREDBIN=$(SOLARLIBDIR)
commit aa640078699a62e3c7705f74f87db3756013a435
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 5 01:24:52 2011 +0300

    Bin the --with-icu-native-build-root option

diff --git a/configure.in b/configure.in
index 17302c6..2e11705 100755
--- a/configure.in
+++ b/configure.in
@@ -1233,19 +1233,6 @@ AC_ARG_WITH(mingw-cross-compiler,
     ],
 ,)
 
-AC_ARG_WITH(icu-native-build-root,
-    AS_HELP_STRING([--with-icu-native-build-root],
-        [Specify the the 'source' directory of a native build of ICU.])
-    [
-                          Usage:     --with-icu-native-build-root=<path>>
-
-                          When cross-compiling and not using a "system" ICU,
-                          specify the path to the "source" directory of the
-                          ICU build in a native LibreOffice build tree. For example
-                          --with-icu-native-build-root=/Users/tml/lo-macosx/icu/unxmacxi.pro/misc/build/icu/source
-    ],
-,)
-
 AC_ARG_WITH(build-version,
     AS_HELP_STRING([--with-build-version],
         [Allows the builder to add a custom version tag that will appear in the
@@ -5588,12 +5575,6 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_ICU=NO
     BUILD_TYPE="$BUILD_TYPE ICU"
-    if test "$cross_compiling" = "yes"; then
-        if test "$with_icu_native_build_root" = "" ; then
-            AC_MSG_ERROR([when cross-compiling ICU you must use --with-icu-native-build-root])
-        fi
-        ICU_NATIVE_BUILD_ROOT="$with_icu_native_build_root"
-    fi
 fi
 AC_SUBST(SYSTEM_ICU)
 AC_SUBST(SYSTEM_GENBRK)
@@ -5602,7 +5583,6 @@ AC_SUBST(SYSTEM_GENCMN)
 AC_SUBST(ICU_MAJOR)
 AC_SUBST(ICU_MINOR)
 AC_SUBST(ICU_MICRO)
-AC_SUBST(ICU_NATIVE_BUILD_ROOT)
 
 dnl ===================================================================
 dnl Graphite
diff --git a/set_soenv.in b/set_soenv.in
index 50d8e0d..80d083d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1770,7 +1770,6 @@ if ( '@CROSS_COMPILING@' ne '' )
    ToFile( "SOLARINC_FOR_BUILD", "@SOLARINC_FOR_BUILD@", "e");
    ToFile( "SOLARLIB_FOR_BUILD", "@SOLARLIB_FOR_BUILD@", "e");
    ToFile( "WORKDIR_FOR_BUILD", "@WORKDIR_FOR_BUILD@", "e");
-   ToFile( "ICU_NATIVE_BUILD_ROOT", "@ICU_NATIVE_BUILD_ROOT@", "e");
 }
 else
 {