Ticket #40478: gcc43-gcc47-leo.patch
File gcc43-gcc47-leo.patch, 11.8 KB (added by larryv (Lawrence Velázquez), 11 years ago) |
---|
-
gcc43/Portfile
60 60 depends_skip_archcheck-append gcc_select ld64 cctools 61 61 license_noconflict gmp mpfr 62 62 63 patchfiles Make-lang.in.diff darwin10.diff i386_multilib.diff ppc_fde_encoding.diff 63 patchfiles Make-lang.in.diff \ 64 darwin10.diff \ 65 i386_multilib.diff \ 66 ppc_fde_encoding.diff \ 67 PR-40478.patch 64 68 65 69 set major 4.3 66 70 -
gcc43/files/PR-40478.patch
1 commit ff5dbc242ff2f1ba9e6d99d695df9b803adcd734 2 Author: Lawrence Velázquez <larryv@alum.mit.edu> 3 Date: Sat Sep 14 14:24:00 2013 -0400 4 5 Fix broken universal build on Leopard. 6 7 Patch by jeremyhu. See https://trac.macports.org/ticket/40478. 8 9 diff --git config-apple-verbatim.h config-apple-verbatim.h 10 new file mode 100644 11 index 0000000..1ef40be 12 --- /dev/null 13 +++ config-apple-verbatim.h 14 @@ -0,0 +1,14 @@ 15 +#ifdef __APPLE__ 16 + 17 +#undef SIZEOF_LONG 18 + 19 +#if __LP64__ 20 +#define SIZEOF_LONG 8 21 +#else 22 +#define SIZEOF_LONG 4 23 +#endif 24 + 25 +#undef SIZEOF_VOID_P 26 +#define SIZEOF_VOID_P SIZEOF_LONG 27 + 28 +#endif 29 diff --git gcc/config.in gcc/config.in 30 index c61ce52..55c7e8d 100644 31 --- gcc/config.in 32 +++ gcc/config.in 33 @@ -1517,3 +1517,6 @@ 34 #undef vfork 35 #endif 36 37 +#ifndef USED_FOR_TARGET 38 +#include "../config-apple-verbatim.h" 39 +#endif 40 diff --git libcpp/config.in libcpp/config.in 41 index 5d52ec1..73e8d03 100644 42 --- libcpp/config.in 43 +++ libcpp/config.in 44 @@ -283,3 +283,5 @@ 45 46 /* Define to `int' if <sys/types.h> does not define. */ 47 #undef ssize_t 48 + 49 +#include "../config-apple-verbatim.h" 50 diff --git libdecnumber/config.in libdecnumber/config.in 51 index b25b9e9..91afde4 100644 52 --- libdecnumber/config.in 53 +++ libdecnumber/config.in 54 @@ -78,3 +78,5 @@ 55 56 /* Define to `long' if <sys/types.h> does not define. */ 57 #undef off_t 58 + 59 +#include "../config-apple-verbatim.h" 60 diff --git libgomp/config.h.in libgomp/config.h.in 61 index a80176f..adc3c8b 100644 62 --- libgomp/config.h.in 63 +++ libgomp/config.h.in 64 @@ -114,3 +114,5 @@ 65 66 /* Version number of package */ 67 #undef VERSION 68 + 69 +#include "../config-apple-verbatim.h" -
gcc44/Portfile
61 61 depends_skip_archcheck-append gcc_select ld64 cctools 62 62 license_noconflict gmp mpfr 63 63 64 patchfiles ppc_fde_encoding.diff 64 patchfiles ppc_fde_encoding.diff \ 65 PR-40478.patch 65 66 66 67 set major 4.4 67 68 -
gcc44/files/PR-40478.patch
1 commit 4e6b4f895b82759a969dce143252047d98f7350f 2 Author: Lawrence Velázquez <larryv@alum.mit.edu> 3 Date: Sat Sep 14 14:21:31 2013 -0400 4 5 Fix broken universal build on Leopard. 6 7 Patch by jeremyhu. See https://trac.macports.org/ticket/40478. 8 9 diff --git config-apple-verbatim.h config-apple-verbatim.h 10 new file mode 100644 11 index 0000000..1ef40be 12 --- /dev/null 13 +++ config-apple-verbatim.h 14 @@ -0,0 +1,14 @@ 15 +#ifdef __APPLE__ 16 + 17 +#undef SIZEOF_LONG 18 + 19 +#if __LP64__ 20 +#define SIZEOF_LONG 8 21 +#else 22 +#define SIZEOF_LONG 4 23 +#endif 24 + 25 +#undef SIZEOF_VOID_P 26 +#define SIZEOF_VOID_P SIZEOF_LONG 27 + 28 +#endif 29 diff --git gcc/config.in gcc/config.in 30 index ea43afb..3b95722 100644 31 --- gcc/config.in 32 +++ gcc/config.in 33 @@ -1618,3 +1618,6 @@ 34 #undef vfork 35 #endif 36 37 +#ifndef USED_FOR_TARGET 38 +#include "../config-apple-verbatim.h" 39 +#endif 40 diff --git libcpp/config.in libcpp/config.in 41 index 5d52ec1..73e8d03 100644 42 --- libcpp/config.in 43 +++ libcpp/config.in 44 @@ -283,3 +283,5 @@ 45 46 /* Define to `int' if <sys/types.h> does not define. */ 47 #undef ssize_t 48 + 49 +#include "../config-apple-verbatim.h" 50 diff --git libdecnumber/config.in libdecnumber/config.in 51 index b25b9e9..91afde4 100644 52 --- libdecnumber/config.in 53 +++ libdecnumber/config.in 54 @@ -78,3 +78,5 @@ 55 56 /* Define to `long' if <sys/types.h> does not define. */ 57 #undef off_t 58 + 59 +#include "../config-apple-verbatim.h" 60 diff --git libgomp/config.h.in libgomp/config.h.in 61 index 88bae83..e4b589f 100644 62 --- libgomp/config.h.in 63 +++ libgomp/config.h.in 64 @@ -126,3 +126,5 @@ 65 66 /* Version number of package */ 67 #undef VERSION 68 + 69 +#include "../config-apple-verbatim.h" -
gcc45/Portfile
69 69 depends_skip_archcheck-append gcc_select ld64 cctools 70 70 license_noconflict gmp mpfr ppl libmpc 71 71 72 patchfiles ppc_fde_encoding.diff 72 patchfiles ppc_fde_encoding.diff \ 73 PR-40478.patch 73 74 74 75 set major 4.5 75 76 -
gcc45/files/PR-40478.patch
1 commit f110bd3ae7af8cb3abb44934dedb3417ec2a5445 2 Author: Lawrence Velázquez <larryv@alum.mit.edu> 3 Date: Sat Sep 14 14:18:51 2013 -0400 4 5 Fix broken universal build on Leopard. 6 7 Patch by jeremyhu. See https://trac.macports.org/ticket/40478. 8 9 diff --git config-apple-verbatim.h config-apple-verbatim.h 10 new file mode 100644 11 index 0000000..1ef40be 12 --- /dev/null 13 +++ config-apple-verbatim.h 14 @@ -0,0 +1,14 @@ 15 +#ifdef __APPLE__ 16 + 17 +#undef SIZEOF_LONG 18 + 19 +#if __LP64__ 20 +#define SIZEOF_LONG 8 21 +#else 22 +#define SIZEOF_LONG 4 23 +#endif 24 + 25 +#undef SIZEOF_VOID_P 26 +#define SIZEOF_VOID_P SIZEOF_LONG 27 + 28 +#endif 29 diff --git gcc/config.in gcc/config.in 30 index b7884a3..bf48806 100644 31 --- gcc/config.in 32 +++ gcc/config.in 33 @@ -1908,3 +1908,6 @@ 34 #undef vfork 35 #endif 36 37 +#ifndef USED_FOR_TARGET 38 +#include "../config-apple-verbatim.h" 39 +#endif 40 diff --git libcpp/config.in libcpp/config.in 41 index 4c71ec3..9a58b10 100644 42 --- libcpp/config.in 43 +++ libcpp/config.in 44 @@ -283,3 +283,5 @@ 45 46 /* Define to `int' if <sys/types.h> does not define. */ 47 #undef ssize_t 48 + 49 +#include "../config-apple-verbatim.h" 50 diff --git libdecnumber/config.in libdecnumber/config.in 51 index 98dc67d..a1a344c 100644 52 --- libdecnumber/config.in 53 +++ libdecnumber/config.in 54 @@ -92,3 +92,5 @@ 55 56 /* Define to `long int' if <sys/types.h> does not define. */ 57 #undef off_t 58 + 59 +#include "../config-apple-verbatim.h" 60 diff --git libgomp/config.h.in libgomp/config.h.in 61 index c88660a..7fda9d4 100644 62 --- libgomp/config.h.in 63 +++ libgomp/config.h.in 64 @@ -129,3 +129,5 @@ 65 66 /* Version number of package */ 67 #undef VERSION 68 + 69 +#include "../config-apple-verbatim.h" -
gcc46/Portfile
54 54 depends_skip_archcheck-append gcc_select ld64 cctools 55 55 license_noconflict gmp mpfr ppl libmpc 56 56 57 patchfiles gcc-4.6-cloog_lang_c.patch enable_libstdcxx_time_yes.patch 57 patchfiles gcc-4.6-cloog_lang_c.patch \ 58 enable_libstdcxx_time_yes.patch \ 59 PR-40478.patch 58 60 59 61 set major 4.6 60 62 -
gcc46/files/PR-40478.patch
1 commit 025efa8b4e6db20f308a3b4f7608b618b2b54ece 2 Author: Lawrence Velázquez <larryv@alum.mit.edu> 3 Date: Sat Sep 14 14:11:44 2013 -0400 4 5 Fix broken universal build on Leopard. 6 7 Patch by jeremyhu. See https://trac.macports.org/ticket/40478. 8 9 diff --git config-apple-verbatim.h config-apple-verbatim.h 10 new file mode 100644 11 index 0000000..1ef40be 12 --- /dev/null 13 +++ config-apple-verbatim.h 14 @@ -0,0 +1,14 @@ 15 +#ifdef __APPLE__ 16 + 17 +#undef SIZEOF_LONG 18 + 19 +#if __LP64__ 20 +#define SIZEOF_LONG 8 21 +#else 22 +#define SIZEOF_LONG 4 23 +#endif 24 + 25 +#undef SIZEOF_VOID_P 26 +#define SIZEOF_VOID_P SIZEOF_LONG 27 + 28 +#endif 29 diff --git gcc/config.in gcc/config.in 30 index 584ec65..f6d4065 100644 31 --- gcc/config.in 32 +++ gcc/config.in 33 @@ -1976,3 +1976,6 @@ 34 #undef vfork 35 #endif 36 37 +#ifndef USED_FOR_TARGET 38 +#include "../config-apple-verbatim.h" 39 +#endif 40 diff --git libcpp/config.in libcpp/config.in 41 index 05542fe..e7be80c 100644 42 --- libcpp/config.in 43 +++ libcpp/config.in 44 @@ -349,3 +349,5 @@ 45 /* Define to the type of an unsigned integer type wide enough to hold a 46 pointer, if such a type exists, and if the system does not define it. */ 47 #undef uintptr_t 48 + 49 +#include "../config-apple-verbatim.h" 50 diff --git libdecnumber/config.in libdecnumber/config.in 51 index 98dc67d..a1a344c 100644 52 --- libdecnumber/config.in 53 +++ libdecnumber/config.in 54 @@ -92,3 +92,5 @@ 55 56 /* Define to `long int' if <sys/types.h> does not define. */ 57 #undef off_t 58 + 59 +#include "../config-apple-verbatim.h" 60 diff --git libgomp/config.h.in libgomp/config.h.in 61 index 14c7e2a..d69e3f5 100644 62 --- libgomp/config.h.in 63 +++ libgomp/config.h.in 64 @@ -133,3 +133,5 @@ 65 66 /* Version number of package */ 67 #undef VERSION 68 + 69 +#include "../config-apple-verbatim.h" -
gcc47/Portfile
54 54 depends_skip_archcheck-append gcc_select ld64 cctools 55 55 license_noconflict gmp mpfr ppl libmpc 56 56 57 patchfiles ppc_fde_encoding.diff gcc-PR-53453.patch enable_libstdcxx_time_yes.patch 57 patchfiles ppc_fde_encoding.diff \ 58 gcc-PR-53453.patch \ 59 enable_libstdcxx_time_yes.patch \ 60 PR-40478.patch 58 61 59 62 set major 4.7 60 63 -
gcc47/files/PR-40478.patch
1 commit b55ce4cea135d02f427ec76a8255c472364d0a82 2 Author: Lawrence Velázquez <larryv@alum.mit.edu> 3 Date: Sat Sep 14 13:40:31 2013 -0400 4 5 Fix broken universal build on Leopard. 6 7 Patch by jeremyhu. See https://trac.macports.org/ticket/40478. 8 9 diff --git config-apple-verbatim.h config-apple-verbatim.h 10 new file mode 100644 11 index 0000000..1ef40be 12 --- /dev/null 13 +++ config-apple-verbatim.h 14 @@ -0,0 +1,14 @@ 15 +#ifdef __APPLE__ 16 + 17 +#undef SIZEOF_LONG 18 + 19 +#if __LP64__ 20 +#define SIZEOF_LONG 8 21 +#else 22 +#define SIZEOF_LONG 4 23 +#endif 24 + 25 +#undef SIZEOF_VOID_P 26 +#define SIZEOF_VOID_P SIZEOF_LONG 27 + 28 +#endif 29 diff --git gcc/config.in gcc/config.in 30 index 2e632b2..f931f23 100644 31 --- gcc/config.in 32 +++ gcc/config.in 33 @@ -2029,3 +2029,6 @@ 34 #undef vfork 35 #endif 36 37 +#ifndef USED_FOR_TARGET 38 +#include "../config-apple-verbatim.h" 39 +#endif 40 diff --git libcpp/config.in libcpp/config.in 41 index 05542fe..e7be80c 100644 42 --- libcpp/config.in 43 +++ libcpp/config.in 44 @@ -349,3 +349,5 @@ 45 /* Define to the type of an unsigned integer type wide enough to hold a 46 pointer, if such a type exists, and if the system does not define it. */ 47 #undef uintptr_t 48 + 49 +#include "../config-apple-verbatim.h" 50 diff --git libdecnumber/config.in libdecnumber/config.in 51 index 98dc67d..a1a344c 100644 52 --- libdecnumber/config.in 53 +++ libdecnumber/config.in 54 @@ -92,3 +92,5 @@ 55 56 /* Define to `long int' if <sys/types.h> does not define. */ 57 #undef off_t 58 + 59 +#include "../config-apple-verbatim.h" 60 diff --git libgomp/config.h.in libgomp/config.h.in 61 index 14c7e2a..d69e3f5 100644 62 --- libgomp/config.h.in 63 +++ libgomp/config.h.in 64 @@ -133,3 +133,5 @@ 65 66 /* Version number of package */ 67 #undef VERSION 68 + 69 +#include "../config-apple-verbatim.h"