summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2013-04-04 14:31:32 +0000
committerjperkin <jperkin@pkgsrc.org>2013-04-04 14:31:32 +0000
commit762698cc0ee432e083ddf3f1956b3d8e098be105 (patch)
tree37dcc61b61140b7adf7887e2aa84f49a537ce21c /lang
parent04a53b262f8b2537bbe0de1982eba805f334a94d (diff)
downloadpkgsrc-762698cc0ee432e083ddf3f1956b3d8e098be105.tar.gz
Fix -arch argument on OSX. Gets us a working package on 32-bit at least,
64-bit is still unsupported.
Diffstat (limited to 'lang')
-rw-r--r--lang/g95/distinfo3
-rw-r--r--lang/g95/patches/patch-.._gcc-4.0.3_gcc_config_i386_darwin.h31
2 files changed, 33 insertions, 1 deletions
diff --git a/lang/g95/distinfo b/lang/g95/distinfo
index d57feb2634f..7e317476f1a 100644
--- a/lang/g95/distinfo
+++ b/lang/g95/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2013/03/02 18:05:46 joerg Exp $
+$NetBSD: distinfo,v 1.14 2013/04/04 14:31:32 jperkin Exp $
SHA1 (g95-0.93/g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff
RMD160 (g95-0.93/g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176
@@ -9,6 +9,7 @@ Size (g95-0.93/gcc-core-4.0.3.tar.bz2) = 15573608 bytes
SHA1 (patch-.._gcc-4.0.3_gcc_config.gcc) = f93cca19dbb3544a1259960a3ab092fd72038125
SHA1 (patch-.._gcc-4.0.3_gcc_config_dragonfly-spec.h) = 2fac90d3b4b2113e4713497fbcf3a3999dde2045
SHA1 (patch-.._gcc-4.0.3_gcc_config_dragonfly.h) = 12707232e61b664f3b1a9943cbb3a49e61e94fa9
+SHA1 (patch-.._gcc-4.0.3_gcc_config_i386_darwin.h) = f5b17c0c33e824f8463f9b8c82fb012796ba4927
SHA1 (patch-.._gcc-4.0.3_gcc_config_i386_dragonfly.h) = 96fa1faed692f8d4aeade98dd42d25b85ba051d7
SHA1 (patch-.._gcc-4.0.3_gcc_config_i386_dragonfly64.h) = b228dbcdf7b5cf22d41d6ff04a37c569ca514c50
SHA1 (patch-.._gcc-4.0.3_gcc_config_t-dragonfly) = 9636163ffd359b2a0dbb0a7fec2ca1cf98032c3d
diff --git a/lang/g95/patches/patch-.._gcc-4.0.3_gcc_config_i386_darwin.h b/lang/g95/patches/patch-.._gcc-4.0.3_gcc_config_i386_darwin.h
new file mode 100644
index 00000000000..1713941adaf
--- /dev/null
+++ b/lang/g95/patches/patch-.._gcc-4.0.3_gcc_config_i386_darwin.h
@@ -0,0 +1,31 @@
+$NetBSD: patch-.._gcc-4.0.3_gcc_config_i386_darwin.h,v 1.1 2013/04/04 14:31:32 jperkin Exp $
+
+Fix -arch type on OSX.
+
+--- ../gcc-4.0.3/gcc/config/i386/darwin.h.orig 2013-04-04 14:07:01.000000000 +0000
++++ ../gcc-4.0.3/gcc/config/i386/darwin.h 2013-04-04 14:07:38.000000000 +0000
+@@ -23,7 +23,7 @@
+ #undef TARGET_MACHO
+ #define TARGET_MACHO 1
+
+-#define TARGET_VERSION fprintf (stderr, " (i686 Darwin)");
++#define TARGET_VERSION fprintf (stderr, " (i386 Darwin)");
+
+ #define TARGET_OS_CPP_BUILTINS() \
+ do \
+@@ -43,12 +43,12 @@
+ %{g: %{!fno-eliminate-unused-debug-symbols: -feliminate-unused-debug-symbols }}"
+
+ #undef ASM_SPEC
+-#define ASM_SPEC "-arch i686 -force_cpusubtype_ALL"
++#define ASM_SPEC "-arch i386 -force_cpusubtype_ALL"
+
+ #undef SUBTARGET_EXTRA_SPECS
+ #define SUBTARGET_EXTRA_SPECS \
+- { "darwin_arch", "i686" }, \
+- { "darwin_subarch", "%{march=pentium3:pentIIm3;:i686}" },
++ { "darwin_arch", "i386" }, \
++ { "darwin_subarch", "%{march=pentium3:pentIIm3;:i386}" },
+
+
+ /* Use the following macro for any Darwin/x86-specific command-line option