[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - set_soenv.in solenv/gbuild solenv/inc stlport/systemstlguards winaccessibility/source
Herbert Dürr
hdu at apache.org
Tue Nov 19 09:06:06 PST 2013
set_soenv.in | 5 -
solenv/gbuild/platform/macosx.mk | 2
solenv/inc/unxmacx.mk | 1
stlport/systemstlguards/postextstl.h | 32 ++++++++++++
stlport/systemstlguards/preextstl.h | 73 ++++++++++++++++++++++++++++
winaccessibility/source/UAccCOM/makefile.mk | 15 +++--
6 files changed, 116 insertions(+), 12 deletions(-)
New commits:
commit 4846822317ef5b262b6ff0e12780232fe56628f3
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Nov 19 13:45:13 2013 +0000
#i107914# fix winaccessibility build when --disable-atl configure switch is used
Notes:
ignore: obsolete
diff --git a/winaccessibility/source/UAccCOM/makefile.mk b/winaccessibility/source/UAccCOM/makefile.mk
index 9222140..5182254 100644
--- a/winaccessibility/source/UAccCOM/makefile.mk
+++ b/winaccessibility/source/UAccCOM/makefile.mk
@@ -24,14 +24,14 @@ PRJNAME=winaccessibility
TARGET=UAccCOM
# --- Settings -----------------------------------------------------
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-PROF_EDITION=TRUE
-.ENDIF
+.IF "$(GUI)"!="WNT" || "$(DISABLE_ATL)"!=""
+all:
+ @echo "$TARGET will not be built because GUI='$(GUI)' and DISABLE_ATL='$(DISABLE_ATL)'"
+.ELSE
+PROF_EDITION=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-
VERSIONOBJ=
LIBTARGET=NO
USE_DEFFILE=YES
@@ -121,8 +121,6 @@ SHL1RES=$(RES)/$(TARGET).res
DEF1NAME= $(TARGET)
#DEF1EXPORTFILE= exports.dxp
-.ENDIF
-
# --- Targets ----------------------------------
.INCLUDE : target.mk
@@ -133,3 +131,6 @@ $(MISC)/$(TARGET).manifest: $(BIN)$/$(TARGET)$(DLLPOST)
cat *.rgs > $(MISC)$/$(TARGET).rgs
mt.exe -rgs:$(MISC)$/$(TARGET).rgs -tlb:$(MISC)$/$(TARGET).tlb -dll:$(TARGET).dll -out:$(MISC)$/$(TARGET).manifest
mt.exe -manifest $(MISC)$/$(TARGET).manifest -outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97
+
+.ENDIF # "$(GUI)"!="WNT" || "$(DISABLE_ATL)"!=""
+
commit 8295309925d511f36b0705ed2678a72f31282226
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Nov 19 12:46:12 2013 +0000
#i122362# post-stlport fixes for the macosx-target=10.4 build
Notes:
ignore: obsolete
diff --git a/set_soenv.in b/set_soenv.in
index dffde97..1e797ad 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1444,8 +1444,7 @@ elsif ($platform =~ m/cygwin/)
}
elsif ($platform =~ m/darwin/)
{
- my $STLINC .= $I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
- $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
+ $SOLARINC .= " " . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
}
else
{ AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
@@ -1678,7 +1677,7 @@ if ( $platform =~ m/darwin/ )
# unless you want to do runtime checks for 10.5 api, you also want to use the 10.7 sdk
# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
# http://developer.apple.com/technotes/tn2002/tn2064.html
- ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.7", "e" );
+ ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.4", "e" );
}
#
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 5b91705..a0ab8ce 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -300,7 +300,7 @@ gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .dylib
-gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT)
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index b3cbb40..8169c14 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -44,7 +44,6 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI
#.EXPORT: MACOSX_DEPLOYMENT_TARGET
CDEFS+=-DQUARTZ
EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk
-.ENDIF
# Name of library where static data members are initialized
# STATICLIBNAME=static$(DLLPOSTFIX)
commit c67138fd294f0b32dd14c3e3c84fccf81e94b0e3
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Nov 19 08:06:16 2013 +0000
#i122362# re-add accidentially deleted pre-/post-extstl.h
with the stlport4 removal they can be eliminated as soon
as the source files that include them have been adjusted
Notes:
ignore: obsolete
diff --git a/stlport/systemstlguards/postextstl.h b/stlport/systemstlguards/postextstl.h
new file mode 100644
index 0000000..e123c7b8
--- /dev/null
+++ b/stlport/systemstlguards/postextstl.h
@@ -0,0 +1,32 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifdef std_was_redefined_as_stlport
+// put things back the way they were
+# define std std_was_redefined_as_stlport
+# undef _STLP_OUTERMOST_HEADER_ID
+// force config to be re-read
+# undef _STLP_NOTHROW_INHERENTLY
+# undef _STLP_CONFIG_H
+# include <stddef.h>
+#endif
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
new file mode 100644
index 0000000..9cdcb4d
--- /dev/null
+++ b/stlport/systemstlguards/preextstl.h
@@ -0,0 +1,73 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+//1. Force inclusion of a std:: using header to ensure the stlport define
+//of std as "stlport"
+#include <algorithm>
+#if defined(ADAPT_EXT_STL)
+//2. Force inclusion of stlport headers to get their stlport:: definitions
+# include <ostream>
+# include <istream>
+# include <fstream>
+# include <iostream>
+# include <sstream>
+# include <vector>
+# include <deque>
+# include <set>
+# include <list>
+# include <map>
+//3. Now force inclusion of native headers to get their std:: definitions
+# if defined(std)
+# define std_was_redefined_as_stlport std
+# undef std
+# define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
+# if defined(_GNUC__)
+# pragma GCC visibility push(default)
+# endif
+# include _STLP_NATIVE_HEADER(exception_defines.h)
+# include _STLP_NATIVE_HEADER(limits)
+# include _STLP_NATIVE_HEADER(memory)
+# include _STLP_NATIVE_HEADER(exception)
+# include _STLP_NATIVE_HEADER(iosfwd)
+# include _STLP_NATIVE_HEADER(algorithm)
+# include _STLP_NATIVE_HEADER(string)
+# include _STLP_NATIVE_HEADER(streambuf)
+# include _STLP_NATIVE_HEADER(ios)
+# include _STLP_NATIVE_HEADER(locale)
+# include _STLP_NATIVE_HEADER(stdexcept)
+# include _STLP_NATIVE_HEADER(ostream)
+# include _STLP_NATIVE_HEADER(istream)
+# include _STLP_NATIVE_HEADER(iostream)
+# include _STLP_NATIVE_HEADER(sstream)
+# include _STLP_NATIVE_HEADER(vector)
+# include _STLP_NATIVE_HEADER(deque)
+# include _STLP_NATIVE_HEADER(set)
+# include _STLP_NATIVE_HEADER(list)
+# include _STLP_NATIVE_HEADER(map)
+# if defined(_GNUC__)
+# pragma GCC visibility pop
+# endif
+# endif
+#endif
+//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
+//against regardless of whether that is stlport or system stl
+namespace ext_std = std;
More information about the Libreoffice-commits
mailing list