diff options
| author | mbr <mbr@FreeBSD.org> | 2002-07-31 10:14:34 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-07-31 10:14:34 +0000 |
| commit | 34832bfee0f5211f394f14eff335042349eed944 (patch) | |
| tree | 9f23abd36b61a5cca588973dcb4a48f9c2f48f06 /editors/openoffice.org-2-RC | |
| parent | 8050087e918af484de4321b8e85fac6e12de4e07 (diff) | |
| download | FreeBSD-ports-34832bfee0f5211f394f14eff335042349eed944.zip FreeBSD-ports-34832bfee0f5211f394f14eff335042349eed944.tar.gz | |
Do the same as linux to work around some alignment problems.
Submitted by: kan
Diffstat (limited to 'editors/openoffice.org-2-RC')
3 files changed, 42 insertions, 0 deletions
diff --git a/editors/openoffice.org-2-RC/files/patch-cppu+inc+cppu+macros.hxx b/editors/openoffice.org-2-RC/files/patch-cppu+inc+cppu+macros.hxx new file mode 100644 index 0000000..dad8a1f --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-cppu+inc+cppu+macros.hxx @@ -0,0 +1,11 @@ +--- ../cppu/inc/cppu/macros.hxx.kan Wed Jul 24 23:28:55 2002 ++++ ../cppu/inc/cppu/macros.hxx Wed Jul 24 23:29:45 2002 +@@ -76,7 +76,7 @@ + the struct inherits from a base struct the first member is no double or [unsigned] long long. + @internal + */ +-#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) ++#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) + #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct)))) + #else + #define CPPU_GCC3_ALIGN( base_struct ) diff --git a/editors/openoffice.org-2-RC/files/patch-cppu+source+uno+data.cxx b/editors/openoffice.org-2-RC/files/patch-cppu+source+uno+data.cxx new file mode 100644 index 0000000..9c0e34b --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-cppu+source+uno+data.cxx @@ -0,0 +1,20 @@ +--- ../cppu/source/uno/data.cxx.kan Wed Jul 24 23:39:23 2002 ++++ ../cppu/source/uno/data.cxx Wed Jul 24 23:38:49 2002 +@@ -295,7 +295,7 @@ + # pragma pack(8) + #endif + +-#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) ++#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) + #define MAX_ALIGNMENT_4 + #endif + +@@ -307,7 +307,7 @@ + if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); } + + #ifdef DEBUG +-#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) ++#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) + #define BINTEST_VERIFYSIZE( s, n ) \ + fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \ + if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } diff --git a/editors/openoffice.org-2-RC/files/patch-cppu+test+alignment+diagnose.h b/editors/openoffice.org-2-RC/files/patch-cppu+test+alignment+diagnose.h new file mode 100644 index 0000000..2a66504 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-cppu+test+alignment+diagnose.h @@ -0,0 +1,11 @@ +--- ../cppu/test/alignment/diagnose.h.orig Sat Jul 20 23:54:59 2002 ++++ ../cppu/test/alignment/diagnose.h Sat Jul 20 23:55:06 2002 +@@ -64,7 +64,7 @@ + #include <sal/types.h> + #include <stdio.h> + +-#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) ++#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) + #define __ALIGNMENT__(s, n) __alignof__ (s) + #else + #define __ALIGNMENT__(s, n) n |
