diff options
| author | asau <asau@pkgsrc.org> | 2014-07-02 22:10:40 +0000 |
|---|---|---|
| committer | asau <asau@pkgsrc.org> | 2014-07-02 22:10:40 +0000 |
| commit | 937275af4a1f3e49f411ea11dcd31103ee932c55 (patch) | |
| tree | 52ad75e0e97b474a4c3c9bd3fac0aee1672f8093 /lang/gcc34 | |
| parent | 963f232b525261ef15be8f73869c95879504abe1 (diff) | |
| download | pkgsrc-937275af4a1f3e49f411ea11dcd31103ee932c55.tar.gz | |
Make it build on FreeBSD 10.
Diffstat (limited to 'lang/gcc34')
| -rw-r--r-- | lang/gcc34/distinfo | 5 | ||||
| -rw-r--r-- | lang/gcc34/patches/patch-ab | 19 | ||||
| -rw-r--r-- | lang/gcc34/patches/patch-gcc_config_freebsd-spec.h | 20 |
3 files changed, 37 insertions, 7 deletions
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo index cda105e35e6..f763eae454e 100644 --- a/lang/gcc34/distinfo +++ b/lang/gcc34/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.24 2012/06/08 15:42:28 joerg Exp $ +$NetBSD: distinfo,v 1.25 2014/07/02 22:10:40 asau Exp $ SHA1 (gcc-3.4.6.tar.bz2) = 97b290fdc572c8e490b3b39f243e69bacad23c2b RMD160 (gcc-3.4.6.tar.bz2) = b15003368cedc7964f6ceaee0c39ddc43a46c442 Size (gcc-3.4.6.tar.bz2) = 28193401 bytes SHA1 (patch-aa) = 40ba26c4af81ecc0effce3b7ac3c74bdfe4b56a6 -SHA1 (patch-ab) = 50345471e99264104e136acd7c09da0a5275cb62 +SHA1 (patch-ab) = 53fa4226d3ee30a2d165aa1ef8f64e0da03cadd4 SHA1 (patch-ac) = 3366f3f779771a9b0aad013ce23a257f11d9ae70 SHA1 (patch-ae) = 928fa6155e614ca85b02359cf893d6c62231b192 SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee @@ -21,4 +21,5 @@ SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0 SHA1 (patch-ca) = e04ff912406505abd015789f288ef09a7e1ae386 SHA1 (patch-cc) = 0af9845a62f9a6f8ec27657d0ae0c16394e9fc12 SHA1 (patch-cd) = a22078951e1369900fcb58a281c75b3a86edd3ea +SHA1 (patch-gcc_config_freebsd-spec.h) = 447c789c1162c4f7e6a132a630a6f6b360026b0e SHA1 (patch-gcc_config_sol2.h) = 2c701850bc752e73b2b8c1eb46f123c5c6fa1d93 diff --git a/lang/gcc34/patches/patch-ab b/lang/gcc34/patches/patch-ab index 41dbe0517ed..372d35a44f1 100644 --- a/lang/gcc34/patches/patch-ab +++ b/lang/gcc34/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.1 2009/04/22 18:59:54 hasso Exp $ +$NetBSD: patch-ab,v 1.2 2014/07/02 22:10:40 asau Exp $ ---- ../gcc-3.4.6/gcc/config.gcc 2005-07-20 00:08:48 +0300 -+++ gcc/config.gcc 2009-04-09 09:26:24 +0300 -@@ -451,6 +451,33 @@ case ${target} in +--- ../gcc-3.4.6/gcc/config.gcc.orig 2005-07-19 21:08:48.000000000 +0000 ++++ gcc/config.gcc +@@ -412,6 +412,8 @@ case ${target} in + tm_defines="${tm_defines} FBSD_MAJOR=8" ;; + *-*-freebsd9 | *-*-freebsd[9].*) + tm_defines="${tm_defines} FBSD_MAJOR=9" ;; ++ *-*-freebsd10 | *-*-freebsd10.*) ++ tm_defines="${tm_defines} FBSD_MAJOR=10" ;; + *) + echo 'Please update *-*-freebsd* in gcc/config.gcc' + exit 1 +@@ -451,6 +453,33 @@ case ${target} in "" | yes | posix) thread_file='posix' ;; esac ;; @@ -36,7 +45,7 @@ $NetBSD: patch-ab,v 1.1 2009/04/22 18:59:54 hasso Exp $ *-*-linux*libc1* | *-*-linux*aout*) # Avoid the generic linux case. ;; -@@ -964,6 +991,12 @@ i[34567]86-*-freebsd*) +@@ -964,6 +993,12 @@ i[34567]86-*-freebsd*) x86_64-*-freebsd*) tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h" ;; diff --git a/lang/gcc34/patches/patch-gcc_config_freebsd-spec.h b/lang/gcc34/patches/patch-gcc_config_freebsd-spec.h new file mode 100644 index 00000000000..033266e9e5b --- /dev/null +++ b/lang/gcc34/patches/patch-gcc_config_freebsd-spec.h @@ -0,0 +1,20 @@ +$NetBSD: patch-gcc_config_freebsd-spec.h,v 1.1 2014/07/02 22:10:40 asau Exp $ + +--- gcc/config/freebsd-spec.h.orig 2005-07-19 21:08:48.000000000 +0000 ++++ gcc/config/freebsd-spec.h +@@ -51,11 +51,13 @@ Boston, MA 02111-1307, USA. */ + #define FBSD_TARGET_OS_CPP_BUILTINS() \ + do \ + { \ +- if (FBSD_MAJOR == 9) \ ++ if (FBSD_MAJOR == 10) \ ++ builtin_define ("__FreeBSD__=10"); \ ++ else if (FBSD_MAJOR == 9) \ + builtin_define ("__FreeBSD__=9"); \ + else if (FBSD_MAJOR == 8) \ + builtin_define ("__FreeBSD__=8"); \ +- if (FBSD_MAJOR == 7) \ ++ else if (FBSD_MAJOR == 7) \ + builtin_define ("__FreeBSD__=7"); \ + else if (FBSD_MAJOR == 6) \ + builtin_define ("__FreeBSD__=6"); \ |