? lang/g95/work Index: lang/g95/distinfo =================================================================== RCS file: /cvs/cvsroot/pkgsrc/lang/g95/distinfo,v retrieving revision 1.15 diff -u -r1.15 distinfo --- lang/g95/distinfo 20 May 2013 05:47:34 -0000 1.15 +++ lang/g95/distinfo 21 Jun 2013 07:17:43 -0000 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2013/05/20 05:47:34 adam Exp $ +$NetBSD$ SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176 @@ -8,11 +8,16 @@ Size (gcc-core-4.1.2.tar.bz2) = 17485561 bytes SHA1 (patch-ab) = 74187ee99e3e383333219cbc53676c07ca03ff19 SHA1 (patch-ac) = b20a90cc2f9078cf0048980b75fa6836da0f28a8 +SHA1 (patch-configure) = 26aaad8ac844facbcabe34635928fc6195bb54e8 +SHA1 (patch-configure.in) = 27895e65d04d53281f836be4183d16b810833628 +SHA1 (patch-g95-093_kinds_c) = b6b35bbb765965c7835027749a13cf056db5ac09 +SHA1 (patch-g95-config.h.in) = 6a160e36d9d6cda4cc8b6ae5f5566f9f45eb1ea8 SHA1 (patch-gcc_config.gcc) = 9da8f32372c64b1590d97e3f26aec0d5652cc959 SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511 SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9 SHA1 (patch-gcc_config_i386_dragonfly.h) = 7d60d29b5ae636d69650e8c412a94f7a6045f6d9 SHA1 (patch-gcc_config_i386_dragonfly64.h) = 9d2d8512a913e58055fa5c1b7d85a109117dcfba +SHA1 (patch-gcc_config_netbsd.h) = a1a69f04feac46dbbcb134c72c8c0a505c2f84bd SHA1 (patch-gcc_config_t-dragonfly) = dd8d5919af737dfb9e3c18be9a41b4e2c6f31155 SHA1 (patch-gcc_config_t-dragonfly-thread) = ebdb58dacf0dc5d0bf2f1f1707a7c6ab29ee308c SHA1 (patch-gcc_ginclude_stddef.h) = 60f51a470e03173803b5e20b1fa4d6882e8d1fe9 Index: lang/g95/patches/patch-configure =================================================================== RCS file: lang/g95/patches/patch-configure diff -N lang/g95/patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/g95/patches/patch-configure 21 Jun 2013 07:17:43 -0000 @@ -0,0 +1,28 @@ +$NetBSD$ + +Add NetBSD/powerpc (generetd by autoconf 2.65). + +--- configure.orig 2013-06-21 15:17:33.000000000 +0900 ++++ configure 2013-06-21 15:55:22.000000000 +0900 +@@ -4647,7 +4647,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_version" >&5 + $as_echo "$gcc_version" >&6; } + +- DEST_LIBDIR=$prefix/lib/gcc-lib/$host_alias/$gcc_version ++ DEST_LIBDIR=$prefix/lib/gcc-lib/$host/$gcc_version + SAVE_DIR=`pwd` + PREFIX=$prefix + +@@ -4911,6 +4911,12 @@ + + ;; + ++ *netbsd*) ++ ++$as_echo "#define FPU_PPC_NETBSD 1" >>confdefs.h ++ ++ ;; ++ + *) + echo host = $host + as_fn_error "Unknown powerpc architecture" "$LINENO" 5 Index: lang/g95/patches/patch-configure.in =================================================================== RCS file: lang/g95/patches/patch-configure.in diff -N lang/g95/patches/patch-configure.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/g95/patches/patch-configure.in 21 Jun 2013 07:17:43 -0000 @@ -0,0 +1,17 @@ +$NetBSD$ + +Add NetBSD/powerpc. + +--- configure.in.orig 2013-06-21 13:42:42.000000000 +0900 ++++ configure.in 2013-06-21 13:42:17.000000000 +0900 +@@ -271,6 +271,10 @@ + AC_DEFINE(FPU_PPC_LINUX, 1,[Define if compiling for a PPC fpu on Linux]) + ;; + ++ *netbsd*) ++ AC_DEFINE(FPU_PPC_NETBSD, 1,[Define if compiling for a PPC fpu on NetBSD]) ++ ;; ++ + *) + echo host = $host + AC_ERROR(Unknown powerpc architecture) Index: lang/g95/patches/patch-g95-093_kinds_c =================================================================== RCS file: lang/g95/patches/patch-g95-093_kinds_c diff -N lang/g95/patches/patch-g95-093_kinds_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/g95/patches/patch-g95-093_kinds_c 21 Jun 2013 07:17:43 -0000 @@ -0,0 +1,15 @@ +$NetBSD$ + +Add NetBSD/powerpc. + +--- kinds.c.orig 2008-08-20 00:38:46.000000000 +0900 ++++ kinds.c 2013-06-21 15:07:09.000000000 +0900 +@@ -91,7 +91,7 @@ g95_ff g95_real_kinds[] = { + + + #elif defined (FPU_PPC_OSX) || defined(FPU_PPC_AIX) || defined(FPU_MIPS) || \ +- defined(FPU_PPC_LINUX) || defined(FPU_HPPA) || defined(FPU_SPARC) ++ defined(FPU_PPC_LINUX) || defined(FPU_HPPA) || defined(FPU_SPARC) || defined(FPU_PPC_NETBSD) + + { 4, 2, END_BIG, 32, 0, 1, 8, 127, 255, 9, 23, MSB_IMPLICIT }, + Index: lang/g95/patches/patch-g95-config.h.in =================================================================== RCS file: lang/g95/patches/patch-g95-config.h.in diff -N lang/g95/patches/patch-g95-config.h.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/g95/patches/patch-g95-config.h.in 21 Jun 2013 07:17:43 -0000 @@ -0,0 +1,16 @@ +$NetBSD$ + +Add NetBSD/powerpc. + +--- g95-config.h.in.orig 2013-06-21 14:06:56.000000000 +0900 ++++ g95-config.h.in 2013-06-21 14:17:14.000000000 +0900 +@@ -29,6 +29,9 @@ + /* Define if compiling for a PPC fpu on Linux */ + #undef FPU_PPC_LINUX + ++/* Define if compiling for a PPC fpu on NetBSD */ ++#undef FPU_PPC_NETBSD ++ + /* Define if compiling for a PPC fpu on Darwin */ + #undef FPU_PPC_OSX + Index: lang/g95/patches/patch-gcc_config_netbsd.h =================================================================== RCS file: lang/g95/patches/patch-gcc_config_netbsd.h diff -N lang/g95/patches/patch-gcc_config_netbsd.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/g95/patches/patch-gcc_config_netbsd.h 21 Jun 2013 07:17:43 -0000 @@ -0,0 +1,62 @@ +$NetBSD$ + +Configuring in powerpc--netbsd/libssp +/usr/pkgsrc/lang/g95/work/gcc-4.1.2/g95/./gcc/libgcc_s.so.1: + Unsupported relocation type 10 in non-PLT relocations +/usr/pkgsrc/lang/g95/work/gcc-4.1.2/g95/./gcc/libgcc_s.so.1: + Unsupported relocation type 10 in non-PLT relocations +/usr/pkgsrc/lang/g95/work/gcc-4.1.2/g95/./gcc/libgcc_s.so.1: + Unsupported relocation type 10 in non-PLT relocations + +--- work/gcc-4.1.2/gcc/config/netbsd.h 2005-07-14 01:28:25.000000000 +0900 ++++ ../gcc-4.1.2/gcc/config/netbsd.h 2008-04-28 08:49:27.000000000 +0900 +@@ -28,6 +28,11 @@ + builtin_assert ("system=bsd"); \ + builtin_assert ("system=unix"); \ + builtin_assert ("system=NetBSD"); \ ++ if (flag_pic) \ ++ { \ ++ builtin_define ("__PIC__"); \ ++ builtin_define ("__pic__"); \ ++ } \ + } \ + while (0) + +@@ -122,24 +142,22 @@ + #undef LIB_SPEC + #define LIB_SPEC NETBSD_LIB_SPEC + +-/* Provide a LIBGCC_SPEC appropriate for NetBSD. We also want to exclude +- libgcc with -symbolic. */ ++/* Don't provide a LIBGCC_SPEC for NetBSD as the default ++ is correct. In the --disabled-shared case -lgcc is perfect. */ + +-#ifdef NETBSD_NATIVE +-#define NETBSD_LIBGCC_SPEC \ +- "%{!symbolic: \ +- %{!shared: \ +- %{!p: \ +- %{!pg: -lgcc}}} \ +- %{shared: -lgcc_pic} \ +- %{p: -lgcc_p} \ +- %{pg: -lgcc_p}}" +-#else +-#define NETBSD_LIBGCC_SPEC "%{!shared:%{!symbolic: -lgcc}}" ++#if defined(NETBSD_TOOLS) || defined(NETBSD_NATIVE) ++#define LIBGCC_PICSUFFIX "_pic" + #endif + +-#undef LIBGCC_SPEC +-#define LIBGCC_SPEC NETBSD_LIBGCC_SPEC ++/* Pass -cxx-isystem to cc1/cc1plus. */ ++#define NETBSD_CC1_AND_CC1PLUS_SPEC \ ++ "%{cxx-isystem}" ++ ++#undef CC1_SPEC ++#define CC1_SPEC NETBSD_CC1_AND_CC1PLUS_SPEC ++ ++#undef CC1PLUS_SPEC ++#define CC1PLUS_SPEC NETBSD_CC1_AND_CC1PLUS_SPEC + + /* When building shared libraries, the initialization and finalization + functions for the library are .init and .fini respectively. */