You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/05/08 19:54:12 UTC
svn commit: r1480379 - in /openoffice/branches/rejuvenate01/main:
bridges/source/cpp_uno/cxx_macosx_x86-64/
bridges/source/cpp_uno/gcc3_macosx_intel/ bridges/source/cpp_uno/shared/
cppuhelper/source/ solenv/bin/ solenv/bin/modules/ solenv/bin/modules/i...
Author: hdu
Date: Wed May 8 17:54:12 2013
New Revision: 1480379
URL: http://svn.apache.org/r1480379
Log:
#i122195# add UNO support for 64bit OSX
Added:
openoffice/branches/rejuvenate01/main/solenv/inc/unxmacc.mk
openoffice/branches/rejuvenate01/main/solenv/inc/unxmacci.mk
openoffice/branches/rejuvenate01/main/solenv/inc/unxmaccx.mk
Modified:
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/cxx_macosx_x86-64/makefile.mk
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/makefile.mk
openoffice/branches/rejuvenate01/main/cppuhelper/source/implbase_ex.cxx
openoffice/branches/rejuvenate01/main/cppuhelper/source/makefile.mk
openoffice/branches/rejuvenate01/main/cppuhelper/source/shlib.cxx
openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl
openoffice/branches/rejuvenate01/main/solenv/bin/macosx-change-install-names.pl
openoffice/branches/rejuvenate01/main/solenv/bin/macosx-dylib-link-list.pl
openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/download.pm
openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/simplepackage.pm
openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/worker.pm
openoffice/branches/rejuvenate01/main/solenv/bin/modules/macosxotoolhelper.pm
openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml
openoffice/branches/rejuvenate01/main/solenv/bin/update_module_ignore_lists.pl
openoffice/branches/rejuvenate01/main/solenv/gbuild/Library.mk
openoffice/branches/rejuvenate01/main/solenv/gbuild/LinkTarget.mk
openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk
openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk
openoffice/branches/rejuvenate01/main/solenv/inc/_tg_app.mk
openoffice/branches/rejuvenate01/main/solenv/inc/tg_app.mk
openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk
openoffice/branches/rejuvenate01/main/solenv/inc/unx.mk
openoffice/branches/rejuvenate01/main/solenv/inc/unxlng.mk
openoffice/branches/rejuvenate01/main/solenv/inc/unxmacx.mk
openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk
Modified: openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/cxx_macosx_x86-64/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/cxx_macosx_x86-64/makefile.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/cxx_macosx_x86-64/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/cxx_macosx_x86-64/makefile.mk Wed May 8 17:54:12 2013
@@ -24,7 +24,7 @@
PRJ=..$/..$/..
PRJNAME=bridges
-TARGET=cxx_uno
+TARGET=$(COMNAME)_uno
LIBTARGET=no
ENABLE_EXCEPTIONS=TRUE
Modified: openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx (original)
+++ openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx Wed May 8 17:54:12 2013
@@ -169,6 +169,7 @@ type_info * RTTI::getRTTI( typelib_Compo
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr,"generated rtti for %s\n", rttiName );
#endif
+#if 0 // TODO: the derived type_info classes are not directly available => get them indirectly?
if (pTypeDescr->pBaseTypeDescription)
{
// ensure availability of base
@@ -182,7 +183,9 @@ type_info * RTTI::getRTTI( typelib_Compo
// this class has no base class
rtti = new __class_type_info( strdup( rttiName ) );
}
-
+#else
+ rtti = NULL;
+#endif
pair< t_rtti_map::iterator, bool > insertion(
m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
@@ -205,7 +208,9 @@ type_info * RTTI::getRTTI( typelib_Compo
static void deleteException( void * pExc )
{
__cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
- typelib_TypeDescription * pTD = 0;
+ if( !header->exceptionType) // TODO: remove this when getRTTI() always returns non-NULL
+ return; // NOTE: leak for now
+ typelib_TypeDescription* pTD = NULL;
OUString unoName( toUNOname( header->exceptionType->name() ) );
::typelib_typedescription_getByName( &pTD, unoName.pData );
OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
Modified: openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx (original)
+++ openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx Wed May 8 17:54:12 2013
@@ -46,7 +46,7 @@
static bridges::cpp_uno::shared::VtableFactory * pInstance;
-#if defined(__GNUG__) && !defined(__MINGW32__)
+#if defined(__GNUG__) /*also set by clang*/ && !defined(__MINGW32__)
void dso_init(void) __attribute__((constructor));
void dso_exit(void) __attribute__((destructor));
#endif
Modified: openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/makefile.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/shared/makefile.mk Wed May 8 17:54:12 2013
@@ -40,10 +40,10 @@ SLOFILES = \
# Disable optimization for cppinterfaceproxy.cxx -
# attribute constructor / destructor do not get called otherwise.
-.IF "$(COM)" == "GCC"
+#.IF "$(COM)" == "GCC"
NOOPTFILES = \
$(SLO)$/cppinterfaceproxy.obj
-.ENDIF
+#.ENDIF
.INCLUDE: target.mk
Modified: openoffice/branches/rejuvenate01/main/cppuhelper/source/implbase_ex.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cppuhelper/source/implbase_ex.cxx?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cppuhelper/source/implbase_ex.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cppuhelper/source/implbase_ex.cxx Wed May 8 17:54:12 2013
@@ -146,6 +146,10 @@ bool recursivelyFindType(
// in a specifc order. In theory, that need not hold for any given
// platform; in practice, it seems to work well on all supported platforms:
next:
+#if 1 //###############
+if( !type->ppBaseTypes && type->nBaseTypes!=0)
+ return false; // break here to debug this scenario
+#endif //##############
for (sal_Int32 i = 0; i < type->nBaseTypes; ++i) {
if (i > 0) {
*offset += sizeof (void *);
Modified: openoffice/branches/rejuvenate01/main/cppuhelper/source/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cppuhelper/source/makefile.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cppuhelper/source/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/cppuhelper/source/makefile.mk Wed May 8 17:54:12 2013
@@ -177,7 +177,6 @@ SHL1VERSIONMAP=msvc_win32_intel.map
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(GUI)$(COMNAME)"=="OS2gcc3"
SHL1VERSIONMAP=gcc3os2.map
-#.ELIF "$(COMNAME)"=="gcc3" || "$(COMNAME)"=="Clang"
.ELSE
SHL1VERSIONMAP=gcc3.map
.ENDIF
Modified: openoffice/branches/rejuvenate01/main/cppuhelper/source/shlib.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cppuhelper/source/shlib.cxx?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cppuhelper/source/shlib.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cppuhelper/source/shlib.cxx Wed May 8 17:54:12 2013
@@ -395,8 +395,8 @@ Reference< XInterface > SAL_CALL loadSha
rtl::OString libName(rtl::OUStringToOString(rLibName, RTL_TEXTENCODING_ASCII_US));
rtl::OString implName(rtl::OUStringToOString(rImplName, RTL_TEXTENCODING_ASCII_US));
rtl::OString envDcp(rtl::OUStringToOString(env.getTypeName(), RTL_TEXTENCODING_ASCII_US));
-
- fprintf(stderr, "loadSharedLibComponentFactory envDcp: %-12.12s implName: %30.30s libName: %-15.15s\n", envDcp.getStr(), implName.getStr() + (implName.getLength() > 30 ? implName.getLength() - 30 : 0), libName.getStr());
+
+ fprintf(stderr, "loadSharedLibComponentFactory envDcp: %-12.12s implName: %30.30s libName: %s\n", envDcp.getStr(), implName.getStr() + (implName.getLength() > 30 ? implName.getLength() - 30 : 0), libName.getStr());
}
#endif
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl Wed May 8 17:54:12 2013
@@ -136,6 +136,7 @@ use sigtrap 'handler' => \&cleanup_and_d
#### main ####
parse_options();
+init_globals();
print "$script_name -- version: $script_rev\n" if !$opt_silent;
@@ -149,7 +150,6 @@ if ( ! $opt_delete ) {
}
}
-init_globals();
push_default_actions();
parse_dlst();
check_dlst() if $opt_checkdlst;
@@ -463,7 +463,9 @@ sub init_globals
my $updminor = $ENV{'UPDMINOR'};
my $updminorext = $ENV{'UPDMINOREXT'};
my $work_stamp = $ENV{'WORK_STAMP'};
-
+
+ $::CC_PATH=(fileparse( $ENV{"CC"}))[1];
+
# special security check for release engineers
if ( defined($updater) && !defined($build_sosl) && !$opt_force) {
my $path = getcwd();
@@ -735,8 +737,8 @@ sub is_unstripped {
sub initialize_strip {
if ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq "")) {
$strip .= 'guw ' if ($^O eq 'cygwin');
- $strip .= 'strip';
- $strip .= " -x" if ($ENV{OS} eq 'MACOSX');
+ $strip .= $::CC_PATH . 'strip';
+ $strip .= " -x" if ($ENV{OS} eq 'MACOSX');
$strip .= " -R '.comment' -s" if ($ENV{OS} eq 'LINUX');
};
};
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/macosx-change-install-names.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/macosx-change-install-names.pl?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/macosx-change-install-names.pl (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/macosx-change-install-names.pl Wed May 8 17:54:12 2013
@@ -106,7 +106,7 @@ if ($type eq "extshl")
{
foreach $file (@ARGV)
{
- my $call = "install_name_tool$change -id \@loader_path/$inames{$file} $file";
+ my $call = "${::CC_PATH}install_name_tool$change -id \@loader_path/$inames{$file} $file";
system($call) == 0 or die "cannot $call";
}
}
@@ -114,14 +114,14 @@ if ($type eq "extshl")
{
foreach $file (@ARGV)
{
- my $call = "install_name_tool$change -id \@__________________________________________________$loc/$inames{$file} $file";
+ my $call = "${::CC_PATH}install_name_tool$change -id \@__________________________________________________$loc/$inames{$file} $file";
system($call) == 0 or die "cannot $call";
}
}
}
foreach $file (@ARGV)
{
- my $call = "otool -L $file";
+ my $call = "${::CC_PATH}otool -L $file";
open(IN, "-|", $call) or die "cannot $call";
my $change = "";
while (<IN>)
@@ -132,7 +132,7 @@ foreach $file (@ARGV)
close(IN);
if ($change ne "")
{
- $call = "install_name_tool$change $file";
+ $call = "${::CC_PATH}install_name_tool$change $file";
system($call) == 0 or die "cannot $call";
}
}
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/macosx-dylib-link-list.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/macosx-dylib-link-list.pl?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/macosx-dylib-link-list.pl (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/macosx-dylib-link-list.pl Wed May 8 17:54:12 2013
@@ -64,7 +64,7 @@ foreach (@ARGV)
}
foreach $file (@todo)
{
- my $call = "otool -L $file";
+ my $call = "${::CC_PATH}otool -L $file";
open(IN, "-|", $call) or die "cannot $call";
while (<IN>)
{
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/download.pm?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/download.pm Wed May 8 17:54:12 2013
@@ -618,15 +618,15 @@ sub get_download_architecture
{
my $arch = "";
- if ( $installer::globals::compiler =~ /unxlngi/ )
+ if(( $installer::globals::compiler =~ /^unxlngi/ )
+ || ( $installer::globals::compiler =~ /^unxmac.i/ )
+ || ( $installer::globals::issolarisx86build )
+ || ( $installer::globals::iswindowsbuild ))
{
$arch = "x86";
}
- elsif ( $installer::globals::compiler =~ /unxlngppc/ )
- {
- $arch = "PPC";
- }
- elsif ( $installer::globals::compiler =~ /unxlngx/ )
+ elsif(( $installer::globals::compiler =~ /^unxlngx/ )
+ || ( $installer::globals::compiler =~ /^unxmaccx/ ))
{
$arch = "x86-64";
}
@@ -634,19 +634,8 @@ sub get_download_architecture
{
$arch = "Sparc";
}
- elsif ( $installer::globals::issolarisx86build )
- {
- $arch = "x86";
- }
- elsif ( $installer::globals::iswindowsbuild )
- {
- $arch = "x86";
- }
- elsif ( $installer::globals::compiler =~ /^unxmacxi/ )
- {
- $arch = "x86";
- }
- elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
+ elsif(( $installer::globals::compiler =~ /^unxmacxp/ )
+ || ( $installer::globals::compiler =~ /^unxlngppc/ ))
{
$arch = "PPC";
}
@@ -889,8 +878,9 @@ sub resolve_variables_in_downloadname
elsif ( $installer::globals::issolarissparcbuild ) { $os = "solsparc"; }
elsif ( $installer::globals::issolarisx86build ) { $os = "solia"; }
elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; }
- elsif ( $installer::globals::compiler =~ /unxmacxi/ ) { $os = "macosxi"; }
- elsif ( $installer::globals::compiler =~ /unxmacxp/ ) { $os = "macosxp"; }
+ elsif ( $installer::globals::compiler =~ /unxmac.i/ ) { $os = "macosi"; }
+ elsif ( $installer::globals::compiler =~ /unxmac.x/ ) { $os = "macosx"; }
+ elsif ( $installer::globals::compiler =~ /unxmacxp/ ) { $os = "macosp"; }
else { $os = ""; }
$downloadname =~ s/\{os\}/$os/;
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/simplepackage.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/simplepackage.pm?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/simplepackage.pm (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/simplepackage.pm Wed May 8 17:54:12 2013
@@ -802,7 +802,7 @@ sub create_simple_package
installer::logger::include_header_into_logfile("Registering extensions:");
register_extensions($subfolderdir, $languagestringref, $preregdir);
- if ( $installer::globals::compiler =~ /^unxmacx/ )
+ if ( $installer::globals::compiler =~ /^unxmac/ )
{
installer::worker::put_scpactions_into_installset("$installdir/$packagename");
}
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/worker.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/worker.pm?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/worker.pm (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/worker.pm Wed May 8 17:54:12 2013
@@ -2259,10 +2259,14 @@ sub get_platform_name
{
$platformname = "Win32Intel";
}
- elsif ( $installer::globals::compiler =~ /^unxmacxi/ )
+ elsif(( $installer::globals::compiler =~ /^unxmac.i/ ))
{
$platformname = "MacOSXIntel";
}
+ elsif ( $installer::globals::compiler =~ /^unxmaccx/ )
+ {
+ $platformname = "MacOSXX86-64";
+ }
elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
{
$platformname = "MacOSXPowerPC";
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/modules/macosxotoolhelper.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/modules/macosxotoolhelper.pm?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/modules/macosxotoolhelper.pm (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/modules/macosxotoolhelper.pm Wed May 8 17:54:12 2013
@@ -26,6 +26,9 @@ require Exporter;
our @ISA = Exporter;
our @EXPORT = otoolD;
+use File::Basename;
+$::CC_PATH=(fileparse( $ENV{"CC"}))[1];
+
sub otoolD($) {
my ($file) = @_;
my $call = "otool -D $file";
@@ -39,3 +42,4 @@ sub otoolD($) {
close(IN);
return $line;
}
+
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml Wed May 8 17:54:12 2013
@@ -31,7 +31,7 @@
<property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" />
<property name="excludes.executables" value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
<property name="includes.mk" value="inc/unxmac*.mk inc/unxlng*.mk inc/wntmsci*.mk inc/unxsol*.mk" />
- <property name="excludes.outdirs" value="**/unxmacx*/**, **/unxlng*/**, **/unxsol*/**, **/wntmsci*/**" />
+ <property name="excludes.outdirs" value="**/unxmac*/**, **/unxlng*/**, **/unxsol*/**, **/wntmsci*/**" />
<target name="getrevision">
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/update_module_ignore_lists.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/update_module_ignore_lists.pl?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/update_module_ignore_lists.pl (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/update_module_ignore_lists.pl Wed May 8 17:54:12 2013
@@ -44,6 +44,9 @@ my @platforms = (
"unxsoli4",
"wntmsci12",
"unxmacxi",
+ "unxmacxp",
+ "unxmacci",
+ "unxmaccx",
"unxubit8",
"unxaixp",
"unxbsda",
@@ -70,7 +73,6 @@ my @platforms = (
"unxlngs390x",
"unxlngs",
"unxlnxi",
- "unxmacxp",
"unxsogi",
"unxsogs"
);
Modified: openoffice/branches/rejuvenate01/main/solenv/gbuild/Library.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/gbuild/Library.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/gbuild/Library.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/gbuild/Library.mk Wed May 8 17:54:12 2013
@@ -45,7 +45,7 @@ $(WORKDIR)/Clean/OutDir/lib/%$(gb_Librar
$(AUXTARGETS))
# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
-$(gb_Library_OUTDIRLOCATION)/%$(gb_Library_PLAINEXT) :
+$(gb_Library_OUTDIRLOCATION)/%$(gb_Library_PLAINEXT) :
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Deliver_deliver,$<,$@) \
$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
Modified: openoffice/branches/rejuvenate01/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/gbuild/LinkTarget.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/gbuild/LinkTarget.mk Wed May 8 17:54:12 2013
@@ -526,8 +526,8 @@ endif
endef
define gb_LinkTarget_add_cxxobject
-$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2)
-$(call gb_LinkTarget_get_clean_target,$(1)) : CXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS+=$(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : CXXOBJECTS+=$(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2))
$(call gb_CxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
Modified: openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk Wed May 8 17:54:12 2013
@@ -34,7 +34,6 @@
# PRODUCT
# SOLARINC
# SOLARLIB
-# STLPORT_VER
# UPD
# GXX_INCLUDE_PATH (Linux)
@@ -157,7 +156,6 @@ gb_GLOBALDEFS := \
-DENABLE_LAYOUT=0 \
-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
-DSOLAR_JAVA \
- -DSTLPORT_VERSION=$(STLPORT_VER) \
-DSUPD=$(UPD) \
-DVCL \
$(gb_OSDEFS) \
Modified: openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk Wed May 8 17:54:12 2013
@@ -22,7 +22,8 @@
GUI := UNX
-COM := GCC
+COM := CXX
+COMID := cxx
# Darwin mktemp -t expects a prefix, not a pattern
gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.
@@ -56,19 +57,23 @@ gb_OSDEFS := \
gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
- -DCPPU_ENV=gcc3 \
+ -DCPPU_ENV=$(COMID) \
-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
ifeq ($(CPUNAME),POWERPC)
gb_CPUDEFS := -DPOWERPC -DPPC
-else
+else ifeq ($(CPUNAME),INTEL)
gb_CPUDEFS := -DX86
+else ifeq ($(CPUNAME),X86_64)
+gb_CPUDEFS := -DX86_64
endif
ifeq ($(strip $(SYSBASE)),)
-gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
+#SDK_PATH := `xcodebuild -version -sdk macosx$(MACOSX_DEPLOYMENT_TARGET) Path`
+SDK_PATH := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+gb_SDKDIR := $(SDK_PATH)
else
-gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
+gb_SDKDIR := $(SYSBASE)/MacOSX10.7.sdk
endif
@@ -86,6 +91,7 @@ gb_CFLAGS := \
gb_CXXFLAGS := \
-isysroot $(gb_SDKDIR) \
+ -DHAVE_STL_INCLUDE_PATH -I../v1/ \
-Wall \
-Wendif-labels \
-Wextra \
@@ -96,11 +102,9 @@ gb_CXXFLAGS := \
-fno-common \
-fno-strict-aliasing \
-fsigned-char \
- -malign-natural \
-pipe \
#-Wshadow \ break in compiler headers already
#-fsigned-char \ might be removed?
- #-malign-natural \ might be removed?
# these are to get g++ to switch to Objective-C++ mode
# (see toolkit module for a case where it is necessary to do it this way)
@@ -113,12 +117,11 @@ endif
gb_LinkTarget_EXCEPTIONFLAGS := \
-DEXCEPTIONS_ON \
- -fexceptions \
- -fno-enforce-eh-specs \
+ -fexceptions
gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
- -fno-exceptions \
+ -fno-exceptions
gb_LinkTarget_LDFLAGS := \
-Wl,-syslibroot,$(gb_SDKDIR) \
@@ -300,20 +303,10 @@ gb_Library_TARGETTYPEFLAGS := -dynamicli
gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .dylib
-gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
-endif
+gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT)
-ifeq ($(CPUNAME),INTEL)
gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-else # ifeq ($(CPUNAME),POWERPC)
-gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-endif
gb_Library__FRAMEWORKS := \
Cocoa \
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/_tg_app.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/_tg_app.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/_tg_app.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/_tg_app.mk Wed May 8 17:54:12 2013
@@ -18,6 +18,16 @@
# under the License.
#
# *************************************************************
+
+.IF "$(OS)" != "MACOSX"
+CC_PATH=""
+.ELSE
+CC_PATH="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/"
+# TODO: better use something like
+# CC_PATH=$(shell dirname $(CC))/
+# instead and taking into account that $(CC) may already contain compiler options
+.ENDIF
+
# unroll begin
.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI"
@@ -44,6 +54,11 @@ APP1RPATH*=OOO
LINKFLAGSRUNPATH_$(APP1RPATH)*=/ERROR:/Bad_APP1RPATH_value
.IF "$(OS)" != "MACOSX"
APP1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP1RPATH))
+.ELSE
+CC_PATH="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/"
+# TODO: better use something like
+# CC_PATH=$(shell dirname $(CC))/
+# instead and taking into account that $(CC) may already contain compiler options
.ENDIF
.IF "$(APP1STACK)" != ""
@@ -117,8 +132,8 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS)
@+source $(MISC)/$(TARGET).$(@:b)_1.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP1RPATH) $@
@@ -377,8 +392,8 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS)
@+source $(MISC)/$(TARGET).$(@:b)_2.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP2RPATH) $@
@@ -637,8 +652,8 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS)
@+source $(MISC)/$(TARGET).$(@:b)_3.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP3RPATH) $@
@@ -897,8 +912,8 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS)
@+source $(MISC)/$(TARGET).$(@:b)_4.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP4RPATH) $@
@@ -1157,8 +1172,8 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS)
@+source $(MISC)/$(TARGET).$(@:b)_5.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP5RPATH) $@
@@ -1417,8 +1432,8 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS)
@+source $(MISC)/$(TARGET).$(@:b)_6.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP6RPATH) $@
@@ -1677,8 +1692,8 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS)
@+source $(MISC)/$(TARGET).$(@:b)_7.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP7RPATH) $@
@@ -1937,8 +1952,8 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS)
@+source $(MISC)/$(TARGET).$(@:b)_8.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP8RPATH) $@
@@ -2197,8 +2212,8 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS)
@+source $(MISC)/$(TARGET).$(@:b)_9.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP9RPATH) $@
@@ -2457,8 +2472,8 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
@+source $(MISC)/$(TARGET).$(@:b)_10.cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP10RPATH) $@
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/tg_app.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/tg_app.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/tg_app.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/tg_app.mk Wed May 8 17:54:12 2013
@@ -49,6 +49,8 @@ APP$(TNR)RPATH*=OOO
LINKFLAGSRUNPATH_$(APP$(TNR)RPATH)*=/ERROR:/Bad_APP$(TNR)RPATH_value
.IF "$(OS)" != "MACOSX"
APP$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP$(TNR)RPATH))
+.ELSE
+CC_PATH="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/"
.ENDIF
.IF "$(APP$(TNR)STACK)" != ""
@@ -122,8 +124,8 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(
@+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
# Need to strip __objcInit symbol to avoid duplicate symbols when loading
# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
+ @-$(CC_PATH)nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+ @$(CC_PATH)strip -i -R $(MISC)/$(@:b).strip -X $@
@ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP$(TNR)RPATH) $@
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk Wed May 8 17:54:12 2013
@@ -129,6 +129,11 @@ COMID=C730
COMNAME=MipsPro
.ENDIF
+.IF "$(COM)"=="CLANG"
+COMID=cxx
+COMNAME=cxx
+.ENDIF
+
.IF "$(COMNAME)"==""
# "EXCEPTIONSFILES" get compiled before this, but shouldn't
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/unx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/unx.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/unx.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/unx.mk Wed May 8 17:54:12 2013
@@ -151,6 +151,14 @@
.INCLUDE : unxmacxi.mk
.ENDIF
+.IF "$(COM)$(OS)$(CPU)" == "CLANGMACOSXI"
+.INCLUDE : unxmacci.mk
+.ENDIF
+
+.IF "$(COM)$(OS)$(CPU)" == "CLANGMACOSXX"
+.INCLUDE : unxmaccx.mk
+.ENDIF
+
.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXM"
.INCLUDE : unxlngmips.mk
.ENDIF
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/unxlng.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/unxlng.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/unxlng.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/unxlng.mk Wed May 8 17:54:12 2013
@@ -39,7 +39,8 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
+CDEFS+=-DBOOST_DETAIL_NO_CONTAINER_FWD
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -83,7 +84,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enfor
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
+CFLAGSCXX= -std=c++11 -pipe $(ARCH_FLAGS)
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
CFLAGSCXX += -fvisibility-inlines-hidden
.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -226,24 +227,6 @@ X11LINK_DYNAMIC = -Wl,--as-needed -lXext
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
Added: openoffice/branches/rejuvenate01/main/solenv/inc/unxmacc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/unxmacc.mk?rev=1480379&view=auto
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/unxmacc.mk (added)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/unxmacc.mk Wed May 8 17:54:12 2013
@@ -0,0 +1,263 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+##########################################################################
+# Platform MAKEFILE for Mac OS X and Darwin on both PowerPC and Intel
+##########################################################################
+
+# PROCESSOR_DEFINES and DLLPOSTFIX are defined in the particular platform file
+
+ASM=
+AFLAGS=
+LINKOUTPUT_FILTER=
+
+# Definitions that we may need on the compile line.
+# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
+# compiling STLport sources too, either internally or externally.
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
+
+# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build result
+# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
+# http://developer.apple.com/technotes/tn2002/tn2064.html
+# done in setsolar/configure now. left here for documentation
+#MACOSX_DEPLOYMENT_TARGET=10.7
+#.EXPORT: MACOSX_DEPLOYMENT_TARGET
+CDEFS+=-DQUARTZ
+EXTRA_CDEFS*=-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+
+# Name of library where static data members are initialized
+# STATICLIBNAME=static$(DLLPOSTFIX)
+# STATICLIB=-l$(STATICLIBNAME)
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF
+
+# MacOS X specific Java compilation/link flags
+SOLAR_JAVA*=TRUE
+.IF "$(SOLAR_JAVA)"!=""
+ JAVADEF=-DSOLAR_JAVA
+ JAVAFLAGSDEBUG=-g
+ JAVA_RUNTIME=-framework JavaVM
+.ENDIF
+
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+ARCH_FLAGS*=
+
+# Specify the compiler to use. NOTE: MacOS X should always specify
+# c++ for C++ compilation as it does certain C++ specific things
+# behind the scenes for us.
+# CC = C++ compiler to use
+# cc = C compiler to use
+# objc = Objective C compiler to use
+# objcpp = Objective C++ compiler to use
+CXX*=clang++
+CC*=clang
+objc*=$(CC)
+objcpp*=$(CXX)
+
+EXTRA_CFLAGS=
+
+CFLAGS=-fsigned-char -fmessage-length=0 -c $(EXTRA_CFLAGS)
+
+.IF "$(DISABLE_DEPRECATION_WARNING)" == "TRUE"
+CFLAGS+=-Wno-deprecated-declarations
+.ENDIF
+# ---------------------------------
+# Compilation flags
+# ---------------------------------
+# Normal C compilation flags
+CFLAGSCC=-pipe -fsigned-char
+
+# Normal Objective C compilation flags
+#OBJCFLAGS=-no-precomp
+OBJCFLAGS=-fobjc-exceptions
+# -x options generally ignored by ccache, tell it that it can cache
+# the result nevertheless
+CCACHE_SKIP:=$(eq,$(USE_CCACHE),YES --ccache-skip $(NULL))
+OBJCXXFLAGS:=$(CCACHE_SKIP) -x $(CCACHE_SKIP) objective-c++ -fobjc-exceptions
+
+# Comp Flags for files that need exceptions enabled (C and C++)
+CFLAGSEXCEPTIONS=-fexceptions
+
+# Comp Flags for files that do not need exceptions enabled (C and C++)
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# Normal C++ compilation flags
+CFLAGSCXX=-pipe -std=c++11 -fsigned-char
+
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+
+PICSWITCH:=-fPIC
+# Other flags
+CFLAGSOBJGUIMT=$(PICSWITCH) -fno-common
+CFLAGSOBJCUIMT=$(PICSWITCH) -fno-common
+CFLAGSSLOGUIMT=$(PICSWITCH) -fno-common
+CFLAGSSLOCUIMT=$(PICSWITCH) -fno-common
+CFLAGSPROF=
+
+# Flag for including debugging information in object files
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+
+# Flag to specify output file to compiler/linker
+CFLAGSOUTOBJ=-o
+
+# Flags to enable precompiled headers
+CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
+CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
+
+# ---------------------------------
+# Optimization flags
+# ---------------------------------
+CFLAGSOPT=-O2 -fno-strict-aliasing
+CFLAGSNOOPT=-O0
+
+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+# -Wshadow does not work for C++ as /usr/include/c++/4.0.0/ext/hashtable.h
+# l. 717 contains a declaration of __cur2 shadowing the declaration at l. 705,
+# in template code for which a #pragma gcc system_header would not work:
+CFLAGSWARNCC=-Wall -Wendif-labels
+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
+CFLAGSWALLCC=$(CFLAGSWARNCC)
+CFLAGSWALLCXX=$(CFLAGSWARNCXX)
+CFLAGSWERRCC=-Werror
+
+# All modules on this platform compile without warnings.
+# If you need to set MODULES_WITH_WARNINGS here, comment
+# COMPILER_WARN_ERRORS=TRUE here (see settings.mk):
+COMPILER_WARN_ERRORS=TRUE
+
+#special settings from environment
+CDEFS+=$(EXTRA_CDEFS)
+
+# ---------------------------------
+# STL library names
+# ---------------------------------
+
+CDEFS+=-DHAVE_STL_INCLUDE_PATH -I../v1/
+STDLIBCPP=-lc++
+
+# ---------------------------------
+# Link stage flags
+# ---------------------------------
+
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+###LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
+# assure backwards-compatibility
+###EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
+EXTRA_LINKFLAGS*=-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+# Very long install_names are needed so that install_name_tool -change later on
+# does not complain that "larger updated load commands do not fit:"
+LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)'
+LINKFLAGSRUNPATH_UREBIN=
+LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)'
+LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_BRAND=
+LINKFLAGSRUNPATH_OXT=
+LINKFLAGSRUNPATH_BOXT=
+LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
+LINKFLAGS=$(LINKFLAGSDEFS)
+
+# [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line
+.IF "$(GUIBASE)" == "aqua"
+ LINKFLAGS+=-lobjc
+ # Sometimes we still use files that would be in a GUIBASE="unx" specific directory
+ # because they really aren't GUIBASE specific, so we've got to account for that here.
+ INCGUI+= -I$(PRJ)/unx/inc
+.ENDIF
+
+#special settings form environment
+LINKFLAGS+=$(EXTRA_LINKFLAGS)
+
+# Random link flags dealing with different cases of linking
+
+LINKFLAGSAPPGUI=-bind_at_load
+LINKFLAGSSHLGUI=-dynamiclib -single_module
+LINKFLAGSAPPCUI=-bind_at_load
+LINKFLAGSSHLCUI=-dynamiclib -single_module
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+
+# Flag to add debugging information to final products
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# ---------------------------------
+# MacOS X shared library specifics
+# ---------------------------------
+
+# Tag to identify an output file as a library
+DLLPRE=lib
+# File extension to identify dynamic shared libraries on MacOS X
+DLLPOST=.dylib
+# Precompiled header file extension
+PCHPOST=.gch
+
+#LINKVERSIONMAPFLAG=-Xlinker -map -Xlinker
+LINKVERSIONMAPFLAG=-Wl,-map -Wl,
+
+SONAME_SWITCH=-Wl,-h
+
+### STDLIBCPP=-stdlib=libc++
+STDLIBCPP=-lc++
+
+STDOBJVCL=$(L)/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+.IF "$(GUIBASE)" == "aqua"
+ STDLIBCUIMT=CPPRUNTIME -lm
+ STDLIBGUIMT=-framework Carbon -framework Cocoa -lpthread CPPRUNTIME -lm
+ STDSHLCUIMT=-lpthread CPPRUNTIME -lm
+ STDSHLGUIMT=-framework Carbon -framework CoreFoundation -framework Cocoa -lpthread CPPRUNTIME -lm
+.ELSE
+ STDLIBCUIMT= CPPRUNTIME -lm
+ STDLIBGUIMT=-lX11 -lpthread CPPRUNTIME -lm
+ STDSHLCUIMT=-lpthread CPPRUNTIME -lm
+ STDSHLGUIMT=-lX11 -lXext -lpthread CPPRUNTIME -lm -framework CoreFoundation
+.ENDIF
+
+LIBMGR=ar
+LIBFLAGS=-r
+
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+OOO_LIBRARY_PATH_VAR = DYLD_LIBRARY_PATH
Added: openoffice/branches/rejuvenate01/main/solenv/inc/unxmacci.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/unxmacci.mk?rev=1480379&view=auto
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/unxmacci.mk (added)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/unxmacci.mk Wed May 8 17:54:12 2013
@@ -0,0 +1,37 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+# Mac OSX specific defines
+
+PROCESSOR_DEFINES=-DX86
+
+DLLPOSTFIX=
+
+# flags to enable build with symbols; required by crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g
+.ENDIF
+
+# Include generic Mac OS X makefile
+.INCLUDE : unxmacc.mk
+
Added: openoffice/branches/rejuvenate01/main/solenv/inc/unxmaccx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/unxmaccx.mk?rev=1480379&view=auto
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/unxmaccx.mk (added)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/unxmaccx.mk Wed May 8 17:54:12 2013
@@ -0,0 +1,37 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+# Mac OSX specific defines
+
+PROCESSOR_DEFINES=-DX86_64
+
+DLLPOSTFIX=
+
+# flags to enable build with symbols; required by crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g
+.ENDIF
+
+# Include generic Mac OS X makefile
+.INCLUDE : unxmacc.mk
+
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/unxmacx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/unxmacx.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/unxmacx.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/unxmacx.mk Wed May 8 17:54:12 2013
@@ -34,22 +34,18 @@ LINKOUTPUT_FILTER=
# Definitions that we may need on the compile line.
# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
# compiling STLport sources too, either internally or externally.
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1
-.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES"
-CDEFS+=-DX_LOCALE
-.ENDIF
-.IF "$(GUIBASE)"=="aqua"
-# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
-# build can assume functions/libraries of that version to be available
-# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
+
+# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build result
# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
# http://developer.apple.com/technotes/tn2002/tn2064.html
# done in setsolar/configure now. left here for documentation
-#MACOSX_DEPLOYMENT_TARGET=10.4
+#MACOSX_DEPLOYMENT_TARGET=10.7
#.EXPORT: MACOSX_DEPLOYMENT_TARGET
-CDEFS+=-DQUARTZ
-EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk
-.ENDIF
+CDEFS+=-DQUARTZ
+#SDK_PATH=`xcodebuild -version -sdk macosx$(MACOSX_DEPLOYMENT_TARGET) Path`
+SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+EXTRA_CDEFS*=-isysroot $(SDK_PATH)
# Name of library where static data members are initialized
# STATICLIBNAME=static$(DLLPOSTFIX)
@@ -57,9 +53,8 @@ EXTRA_CDEFS*=-isysroot /Developer/SDKs/M
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
+ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF
# MacOS X specific Java compilation/link flags
SOLAR_JAVA*=TRUE
@@ -71,7 +66,7 @@ SOLAR_JAVA*=TRUE
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
+ARCH_FLAGS*= -arch i386
# Specify the compiler to use. NOTE: MacOS X should always specify
# c++ for C++ compilation as it does certain C++ specific things
@@ -85,7 +80,13 @@ CC*=gcc
objc*=$(CC)
objcpp*=$(CXX)
-CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
+EXTRA_CFLAGS=$(ARCH_FLAGS)
+
+.IF "$(COM)"=="GCC"
+ CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
+.ELSE
+ CFLAGS=-fsigned-char -fmessage-length=0 -c $(EXTRA_CFLAGS)
+.ENDIF
.IF "$(DISABLE_DEPRECATION_WARNING)" == "TRUE"
CFLAGS+=-Wno-deprecated-declarations
@@ -94,7 +95,11 @@ CFLAGS+=-Wno-deprecated-declarations
# Compilation flags
# ---------------------------------
# Normal C compilation flags
-CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS)
+.IF "$(COM)"=="GCC"
+ CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS)
+.ELSE
+ CFLAGSCC=-pipe -fsigned-char $(ARCH_FLAGS)
+.ENDIF
# Normal Objective C compilation flags
#OBJCFLAGS=-no-precomp
@@ -105,13 +110,20 @@ CCACHE_SKIP:=$(eq,$(USE_CCACHE),YES --cc
OBJCXXFLAGS:=$(CCACHE_SKIP) -x $(CCACHE_SKIP) objective-c++ -fobjc-exceptions
# Comp Flags for files that need exceptions enabled (C and C++)
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+CFLAGSEXCEPTIONS=-fexceptions
# Comp Flags for files that do not need exceptions enabled (C and C++)
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
# Normal C++ compilation flags
-CFLAGSCXX=-pipe -malign-natural -fsigned-char $(ARCH_FLAGS)
+.IF "$(COM)"=="GCC"
+ CFLAGSEXCEPTIONS+=-fexceptions -fno-enforce-eh-specs
+ CFLAGSCXX=-pipe -malign-natural -fsigned-char -Wno-long-double $(ARCH_FLAGS)
+.ELSE ####
+ CFLAGSEXCEPTIONS+=-fexceptions
+ CFLAGSCXX=-pipe -fsigned-char -Wno-long-double $(ARCH_FLAGS)
+.ENDIF
+
CFLAGSCXX+= -Wno-ctor-dtor-privacy
PICSWITCH:=-fPIC
@@ -159,7 +171,7 @@ COMPILER_WARN_ERRORS=TRUE
#special settings form environment
CDEFS+=$(EXTRA_CDEFS)
-STDLIBCPP=-lstdc++
+STDLIBCPP=-lc++
# ---------------------------------
# STLport library names
@@ -185,16 +197,12 @@ LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/l
# ---------------------------------
# Link stage flags
# ---------------------------------
-# always link with gcc since you may be linking c code and don't want -lstdc++ linked in!
-
-## ericb 04 mars 2005
LINK*=$(CXX)
LINKC*=$(CC)
-LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
# assure backwards-compatibility
-EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
+EXTRA_LINKFLAGS*=$(ARCH_FLAGS) -L$(SDK_PATH)
# Very long install_names are needed so that install_name_tool -change later on
# does not complain that "larger updated load commands do not fit:"
LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)'
@@ -207,16 +215,8 @@ LINKFLAGSRUNPATH_BOXT=
LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
LINKFLAGS=$(LINKFLAGSDEFS)
-# [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line
-.IF "$(GUIBASE)" == "aqua"
- LINKFLAGS+=-lobjc
- # Sometimes we still use files that would be in a GUIBASE="unx" specific directory
- # because they really aren't GUIBASE specific, so we've got to account for that here.
- INCGUI+= -I$(PRJ)/unx/inc
-.ENDIF
-
#special settings form environment
-LINKFLAGS+=$(EXTRA_LINKFLAGS)
+LINKFLAGS+=$(EXTRA_LINKFLAGS) $(ARCH_FLAGS)
# Random link flags dealing with different cases of linking
@@ -242,13 +242,16 @@ DLLPOST=.dylib
# Precompiled header file extension
PCHPOST=.gch
-# We don't use mapping on MacOS X
-#LINKVERSIONMAPFLAG=-Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,-exported_symbols_list
+#LINKVERSIONMAPFLAG=-Xlinker -map -Xlinker
+LINKVERSIONMAPFLAG=-Wl,-map -Wl,
SONAME_SWITCH=-Wl,-h
-STDLIBCPP=-lstdc++
+.IF "$(COM)"=="GCC"
+ STDLIBCPP=-stdlib=libc++
+.ELSE
+ STDLIBCPP=-lc++
+.ENDIF
STDOBJVCL=$(L)/salmain.o
STDOBJGUI=
@@ -256,17 +259,10 @@ STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
-.IF "$(GUIBASE)" == "aqua"
- STDLIBCUIMT=CPPRUNTIME -lm
- STDLIBGUIMT=-framework Carbon -framework Cocoa -lpthread CPPRUNTIME -lm
- STDSHLCUIMT=-lpthread CPPRUNTIME -lm
- STDSHLGUIMT=-framework Carbon -framework CoreFoundation -framework Cocoa -lpthread CPPRUNTIME -lm
-.ELSE
- STDLIBCUIMT= CPPRUNTIME -lm
- STDLIBGUIMT=-lX11 -lpthread CPPRUNTIME -lm
- STDSHLCUIMT=-lpthread CPPRUNTIME -lm
- STDSHLGUIMT=-lX11 -lXext -lpthread CPPRUNTIME -lm -framework CoreFoundation
-.ENDIF
+STDLIBCUIMT=CPPRUNTIME -lm
+STDLIBGUIMT=-framework Carbon -framework Cocoa -lpthread CPPRUNTIME -lm
+STDSHLCUIMT=-lpthread CPPRUNTIME -lm
+STDSHLGUIMT=-framework Carbon -framework CoreFoundation -framework Cocoa -lpthread CPPRUNTIME -lm -objc
LIBMGR=ar
LIBFLAGS=-r
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk?rev=1480379&r1=1480378&r2=1480379&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk Wed May 8 17:54:12 2013
@@ -219,7 +219,7 @@ CFLAGSWERRCC=-WX
MODULES_WITH_WARNINGS := \
soldep
-CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
+CDEFS+=-D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
.IF "$(COMEX)" == "11"
_VC_MANIFEST_BASENAME=__VC80
.ELSE