[Libreoffice-commits] .: 4 commits - bootstrap.1 configure.in Makefile.in makefile.rc set_soenv.in solenv/inc soltools/adjustvisibility soltools/cpp soltools/giparser soltools/javadep soltools/mkdepend soltools/support soltools/testhxx
Tor Lillqvist
tml at kemper.freedesktop.org
Sat Jun 4 09:09:26 PDT 2011
Makefile.in | 40 ++++++++++---
bootstrap.1 | 20 +++---
configure.in | 42 ++++++++++----
makefile.rc | 101 ----------------------------------
set_soenv.in | 33 +++++++----
solenv/inc/settings.mk | 24 --------
solenv/inc/unxiosr.mk | 5 +
soltools/adjustvisibility/makefile.mk | 1
soltools/cpp/makefile.mk | 6 +-
soltools/giparser/makefile.mk | 6 +-
soltools/javadep/makefile.mk | 6 +-
soltools/mkdepend/makefile.mk | 6 +-
soltools/support/makefile.mk | 6 +-
soltools/testhxx/makefile.mk | 5 +
14 files changed, 130 insertions(+), 171 deletions(-)
New commits:
commit e2ca79f51b542544afdb3077f1f37492a1eedb80
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jun 4 14:59:34 2011 +0300
Rehash of cross-compilation ideas
Like in my previous plan, when cross-compiling we run the same
configure script separately for a native build configuration on the
build platform, in a temporary subdirectory.
Now use a fixed name "CONF-FOR-BUILD" for that subdirectory, so that
it is easy to edit out that path component from those build
environment variables that contain it.
Pass more of the native build environment variables up to the main
configure and propagate those to the build environment suffixed with
_FOR_BUILD: INPATH, OUTPATH OUTDIR, PATH, SOLARINC, SOLARLIB,
WORKDIR. Whether these all will actually be needed remains to be seen,
the set can be reduced later.
The environment setting file (*Env.Set.sh) for the native build is
copied here to the top directory under the name Env.Build.sh, and the
environment variables set in it that contain pathnames are modified to
point directly to this top directory, not the temporary CONF-FOR-BUILD
subdirectory.
When doing a cross-compiling build, we first do a build of the
necessary build-time tools for the build platform. This is done in the
same source tree. As the directories where build results are stored
include the platform specification (OUTPATH or in some cases INPATH),
there should be no clashes.
Don't run the download script from ./bootstrap(.1). We are running it
from Makefile already anyway often enough. This could also do with
some clean-up; the ./g -f clone phase is a bit slow, I am not sure if
it really is necessary every time? Also, we should not overwrite
ooo.lst if its contents isn't changing.
Use INPATH_FOR_BUILD in SOLARBINDIR so that the self-built tools like
idlc that we run are for the build platform, not the host
platform.
Attempt to get rid of the makefile.rc and makefile.mk files. Surely it
should be enough with just Makefile(.in) (and then GNUmakefile.mk for
its own so far special gbuild purposes). Instead of invoking dmake to
do "clean" or "distclean" from Makefile(.in), we already just do the
same directly in Makefile(.in). This way we don't need to first build
dmake in order to be able to do a make clean, which will then finally
clean out dmake again;)
Ideally I would like to get rid of bootstrap(.1), too. It should be
possible to merge its tasks into configure(.in) or Makefile(.in) as
appropriate.
And actually, maybe also what set_soenv(.in) does could well be merged
into configure(.in)?
diff --git a/Makefile.in b/Makefile.in
index 47d2e59..24c60a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,11 +12,22 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
+ifeq (@CROSS_COMPILING@,YES)
+all: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset
+else
all: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ src.downloaded
+endif
@. ./*Env.Set.sh && \
cd instsetoo_native && \
build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
+ifeq (@CROSS_COMPILING@,YES)
+cross-build-toolset:
+ . ./Env.Build.sh && \
+ (cd idlc && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
+ (cd icu && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@)
+endif
+
install:
@. ./*Env.Set.sh && \
echo "Installing in $${libdir:- at libdir@}/@INSTALL_DIRNAME at ..." && \
@@ -41,18 +52,29 @@ dev-install:
echo "./soffice.bin"; \
fi
-distclean: dmake/dmake at EXEEXT_FOR_BUILD@
- @. ./*Env.Set.sh && \
- dmake distclean
+distclean:
+ -rm config.cache
+ -rm config.log
+ifeq (@BUILD_DMAKE@,YES)
+ -$(GNUMAKE) -C dmake distclean
+endif
-clean: dmake/dmake at EXEEXT_FOR_BUILD@
- @. ./*Env.Set.sh && \
- dmake clean && \
- if [ -n "$$USE_GMAKE" ] ; then make -f GNUmakefile.mk -sr clean ; fi
+clean:
+ . ./*Env.Set.sh && \
+ rm -rf */$$INPATH && \
+ rm -rf solver/*/$$INPATH && \
+ rm -rf install && \
+ $$GNUMAKE -C dmake clean && \
+ rm -f solenv/*/bin/dmake* && \
+ $$GNUMAKE -f GNUmakefile.mk -sr clean
+ifeq (@CROSS_COMPILING@,YES)
+ . ./*Env.Set.sh && \
+ rm -rf */$$INPATH_FOR_BUILD && \
+ rm -rf solver/*/$$INPATH_FOR_BUILD
+endif
dmake/dmake at EXEEXT_FOR_BUILD@:
- @. ./*Env.Set.sh && \
- ./bootstrap
+ ./bootstrap
src.downloaded: ooo.lst download
@. ./*Env.Set.sh && \
diff --git a/bootstrap.1 b/bootstrap.1
index c67a7a7..9db4b23 100755
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -46,11 +46,11 @@ if test "$BUILD_DMAKE" != "NO"; then
fi
fi
-mkdir -p "$SOLARENV/$OUTPATH/bin"
+mkdir -p "$SOLARENV/$OUTPATH_FOR_BUILD/bin"
if test "$BUILD_DMAKE" != "NO"; then
- cp -f "$SRC_ROOT/dmake/dmake$EXEEXT" "$SOLARENV/$OUTPATH/bin" || exit
+ cp -f "$SRC_ROOT/dmake/dmake$EXEEXT" "$SOLARENV/$OUTPATH_FOR_BUILD/bin" || exit
echo ""
- echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
+ echo "dmake copied to $SOLARENV/$OUTPATH_FOR_BUILD/bin/dmake$EXEEXT"
fi
#make sure build.pl is executable
@@ -60,10 +60,10 @@ chmod +x "$SRC_ROOT/solenv/bin/build_client.pl"
chmod +x "$SRC_ROOT/solenv/bin/zipdep.pl"
chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
-# fetch or update external tarballs
-if [ ! -d $SRC_ROOT/src ] ; then
- mkdir $SRC_ROOT/src
-fi
-if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
- $SRC_ROOT/download $SRC_ROOT/ooo.lst
-fi
+# Local Variables:
+# mode: shell-script
+# tab-width: 4
+# indent-tabs-mode: nil
+# End:
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/configure.in b/configure.in
index 50841b6..8a52ccc 100755
--- a/configure.in
+++ b/configure.in
@@ -1692,20 +1692,21 @@ m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
if test "$cross_compiling" = "yes"; then
AC_MSG_CHECKING([for BUILD platform configuration])
echo
- export tmpdir=`mktemp -d conf-for-build.XXXXXX`
+ rm -rf CONF-FOR-BUILD Env.Build.sh
+ mkdir CONF-FOR-BUILD
tar cf - \
configure \
config.guess \
oowintool \
solenv/inc/minor.mk \
solenv/inc/postset.mk \
+ solenv/inc/langlist.mk \
set_soenv.in \
bootstrap.1 \
post_download.in \
ooo.lst.in \
Makefile.in \
- makefile.rc \
- bin/repo-list.in | (cd $tmpdir && tar xf -)
+ bin/repo-list.in | (cd CONF-FOR-BUILD && tar xf -)
(
unset COM GUI GUIBASE OS CPU CPUNAME
unset CC CXX CFLAGS
@@ -1713,18 +1714,20 @@ if test "$cross_compiling" = "yes"; then
test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD"
test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD"
- cd $tmpdir
+ cd CONF-FOR-BUILD
sub_conf_opts=""
- test -n $with_ant_home && sub_conf_opts="$sub_conf_opts --with-ant-home=$with_ant_home"
+ test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts --with-ant-home=$with_ant_home"
test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
+ test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts --with-external-tar=$TARFILE_LOCATION"
./configure \
--disable-mozilla \
--disable-build-mozilla \
$sub_conf_opts \
2>&1 | sed -e 's/^/ /'
test -f ./*Env.Set.sh 2>/dev/null || exit
+ cp *Env.Set.sh ../Env.Build.sh
. ./*Env.Set.sh
- for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET; do
+ for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH; do
VV='$'$V
VV=`eval "echo $VV"`
if test -n "$VV"; then
@@ -1732,12 +1735,23 @@ if test "$cross_compiling" = "yes"; then
echo "$line" >>build-config
fi
done
+
+ for V in OUTDIR PATH SOLARINC SOLARLIB WORKDIR; do
+ VV='$'$V
+ VV=`eval "echo $VV"`
+ VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
+ if test -n "$VV"; then
+ line="${V}_FOR_BUILD='$VV'"
+ echo "$line" >>build-config
+ fi
+ done
)
- test -f $tmpdir/build-config || AC_MSG_ERROR([Running configure script for BUILD system failed, see $tmpdir/config.log])
- eval `cat $tmpdir/build-config`
+ test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure script for BUILD system failed, see CONF-FOR-BUILD/config.log])
+ test -f Env.Build.sh || AC_MSG_ERROR([A file called Env.Build.sh was supposed to have been copied here, but it isn't found])
+ perl -pi -e 's,/CONF-FOR-BUILD,,g' Env.Build.sh
+ eval `cat CONF-FOR-BUILD/build-config`
AC_MSG_RESULT([checking for BUILD platform configuration... done])
- rm -rf $tmpdir
- unset tmpdir
+ rm -rf CONF-FOR-BUILD
else
CC_FOR_BUILD="$CC"
CXX_FOR_BUILD="$CXX"
@@ -1751,8 +1765,16 @@ AC_SUBST(CPUNAME_FOR_BUILD)
AC_SUBST(CC_FOR_BUILD)
AC_SUBST(CXX_FOR_BUILD)
AC_SUBST(GXX_INCLUDE_PATH_FOR_BUILD)
+AC_SUBST(INPATH_FOR_BUILD)
+AC_SUBST(OUTPATH_FOR_BUILD)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
+AC_SUBST(OUTDIR_FOR_BUILD)
+AC_SUBST(PATH_FOR_BUILD)
+AC_SUBST(SOLARINC_FOR_BUILD)
+AC_SUBST(SOLARLIB_FOR_BUILD)
+AC_SUBST(WORKDIR_FOR_BUILD)
+
if test -e solenv/inc/minor.mk; then
# Get UPD number from ./solenv/inc/minor.mk
UPD="`grep RSCVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
diff --git a/makefile.rc b/makefile.rc
deleted file mode 100644
index c7cef87..0000000
--- a/makefile.rc
+++ /dev/null
@@ -1,101 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-TARGET=OpenOffice.org
-MAKEFILERC=true
-
-#
-# build targets
-#
-
-build_all : build_instsetoo_native
-
-all .PHONY : build_all
-
-check_modules .PHONY :
- @+echo Checking module list
- @+perl $(SOLARENV)$/bin$/build.pl --checkmodules
-
-# Only build when all modules available
-build_instsetoo_native .SETDIR=instsetoo_native/prj : check_modules
- @+perl $(SOLARENV)$/bin$/build.pl --all $(PROFULLSWITCH)
-
-depend .SETDIR=instsetoo_native/prj : check_modules
- @+perl $(SOLARENV)$/bin$/build.pl --all $(PROFULLSWITCH) depend=t
-
-
-#
-# bootstrap target
-#
-
-bootstrap .PHONY :
- @bootstrap
-
-
-distclean .PHONY: clean
- -rm config.cache
- -rm config.log
-.IF "$(BUILD_DMAKE)"!="NO"
- -$(GNUMAKE) -C dmake distclean
-.ENDIF
-
-
-clean .PHONY:
- -rm -rf */$(INPATH)
- -rm -rf solver/*/$(INPATH)
- -rm -rf install
-.IF "$(BUILD_DMAKE)"!="NO"
- -echo cleaning up dmake...
- -$(GNUMAKE) -C dmake clean
- -rm -f solenv/*/bin/dmake*
-.ENDIF
-
-#
-# configure target
-#
-
-configure .PHONY SETDIR=. :
- @configure
-
-
-#
-# install target
-#
-
-install .PHONY :
- @test "$(DESTDIR)$(prefix)" != "" || (echo Usage: make install [DESTDIR=DIR] prefix=DIR; exit 2)
- cp -p instsetoo_native/$(INPATH)/bin/* $(SOLARVER)/$(INPATH)/bin
- cd instsetoo_native/util \
- && OUT=$(INPATH)\
- LOCAL_OUT=$(INPATH)\
- LOCAL_COMMON_OUT=$(INPATH)\
- DEFAULT_TO_ENGLISH_FOR_PACKING=1\
- PYTHONPATH=$(SOLARVER)/$(INPATH)/bin:$(SOLARVER)/$(INPATH)/lib:$(PYTHONPATH) \
- $(PERL) $(SOLARENV)/bin/make_installer.pl -f openoffice.lst -l $(WITH_LANG:f:t",") -p OpenOffice -buildid 0 -simple $(DESTDIR)$(prefix)
-
-#*************************************************************************
-
diff --git a/set_soenv.in b/set_soenv.in
index 037b53e..50d8e0d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -807,16 +807,6 @@ $SRC_ROOT = PathFormat($SRC_ROOT);
CheckPathExist( $SRC_ROOT );
-#-----------------------------------------------------------------------------------------------------
-# Copy top level makefile from config_office/ to $SRC_ROOT
-#-----------------------------------------------------------------------------------------------------
-if (! -e "makefile.rc")
-{ AddWarning( "set_soenv", "makefile.rc not found in config_office/. Could not copy to SRC_ROOT." );
-}
-else
-{ `cp -f makefile.rc $SRC_ROOT/makefile.mk`;
-}
-
# 2. Java home directory.
# JAVA_HOME as argument from autoconf.
$JAVA_HOME = PathFormat('@JAVA_HOME@') ;
@@ -1736,7 +1726,15 @@ if ( '@JDK@' ne '' )
ToFile( "SCPDEFS", '@SCPDEFS@', "e" );
ToFile( "SOLAREXTRAINC", $SOLAREXTRAINC, "e" );
ToFile( "SOLAREXTRALIB", $SOLAREXTRALIB, "e" );
-ToFile( "PATH", $PATH, "e" );
+if ( '@CROSS_COMPILING@' ne '' )
+{
+ # Obviously we shouldn't set PATH to contain host binaries
+ ToFile( "PATH", "@PATH_FOR_BUILD@", "e" );
+}
+else
+{
+ ToFile( "PATH", $PATH, "e" );
+}
ToFile( "SOLARLIB", $SOLARLIB, "e" );
ToFile( "JAVALIB", $JAVALIB, "e" );
ToFile( "SOLARINC", $SOLARINC, "e" );
@@ -1765,7 +1763,13 @@ if ( '@CROSS_COMPILING@' ne '' )
ToFile( "CC_FOR_BUILD", "@CC_FOR_BUILD@", "e" );
ToFile( "CXX_FOR_BUILD", "@CXX_FOR_BUILD@", "e" );
ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
+ ToFile( "INPATH_FOR_BUILD", "@INPATH_FOR_BUILD@", "e" );
+ ToFile( "OUTPATH_FOR_BUILD", "@OUTPATH_FOR_BUILD@", "e" );
ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" );
+ ToFile( "OUTDIR_FOR_BUILD", "@OUTDIR_FOR_BUILD@", "e");
+ 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
@@ -1779,6 +1783,13 @@ else
ToFile( "CC_FOR_BUILD", $CC, "e" );
ToFile( "CXX_FOR_BUILD", $CXX, "e" );
ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
+ ToFile( "INPATH_FOR_BUILD", $INPATH, "e" );
+ ToFile( "OUTPATH_FOR_BUILD", $OUTPATH, "e" );
+ ToFile( "OUTDIR_FOR_BUILD", $OUTDIR, "e" );
+ ToFile( "PATH_FOR_BUILD", $PATH, "e" );
+ ToFile( "SOLARINC_FOR_BUILD", $SOLARINC, "e" );
+ ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB, "e" );
+ ToFile( "WORKDIR_FOR_BUILD", $WORKDIR, "e" );
}
ToFile( "SIZEOF_SHORT", "@SIZEOF_SHORT@", "e" );
ToFile( "SIZEOF_INT", "@SIZEOF_INT@", "e" );
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 52b911a..7f2cbf4 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -784,7 +784,7 @@ SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc/$(SOLARLANG)
SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res/$(SOLARLANG)
.ENDIF
.ENDIF
-SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin
+SOLARBINDIR:=$(SOLARVERSION)/$(INPATH_FOR_BUILD)/bin
SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr
SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par
SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml
commit 3b001624dec1c112c2520bd403e670863aca2c9c
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jun 4 14:55:19 2011 +0300
Drop the TARGETPLATFORM idea
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index e6e6f76..52b911a 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -34,24 +34,6 @@ MKFILENAME:=SETTINGS.MK
force_dmake_to_error
.ENDIF
-# If we are building a target that should run on the build platform,
-# set variables for suitable for that, and not the host ("target")
-# platform.
-.IF "$(CROSS_COMPILING)"!="" && "$(TARGETPLATFORM)"=="BUILD"
-# I wonder if one could use some dmake foreach loop here...
-COM:=$(COM_FOR_BUILD)
-GUI:=$(GUI_FOR_BUILD)
-GUIBASE:=$(GUIBASE_FOR_BUILD)
-OS:=$(OS_FOR_BUILD)
-CPU:=$(CPU_FOR_BUILD)
-CPUNAME:=$(CPUNAME_FOR_BUILD)
-CC:=$(CC_FOR_BUILD)
-CXX:=$(CXX_FOR_BUILD)
-GXX_INCLUDE_PATH:=$(GXX_INCLUDE_PATH_FOR_BUILD)
-MACOSX_DEPLOYMENT_TARGET:=$(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
-.EXPORT: MACOSX_DEPLOYMENT_TARGET
-.ENDIF
-
.INCLUDE .IGNORE : ooo_vendor.mk
# --- common tool makros --------------------------------------
@@ -545,10 +527,6 @@ RSC_LANG_ISO+:=$(completelangiso)
TARGETTYPE=CUI
.ENDIF
-.IF "$(TARGETPLATFORM)"==""
-TARGETPLATFORM=HOST
-.ENDIF
-
# --- Pfade setzen -------------------------------------------------
# Output-Pfad
commit 9a66b156c6f8de0afe3507ab2dc7dfbcc80dc2cd
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jun 4 14:51:55 2011 +0300
Rehash cross-compilation ideas
Drop the TARGETPLATFORM=BUILD indication of stuff that is to be built
for the build platform but pointless to build for the host platform. I
will handle the split of stuff built for the build or host platforms
differently. Note that some libraries need to be built for both
platforms.
Add explicit rules to do nothing for the cross-compilation case, but
likely even that will be unnecessary in the case of complete modules
like soltools (?). I will just mark modules that are for the build
platform only with an own flag in BUILD_TYPE.
diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index 65a94c9..ea0d09c 100644
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..
PRJNAME=soltools
TARGET=adjustvisibility
TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
ENABLE_EXCEPTIONS=TRUE
noadjust=TRUE
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index d881616..5cada33 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..
PRJNAME=soltools
TARGET=cpp
TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
NO_DEFAULT_STL=TRUE
# --- Settings -----------------------------------------------------
@@ -38,6 +37,11 @@ NO_DEFAULT_STL=TRUE
.INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
UWINAPILIB=$(0)
LIBSALCPPRT=$(0)
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
index 436fadf..d7f04db 100644
--- a/soltools/giparser/makefile.mk
+++ b/soltools/giparser/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..
PRJNAME=soltools
TARGET=soltools_giparser
TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
@@ -38,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
# --- Files --------------------------------------------------------
OBJFILES=\
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index 4e43c5c..e6dcf32 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..
PRJNAME=soltools
TARGET=javadep
TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
NO_DEFAULT_STL=TRUE
# --- Settings -----------------------------------------------------
@@ -38,6 +37,11 @@ NO_DEFAULT_STL=TRUE
.INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
UWINAPILIB=$(0)
LIBSALCPPRT=$(0)
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index 4b73a95..fb5fe58 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -29,7 +29,6 @@ PRJNAME=soltools
TARGET=make_makedepend
PRJ=..
TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
LIBTARGET=NO
# noadjust here to have dependencies over there
noadjust=TRUE
@@ -44,6 +43,11 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
.INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
LIBSALCPPRT=
UWINAPILIB=
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
index 2db04de..8628b52 100644
--- a/soltools/support/makefile.mk
+++ b/soltools/support/makefile.mk
@@ -30,14 +30,16 @@ PRJ=..
PRJNAME=soltools
TARGET=soltools_support
TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
# --- Settings -----------------------------------------------------
.INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk
-
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
# --- Files --------------------------------------------------------
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk
index 7a1ab97..e71d8f1 100644
--- a/soltools/testhxx/makefile.mk
+++ b/soltools/testhxx/makefile.mk
@@ -36,6 +36,11 @@ CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj
.INCLUDE: $(PRJ)$/util$/makefile.pmk
.INCLUDE: settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
SLOFILES = $(SLO)$/testhxx.obj
.INCLUDE: target.mk
commit 2fc6c90cf85a1bec162b9e4af9ae5a1120ad8d02
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue May 31 10:03:10 2011 +0300
Tentatively add the CoreFoundation framework to STD{SHL,LIB}{GUI,CUI}MT
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index a218f4e..797873b 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -32,6 +32,11 @@ CFLAGS=-c $(EXTRA_CFLAGS)
LINKC*=$(CC)
LINK*=$(CXX)
+STDLIBCUIMT=-framework CoreFoundation
+STDLIBGUIMT=-framework CoreFoundation
+STDSHLCUIMT=-framework CoreFoundation
+STDSHLGUIMT=-framework CoreFoundation
+
LIBMGR*=ar
LIBFLAGS=-r
More information about the Libreoffice-commits
mailing list