Skip to content

C
core
Kaydet (Commit) 7aa6f1b0 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Remove Mac OS X for PowerPC support 

Change-Id: I10b15141e6a5f93365e1cfa6fbc0c7cc3ea49b15
üst d8842c22
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 615 deletions
README.cross
Dosyayı görüntüle @ 7aa6f1b0
......@@ -2,7 +2,7 @@ Cross-compiling LibreOffice
***************************
Cross-compilation works, to various degree, to the following
platforms: Windows, iOS, Android, PowerPC Mac OS X, Raspbian.
platforms: Windows, iOS, Android, and Raspbian.
General
......@@ -391,25 +391,6 @@ To debug, do manually what "make run" would do and when the app has
started, run ndk-gdb.
PowerPC Mac OS X
****************
Cross-compiling for PowerPC Mac OS X from Intel Mac OS X is easy in
theory. The APIs available should after all be closely identical to
those on a corrersponding (obsolete) version of Mac OS X for Intel,
and LibreOffice builds fine natively on PowerPC Mac already. Only a
little experimenting has been done with it, and it seems that nobody
actually is interested in it. An autogen.lastrun looked like this when
last tried:
CC=ccache /Xcode3/usr/bin/gcc-4.0 -arch ppc
CXX=ccache /Xcode3/usr/bin/g++-4.0 -arch ppc
CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
--build=i386-apple-darwin10.7.0
--host=powerpc-apple-darwin10
Raspbian
********
......
bridges/Library_cpp_uno.mk
Dosyayı görüntüle @ 7aa6f1b0
......@@ -142,12 +142,6 @@ bridge_noopt_objects := except
bridge_asm_objects := call
endif
else ifeq ($(OS)$(CPU),MACOSXP)
bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc
bridge_noopt_objects := uno2cpp
bridge_exception_objects := cpp2uno except
else ifeq ($(OS)$(CPU),SOLARISI)
bridges_SELECTED_BRIDGE := gcc3_solaris_intel
......
bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx deleted 100644 → 0
Dosyayı görüntüle @ d8842c22
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* 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 .
*/
#include <stdio.h>
#include <dlfcn.h>
#include <cxxabi.h>
#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
#include <com/sun/star/uno/genfunc.hxx>
#include <typelib/typedescription.hxx>
#include <uno/any2.h>
#include "share.hxx"
using namespace ::std;
using namespace ::osl;
using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::__cxxabiv1;
namespace CPPU_CURRENT_NAMESPACE
{
void dummy_can_throw_anything( char const * )
{
}
//==================================================================================================
static OUString toUNOname( char const * p ) SAL_THROW(())
{
#ifdef DEBUG
char const * start = p;
#endif
// example: N3com3sun4star4lang24IllegalArgumentExceptionE
OUStringBuffer buf( 64 );
OSL_ASSERT( 'N' == *p );
++p; // skip N
while ('E' != *p)
{
// read chars count
long n = (*p++ - '0');
while ('0' <= *p && '9' >= *p)
{
n *= 10;
n += (*p++ - '0');
}
buf.appendAscii( p, n );
p += n;
if ('E' != *p)
buf.append( (sal_Unicode)'.' );
}
#ifdef DEBUG
OUString ret( buf.makeStringAndClear() );
OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
return ret;
#else
return buf.makeStringAndClear();
#endif
}
//==================================================================================================
class RTTI
{
typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
Mutex m_mutex;
t_rtti_map m_rttis;
t_rtti_map m_generatedRttis;
void * m_hApp;
public:
RTTI() SAL_THROW(());
~RTTI() SAL_THROW(());
type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW(());
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW(())
: m_hApp( dlopen( 0, RTLD_LAZY ) )
{
}
//__________________________________________________________________________________________________
RTTI::~RTTI() SAL_THROW(())
{
dlclose( m_hApp );
}
//__________________________________________________________________________________________________
type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW(())
{
type_info * rtti;
OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
MutexGuard guard( m_mutex );
t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
if (iFind == m_rttis.end())
{
// RTTI symbol
OStringBuffer buf( 64 );
buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
OUString token( unoName.getToken( 0, '.', index ) );
buf.append( token.getLength() );
OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
buf.append( c_token );
}
while (index >= 0);
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
if (rtti)
{
pair< t_rtti_map::iterator, bool > insertion(
m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
}
else
{
// try to lookup the symbol in the generated rtti map
t_rtti_map::const_iterator iiFind( m_generatedRttis.find( unoName ) );
if (iiFind == m_generatedRttis.end())
{
// we must generate it !
// symbol and rtti-name is nearly identical,
// the symbol is prefixed with _ZTI
char const * rttiName = symName.getStr() +4;
#ifdef DEBUG
fprintf( stderr,"generated rtti for %s\n", rttiName );
#endif
if (pTypeDescr->pBaseTypeDescription)
{
// ensure availability of base
type_info * base_rtti = getRTTI(
(typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
rtti = new __si_class_type_info(
strdup( rttiName ), (__class_type_info *)base_rtti );
}
else
{
// this class has no base class
rtti = new __class_type_info( strdup( rttiName ) );
}
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?!" );
}
else // taking already generated rtti
{
rtti = iiFind->second;
}
}
}
else
{
rtti = iFind->second;
}
return rtti;
}
//--------------------------------------------------------------------------------------------------
static void deleteException( void * pExc )
{
__cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
typelib_TypeDescription * pTD = 0;
OUString unoName( toUNOname( header->exceptionType->name() ) );
::typelib_typedescription_getByName( &pTD, unoName.pData );
OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
if (pTD)
{
::uno_destructData( pExc, pTD, cpp_release );
::typelib_typedescription_release( pTD );
}
}
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
void * pCppExc;
type_info * rtti;
{
// construct cpp exception object
typelib_TypeDescription * pTypeDescr = 0;
TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
OSL_ASSERT( pTypeDescr );
if (! pTypeDescr)
terminate();
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
// destruct uno exception
::uno_any_destruct( pUnoExc, 0 );
// avoiding locked counts
static RTTI * s_rtti = 0;
if (! s_rtti)
{
MutexGuard guard( Mutex::getGlobalMutex() );
if (! s_rtti)
{
#ifdef LEAK_STATIC_DATA
s_rtti = new RTTI();
#else
static RTTI rtti_data;
s_rtti = &rtti_data;
#endif
}
}
rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
TYPELIB_DANGER_RELEASE( pTypeDescr );
OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
if (! rtti)
terminate();
}
__cxa_throw( pCppExc, rtti, deleteException );
}
//==================================================================================================
void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
{
OSL_ENSURE( header, "### no exception header!!!" );
if (! header)
terminate();
typelib_TypeDescription * pExcTypeDescr = 0;
OUString unoName( toUNOname( header->exceptionType->name() ) );
::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
if (! pExcTypeDescr)
terminate();
// construct uno exception any
::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
::typelib_typedescription_release( pExcTypeDescr );
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx deleted 100644 → 0
Dosyayı görüntüle @ d8842c22
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* 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 .
*/
#include "uno/mapping.h"
#include <typeinfo>
#include <exception>
#include <cstddef>
namespace CPPU_CURRENT_NAMESPACE
{
void dummy_can_throw_anything( char const * );
// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
struct _Unwind_Exception
{
unsigned exception_class __attribute__((__mode__(__DI__)));
void * exception_cleanup;
unsigned private_1 __attribute__((__mode__(__word__)));
unsigned private_2 __attribute__((__mode__(__word__)));
} __attribute__((__aligned__));
struct __cxa_exception
{
::std::type_info *exceptionType;
void (*exceptionDestructor)(void *);
::std::unexpected_handler unexpectedHandler;
::std::terminate_handler terminateHandler;
__cxa_exception *nextException;
int handlerCount;
int handlerSwitchValue;
const unsigned char *actionRecord;
const unsigned char *languageSpecificData;
void *catchTemp;
void *adjustedPtr;
_Unwind_Exception unwindHeader;
};
extern "C" void *__cxa_allocate_exception(
std::size_t thrown_size ) throw();
extern "C" void __cxa_throw (
void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
struct __cxa_eh_globals
{
__cxa_exception *caughtExceptions;
unsigned int uncaughtExceptions;
};
extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
//==================================================================================================
void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException(
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
configure.ac
Dosyayı görüntüle @ 7aa6f1b0
......@@ -2353,10 +2353,7 @@ dnl Check / find MacOSX SDK and compiler, version checks
dnl ===================================================================
if test "$_os" = "Darwin"; then
if test "$build_cpu" = i386 -a "$host_cpu" = powerpc; then
# Cross-compiling for PPC from Intel
arch='-arch ppc'
elif test "$enable_64_bit" = "" -o "$enable_64_bit" = "no"; then
if test "$enable_64_bit" = "" -o "$enable_64_bit" = "no"; then
bitness=-m32
else
bitness=-m64
......@@ -3435,13 +3432,6 @@ darwin*)
OUTPATH=unxiosr
OS=IOS
;;
powerpc*)
CPU=P
CPUNAME=POWERPC
RTL_ARCH=PowerPC
PLATFORMID=macosx_powerpc
OUTPATH=unxmacxp
;;
i*86)
if test "$BITNESS_OVERRIDE" = 64; then
AC_MSG_ERROR([Can't build 64-bit code in 32-bit OS])
......@@ -5078,12 +5068,6 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
],
[
case "$_os-$host_cpu" in
Darwin-powerpc)
test -z "$ac_cv_alignof_short" && ac_cv_alignof_short=1
test -z "$ac_cv_alignof_int" && ac_cv_alignof_int=1
test -z "$ac_cv_alignof_long" && ac_cv_alignof_long=1
test -z "$ac_cv_alignof_double" && ac_cv_alignof_double=1
;;
Linux-i686)
test -z "$ac_cv_alignof_short" && ac_cv_alignof_short=2
test -z "$ac_cv_alignof_int" && ac_cv_alignof_int=4
......
desktop/source/deployment/misc/dp_platform.cxx
Dosyayı görüntüle @ 7aa6f1b0
......@@ -56,7 +56,6 @@
#define PLATFORM_NETBSD_X86 "netbsd_x86"
#define PLATFORM_NETBSD_X86_64 "netbsd_x86_64"
#define PLATFORM_MACOSX_X86 "macosx_x86"
#define PLATFORM_MACOSX_PPC "macosx_powerpc"
#define PLATFORM_OPENBSD_X86 "openbsd_x86"
#define PLATFORM_OPENBSD_X86_64 "openbsd_x86_64"
#define PLATFORM_DRAGONFLY_X86 "dragonfly_x86"
......@@ -166,8 +165,6 @@ namespace
ret = checkOSandCPU("NetBSD", "X86_64");
else if (token == PLATFORM_MACOSX_X86)
ret = checkOSandCPU("MacOSX", "x86");
else if (token == PLATFORM_MACOSX_PPC)
ret = checkOSandCPU("MacOSX", "PowerPC");
else if (token == PLATFORM_AIX_POWERPC)
ret = checkOSandCPU("AIX", "PowerPC");
else if (token == PLATFORM_OPENBSD_X86)
......
helpcompiler/Library_helplinker.mk
Dosyayı görüntüle @ 7aa6f1b0
......@@ -68,15 +68,8 @@ $(eval $(call gb_Library_add_exception_objects,helplinker,\
helpcompiler/source/BasCodeTagger \
))
ifeq ($(strip $(OS)$(CPU)$(COM)),MACOSXPGCC)
$(eval $(call gb_Library_add_cxxobjects,helplinker,\
helpcompiler/source/HelpLinker \
, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
else
$(eval $(call gb_Library_add_exception_objects,helplinker,\
helpcompiler/source/HelpLinker \
))
endif
# vim: set noet sw=4 ts=4:
jpeg/UnpackedTarball_jpeg.mk
Dosyayı görüntüle @ 7aa6f1b0
......@@ -17,10 +17,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,jpeg,\
jpeg/patches/jpeg-8c-jmorecfg.patch \
))
ifeq ($(OS)$(CPU),MACOSXP)
$(eval $(call gb_UnpackedTarball_add_patches,jpeg,\
jpeg/patches/struct_alignment.patch \
))
endif
# vim: set noet sw=4 ts=4:
jpeg/patches/struct_alignment.patch deleted 100644 → 0
Dosyayı görüntüle @ d8842c22
without this patch, the jpeg_decompress_struct & jpec_compress_struct will be padded, this in turn
results in a mismatch when the jpeg filter in svtools is built, where no
padding is assumed. Only affects Mac/PPC apparenlty, see fdo#47035
--- misc/jpeg-8c/jpeglib.h 2010-11-17 22:01:56.000000000 +0100
+++ misc/build/jpeg-8c/jpeglib.h 2012-05-19 13:58:31.000000000 +0200
@@ -288,9 +288,9 @@
JDIMENSION image_width; /* input image width */
JDIMENSION image_height; /* input image height */
int input_components; /* # of color components in input image */
- J_COLOR_SPACE in_color_space; /* colorspace of input image */
double input_gamma; /* image gamma of input image */
+ J_COLOR_SPACE in_color_space; /* colorspace of input image */
/* Compression parameters --- these fields must be set before calling
* jpeg_start_compress(). We recommend calling jpeg_set_defaults() to
@@ -359,16 +359,16 @@
/* Parameters controlling emission of special markers. */
boolean write_JFIF_header; /* should a JFIF marker be written? */
+ boolean write_Adobe_marker; /* should an Adobe marker be written? */
UINT8 JFIF_major_version; /* What to write for the JFIF version number */
UINT8 JFIF_minor_version;
/* These three values are not used by the JPEG code, merely copied */
/* into the JFIF APP0 marker. density_unit can be 0 for unknown, */
/* 1 for dots/inch, or 2 for dots/cm. Note that the pixel aspect */
/* ratio is defined by X_density/Y_density even when density_unit=0. */
- UINT8 density_unit; /* JFIF code for pixel size units */
UINT16 X_density; /* Horizontal pixel density */
UINT16 Y_density; /* Vertical pixel density */
- boolean write_Adobe_marker; /* should an Adobe marker be written? */
+ UINT8 density_unit; /* JFIF code for pixel size units */
/* State variable: index of next scanline to be written to
* jpeg_write_scanlines(). Application may use this to control its
@@ -583,11 +583,11 @@
/* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
UINT8 JFIF_major_version; /* JFIF version number */
UINT8 JFIF_minor_version;
+ UINT8 Adobe_transform; /* Color transform code from Adobe marker */
UINT8 density_unit; /* JFIF code for pixel size units */
UINT16 X_density; /* Horizontal pixel density */
UINT16 Y_density; /* Vertical pixel density */
boolean saw_Adobe_marker; /* TRUE iff an Adobe APP14 marker was found */
- UINT8 Adobe_transform; /* Color transform code from Adobe marker */
boolean CCIR601_sampling; /* TRUE=first samples are cosited */
libxmlsec/UnpackedTarball_xmlsec.mk
Dosyayı görüntüle @ 7aa6f1b0
......@@ -42,10 +42,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
))
endif
ifeq ($(OS)$(CPU),MACOSXP)
$(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
libxmlsec/xmlsec1-1.2.14_old_automake.patch \
))
endif
# vim: set noet sw=4 ts=4:
libxmlsec/xmlsec1-1.2.14_old_automake.patch deleted 100644 → 0
Dosyayı görüntüle @ d8842c22
--- misc/xmlsec1-1.2.14/configure.in 2012-09-12 19:15:56.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/configure.in 2012-09-12 18:56:01.000000000 +0200
@@ -21,8 +21,8 @@
AC_SUBST(XMLSEC_VERSION_INFO)
AC_CONFIG_MACRO_DIR(m4)
-AM_INIT_AUTOMAKE([1.7 tar-ustar])
-AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([1.6.3])
+AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
dnl
--- misc/xmlsec1-1.2.14/src/gnutls/Makefile.am 2009-12-05 22:19:18.000000000 +0100
+++ misc/build/xmlsec1-1.2.14/src/gnutls/Makefile.am 2012-09-12 19:09:38.000000000 +0200
@@ -18,7 +18,11 @@
$(LIBXML_CFLAGS) \
$(NULL)
-libxmlsec1_gnutls_la_SOURCES =\
+if SHAREDLIB_HACK
+SHAREDLIBHACKDEP = ../strings.c
+endif
+
+libxmlsec1_gnutls_la_SOURCES = $(SHAREDLIBHACKDEP) \
app.c \
ciphers.c \
crypto.c \
@@ -28,10 +32,6 @@
globals.h \
$(NULL)
-if SHAREDLIB_HACK
-libxmlsec1_gnutls_la_SOURCES += ../strings.c
-endif
-
libxmlsec1_gnutls_la_LIBADD = \
../libxmlsec1.la \
$(GNUTLS_LIBS) \
--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2012-09-12 19:15:56.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2012-09-12 19:10:52.000000000 +0200
@@ -19,7 +19,11 @@
$(LIBXML_CFLAGS) \
$(NULL)
-libxmlsec1_mscrypto_la_SOURCES =\
+if SHAREDLIB_HACK
+SHAREDLIBHACKDEP = ../strings.c
+endif
+
+libxmlsec1_mscrypto_la_SOURCES = $(SHAREDLIBHACKDEP) \
app.c \
certkeys.c \
ciphers.c \
@@ -38,10 +42,6 @@
akmngr.c \
$(NULL)
-if SHAREDLIB_HACK
-libxmlsec1_mscrypto_la_SOURCES += ../strings.c
-endif
-
libxmlsec1_mscrypto_la_LIBADD = \
../libxmlsec1.la \
$(MSCRYPTO_LIBS) \
--- misc/xmlsec1-1.2.14/src/nss/Makefile.am 2012-09-12 19:15:56.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.am 2012-09-12 19:11:58.000000000 +0200
@@ -8,7 +8,7 @@
libxmlsec1-nss.la \
$(NULL)
-libxmlsec1_nss_la_CPPFLAGS = \
+libxmlsec1_nss_la_CFLAGS = \
-DPACKAGE=\"@PACKAGE@\" \
-I../../include \
-I$(top_srcdir)/include \
@@ -18,7 +18,11 @@
$(LIBXML_CFLAGS) \
$(NULL)
-libxmlsec1_nss_la_SOURCES =\
+if SHAREDLIB_HACK
+SHAREDLIBHACKDEP = ../strings.c
+endif
+
+libxmlsec1_nss_la_SOURCES = $(SHAREDLIBHACKDEP) \
app.c \
bignum.c \
ciphers.c \
@@ -40,10 +44,6 @@
tokens.c \
$(NULL)
-if SHAREDLIB_HACK
-libxmlsec1_nss_la_SOURCES += ../strings.c
-endif
-
libxmlsec1_nss_la_LIBADD = \
../libxmlsec1.la \
$(NSS_LIBS) \
--- misc/xmlsec1-1.2.14/src/openssl/Makefile.am 2009-12-05 22:19:18.000000000 +0100
+++ misc/build/xmlsec1-1.2.14/src/openssl/Makefile.am 2012-09-12 19:12:55.000000000 +0200
@@ -18,7 +18,11 @@
$(LIBXML_CFLAGS) \
$(NULL)
-libxmlsec1_openssl_la_SOURCES =\
+if SHAREDLIB_HACK
+SHAREDLIBHACKDEP = ../strings.c
+endif
+
+libxmlsec1_openssl_la_SOURCES = $(SHAREDLIBHACKDEP) \
app.c \
bn.c \
ciphers.c \
@@ -36,10 +40,6 @@
globals.h \
$(NULL)
-if SHAREDLIB_HACK
-libxmlsec1_openssl_la_SOURCES += ../strings.c
-endif
-
libxmlsec1_openssl_la_LIBADD = \
../libxmlsec1.la \
$(OPENSSL_LIBS) \
nss/ExternalProject_nss.mk
Dosyayı görüntüle @ 7aa6f1b0
......@@ -75,7 +75,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
$(if $(filter 1060 1070 1080,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(filter YES,$(CROSS_COMPILING)),\
$(if $(filter MACOSXP,$(OS)$(CPU)),CPU_ARCH=ppc) \
NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py") \
NSDISTMODE=copy \
$(MAKE) -j1 nss_build_all \
......
odk/settings/settings.mk
Dosyayı görüntüle @ 7aa6f1b0
......@@ -390,9 +390,6 @@ else
ifeq "$(PROCTYPE)" "x86_64"
UNOPKG_PLATFORM=MacOSX_x86
JAVA_PROC_TYPE=x86
else
UNOPKG_PLATFORM=MacOSX_PowerPC
JAVA_PROC_TYPE=ppc
endif
endif
JAVABIN=Commands
......
solenv/bin/modules/installer/download.pm
Dosyayı görüntüle @ 7aa6f1b0
......@@ -424,10 +424,6 @@ sub get_download_architecture
{
$arch = "x86-64";
}
elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
{
$arch = "PPC";
}
return $arch;
}
......@@ -599,7 +595,6 @@ sub resolve_variables_in_downloadname
elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; }
elsif ( $installer::globals::compiler =~ /unxmacxi/ ) { $os = "macosxi"; }
elsif ( $installer::globals::compiler =~ /unxmacxx/ ) { $os = "macosxx"; }
elsif ( $installer::globals::compiler =~ /unxmacxp/ ) { $os = "macosxp"; }
else { $os = ""; }
$downloadname =~ s/\{os\}/$os/;
......
testtools/Module_testtools.mk
Dosyayı görüntüle @ 7aa6f1b0
......@@ -51,13 +51,9 @@ $(eval $(call gb_Module_add_targets,testtools,\
))
endif
# FIXME: Mac OSX PPC GCC fails this test!, likely broken UNO bridge.
# (is it still relevant?)
ifneq ($(COM)$(OS)$(CPU),GCCMACOSXP)
$(eval $(call gb_Module_add_check_targets,testtools,\
CustomTarget_uno_test \
))
endif
endif
......
xpdf/ExternalProject_xpdf.mk
Dosyayı görüntüle @ 7aa6f1b0
......@@ -38,7 +38,6 @@ $(call gb_ExternalProject_get_state_target,xpdf,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include") \
$(if $(filter MACOSXP,$(OS)$(CPU)),CXXFLAGS="-malign-natural") \
&& MAKEFLAGS="$(subst r,,$(MAKEFLAGS))" $(MAKE) \
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment