Sun Jul 3 19:29:28 2016 UTC ()
Honor pkgsrc CFLAGS in all configs, not just some.
(dholland)
diff -r1.22 -r1.23 pkgsrc/lang/smlnj/distinfo
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32-dunix
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32x-osf1
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux11
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux9
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-aix
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin5
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-linux
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-cygwin
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-darwin
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-freebsd
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux-pthreads
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd2
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-openbsd
diff -r0 -r1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-solaris
diff -r1.2 -r1.3 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd
diff -r1.7 -r1.8 pkgsrc/lang/smlnj11072/distinfo
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.alpha32-dunix
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.alpha32x-osf1
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.hppa-hpux
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.hppa-hpux11
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.hppa-hpux9
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.ppc-aix
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.ppc-darwin
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.ppc-darwin5
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.ppc-linux
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-cygwin
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-darwin
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-freebsd
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-linux
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-linux-pthreads
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-netbsd2
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-openbsd
diff -r0 -r1.1 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-solaris
diff -r1.1 -r1.2 pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-netbsd
--- pkgsrc/lang/smlnj/distinfo 2016/07/03 19:26:35 1.22
+++ pkgsrc/lang/smlnj/distinfo 2016/07/03 19:29:27 1.23
| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | $NetBSD: distinfo,v 1.22 2016/07/03 19:26:35 dholland Exp $ | | 1 | $NetBSD: distinfo,v 1.23 2016/07/03 19:29:27 dholland Exp $ |
2 | | | 2 | |
3 | SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9 | | 3 | SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9 |
4 | RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb | | 4 | RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb |
5 | SHA512 (smlnj-110.73/MLRISC.tgz) = e16a213face6dbc128fc117a6ea30042ee49aa3aa985b3b6a9ea4f3ebd8392e2fc9db96451f49eddeab8f35a36665c1dc3dc77b6c615eae1b277192f16805d6b | | 5 | SHA512 (smlnj-110.73/MLRISC.tgz) = e16a213face6dbc128fc117a6ea30042ee49aa3aa985b3b6a9ea4f3ebd8392e2fc9db96451f49eddeab8f35a36665c1dc3dc77b6c615eae1b277192f16805d6b |
6 | Size (smlnj-110.73/MLRISC.tgz) = 1422538 bytes | | 6 | Size (smlnj-110.73/MLRISC.tgz) = 1422538 bytes |
7 | SHA1 (smlnj-110.73/boot.x86-unix.tgz) = f2a6b89708d41d5968bf6f2e2ee713704f3664fd | | 7 | SHA1 (smlnj-110.73/boot.x86-unix.tgz) = f2a6b89708d41d5968bf6f2e2ee713704f3664fd |
8 | RMD160 (smlnj-110.73/boot.x86-unix.tgz) = c6fa71d7a14e79d095159ebd877b7562e88eeeb5 | | 8 | RMD160 (smlnj-110.73/boot.x86-unix.tgz) = c6fa71d7a14e79d095159ebd877b7562e88eeeb5 |
9 | SHA512 (smlnj-110.73/boot.x86-unix.tgz) = 389f18bf989ff70aa4b4e174547bfc1ac00e5b3d0a57d60c96fc105252b94c8233fce0bdc868670386853bad9cc2a8643e9a1d3881bed1e0367d62a6451d6b78 | | 9 | SHA512 (smlnj-110.73/boot.x86-unix.tgz) = 389f18bf989ff70aa4b4e174547bfc1ac00e5b3d0a57d60c96fc105252b94c8233fce0bdc868670386853bad9cc2a8643e9a1d3881bed1e0367d62a6451d6b78 |
10 | Size (smlnj-110.73/boot.x86-unix.tgz) = 5838645 bytes | | 10 | Size (smlnj-110.73/boot.x86-unix.tgz) = 5838645 bytes |
11 | SHA1 (smlnj-110.73/ckit.tgz) = afbb7c03aa3aac813f4ce6686a68998b2612bea9 | | 11 | SHA1 (smlnj-110.73/ckit.tgz) = afbb7c03aa3aac813f4ce6686a68998b2612bea9 |
12 | RMD160 (smlnj-110.73/ckit.tgz) = 56586583bbc8eff89e560e692705a7adc8f9c8e9 | | 12 | RMD160 (smlnj-110.73/ckit.tgz) = 56586583bbc8eff89e560e692705a7adc8f9c8e9 |
13 | SHA512 (smlnj-110.73/ckit.tgz) = 555f5b3e7efaa73a9e30da03f664054f68dfe43072f4d380581cd77c5c75a6eb0f6ec296aa304d88d16f796227c45c0a1200c8f03bd6fc6f4160879edcd84299 | | 13 | SHA512 (smlnj-110.73/ckit.tgz) = 555f5b3e7efaa73a9e30da03f664054f68dfe43072f4d380581cd77c5c75a6eb0f6ec296aa304d88d16f796227c45c0a1200c8f03bd6fc6f4160879edcd84299 |
14 | Size (smlnj-110.73/ckit.tgz) = 196369 bytes | | 14 | Size (smlnj-110.73/ckit.tgz) = 196369 bytes |
| @@ -89,14 +89,31 @@ SHA1 (patch-ai) = 6a15a5415bd73e6618bc45 | | | @@ -89,14 +89,31 @@ SHA1 (patch-ai) = 6a15a5415bd73e6618bc45 |
89 | SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e | | 89 | SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e |
90 | SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3 | | 90 | SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3 |
91 | SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511 | | 91 | SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511 |
92 | SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7 | | 92 | SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7 |
93 | SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31 | | 93 | SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31 |
94 | SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b | | 94 | SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b |
95 | SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 | | 95 | SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 |
96 | SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c | | 96 | SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c |
97 | SHA1 (patch-config___arch-n-opsys) = b0c952b0b9ed6312a115761fdbd4c30aaa208b4c | | 97 | SHA1 (patch-config___arch-n-opsys) = b0c952b0b9ed6312a115761fdbd4c30aaa208b4c |
98 | SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 | | 98 | SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 |
99 | SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d | | 99 | SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d |
100 | SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c | | 100 | SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c |
101 | SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154 | | 101 | SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154 |
102 | SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = d2ede7ce4fca3c400f82ae09ee352ee6872bb1b1 | | 102 | SHA1 (patch-src_runtime_objs_mk.alpha32-dunix) = 9e3a36f4663cd685459f2fbde41b8c5f154bd9c2 |
| | | 103 | SHA1 (patch-src_runtime_objs_mk.alpha32x-osf1) = 6e91f672aadb77bd1d1ab65bfa66e3d7f745846c |
| | | 104 | SHA1 (patch-src_runtime_objs_mk.hppa-hpux) = 40ca27d05490983e734b4d20eecd268935ad2461 |
| | | 105 | SHA1 (patch-src_runtime_objs_mk.hppa-hpux11) = c7ad7769ba05b4fe609a6396d2c8dadb80256e06 |
| | | 106 | SHA1 (patch-src_runtime_objs_mk.hppa-hpux9) = 6adacac502cd12576ea65882984979ce3aa78b41 |
| | | 107 | SHA1 (patch-src_runtime_objs_mk.ppc-aix) = 509ffc0152b2cdfa4e0f6621bed026fe0f1edc99 |
| | | 108 | SHA1 (patch-src_runtime_objs_mk.ppc-darwin) = 6ae822c7b39255b5204e358e3c21aa23b93883ec |
| | | 109 | SHA1 (patch-src_runtime_objs_mk.ppc-darwin5) = 35ddd1f10a907ebbe6b4a3310c3bded83bda8ca0 |
| | | 110 | SHA1 (patch-src_runtime_objs_mk.ppc-linux) = 171ec491a536aa782880d3b3392cf0d728fd9c03 |
| | | 111 | SHA1 (patch-src_runtime_objs_mk.x86-cygwin) = b9e1174a956a63b1023eaf70322776fe93717782 |
| | | 112 | SHA1 (patch-src_runtime_objs_mk.x86-darwin) = 7770986d2805f66f1c4d4faff2fb66b2fb4b7b8d |
| | | 113 | SHA1 (patch-src_runtime_objs_mk.x86-freebsd) = 2420f6a04ae78ca306daeb94a312f0e4fdcd0410 |
| | | 114 | SHA1 (patch-src_runtime_objs_mk.x86-linux) = 4905280351b88b5a74f3bd68dadcdca6fd2037ac |
| | | 115 | SHA1 (patch-src_runtime_objs_mk.x86-linux-pthreads) = 5c2730e09b05c3a00abb3ea6c732e39775973f79 |
| | | 116 | SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = 3a8e93e55ed9bba470a680c327cb4e4d22d69ff4 |
| | | 117 | SHA1 (patch-src_runtime_objs_mk.x86-netbsd2) = 98408821e7c1f3ca6f50f5d9e230c903173029e1 |
| | | 118 | SHA1 (patch-src_runtime_objs_mk.x86-openbsd) = da536769b231e01a5fb045fe7dd329eee15b6706 |
| | | 119 | SHA1 (patch-src_runtime_objs_mk.x86-solaris) = 125814c60fd42389df9a1d5dbcd4313e7cabb53c |
$NetBSD: patch-src_runtime_objs_mk.alpha32-dunix,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.alpha32-dunix~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.alpha32-dunix
@@ -6,7 +6,7 @@
SHELL = /bin/sh
CC = cc -std
-CFLAGS = -O
+CFLAGS = @CFLAGS@
LDFLAGS = -non_shared -T 20000000 -D 40000000
AS = as -nocpp
AR = /usr/ucb/ar
$NetBSD: patch-src_runtime_objs_mk.alpha32x-osf1,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.alpha32x-osf1~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.alpha32x-osf1
@@ -4,7 +4,7 @@
SHELL = /bin/sh
CC = cc -std
-CFLAGS = -O
+CFLAGS = @CFLAGS@
LDFLAGS = -non_shared -T 20000000 -D 40000000
AS = as -nocpp
AR = /usr/ucb/ar
$NetBSD: patch-src_runtime_objs_mk.hppa-hpux,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.hppa-hpux~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.hppa-hpux
@@ -12,7 +12,7 @@ CC = cc -Aa -N -D__STDC__
#CC = gcc -ansi -D__STDC__
CPP = /lib/cpp.ansi
-CFLAGS = -O
+CFLAGS = @CFLAGS@
AS = /usr/ccs/bin/as
RANLIB = ar ts
$NetBSD: patch-src_runtime_objs_mk.hppa-hpux11,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.hppa-hpux11~ 2005-07-20 14:30:18.000000000 +0000
+++ src/runtime/objs/mk.hppa-hpux11
@@ -13,7 +13,7 @@ CC = gcc -ansi -D__STDC__
#CPP = /lib/cpp.ansi
CPP = cpp
-CFLAGS = -O
+CFLAGS = @CFLAGS@
AS = /usr/ccs/bin/as
RANLIB = ar ts
$NetBSD: patch-src_runtime_objs_mk.hppa-hpux9,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.hppa-hpux9~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.hppa-hpux9
@@ -9,7 +9,7 @@ SHELL = /bin/sh
CC = cc -Aa -D__STDC__
CPP = /lib/cpp.ansi
-CFLAGS = -O
+CFLAGS = @CFLAGS@
AS = /bin/as
RANLIB = ar ts
$NetBSD: patch-src_runtime_objs_mk.ppc-aix,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-aix~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.ppc-aix
@@ -5,7 +5,7 @@ SHELL = /bin/sh
# note: the vendor cpp isn't expanding nested macro applications correctly.
CC = cc
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = /lib/cpp
#CC = gcc -ansi
$NetBSD: patch-src_runtime_objs_mk.ppc-darwin,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-darwin~ 2007-10-31 16:04:18.000000000 +0000
+++ src/runtime/objs/mk.ppc-darwin
@@ -11,7 +11,7 @@ SHELL = /bin/sh
MAKE = make
CC = cc -ansi
-CFLAGS = -g -O2 -D_NONSTD_SOURCE
+CFLAGS = @CFLAGS@ -D_NONSTD_SOURCE
CPP = cc -x assembler-with-cpp -E -P -ansi
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
$NetBSD: patch-src_runtime_objs_mk.ppc-darwin5,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-darwin5~ 2002-10-10 17:08:59.000000000 +0000
+++ src/runtime/objs/mk.ppc-darwin5
@@ -9,7 +9,7 @@ SHELL = /bin/sh
MAKE = make
CC = cc -ansi
-CFLAGS = -g -O2
+CFLAGS = @CFLAGS@
CPP = cc -x assembler-with-cpp -E -P -ansi
XOBJS =
XLIBS =
$NetBSD: patch-src_runtime_objs_mk.ppc-linux,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-linux~ 2000-11-10 14:04:49.000000000 +0000
+++ src/runtime/objs/mk.ppc-linux
@@ -6,7 +6,7 @@ SHELL = /bin/sh
MAKE = make
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x c -E -P -ansi
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
$NetBSD: patch-src_runtime_objs_mk.x86-cygwin,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-cygwin~ 2004-03-19 18:54:52.000000000 +0000
+++ src/runtime/objs/mk.x86-cygwin
@@ -5,7 +5,7 @@ SHELL = /bin/sh
MAKE = make
CC = gcc
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
$NetBSD: patch-src_runtime_objs_mk.x86-darwin,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-darwin~ 2009-09-13 17:50:53.000000000 +0000
+++ src/runtime/objs/mk.x86-darwin
@@ -13,7 +13,7 @@ SHELL = /bin/sh
MAKE = make
AS = /usr/bin/as -arch i386
CC = cc -m32 -ansi
-CFLAGS = -g -O2 -D_DARWIN_C_SOURCE
+CFLAGS = @CFLAGS@ -D_DARWIN_C_SOURCE
CPP = cc -x assembler-with-cpp -E -P -ansi
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
$NetBSD: patch-src_runtime_objs_mk.x86-freebsd,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-freebsd~ 2006-04-20 15:28:53.000000000 +0000
+++ src/runtime/objs/mk.x86-freebsd
@@ -9,7 +9,7 @@ MAKE = gmake
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
$NetBSD: patch-src_runtime_objs_mk.x86-linux,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-linux~ 2006-04-20 15:28:53.000000000 +0000
+++ src/runtime/objs/mk.x86-linux
@@ -6,7 +6,7 @@ SHELL = /bin/sh
MAKE = make
AS = as --32
CC = gcc -ansi
-CFLAGS = -O2 -m32
+CFLAGS = @CFLAGS@ -m32
CPP = gcc -x assembler-with-cpp -E -P
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
$NetBSD: patch-src_runtime_objs_mk.x86-linux-pthreads,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-linux-pthreads~ 2004-01-31 14:24:42.000000000 +0000
+++ src/runtime/objs/mk.x86-linux-pthreads
@@ -5,7 +5,7 @@ SHELL = /bin/sh
MAKE = make
CC = gcc -ansi
-CFLAGS = -O2 -D_REENTRANT
+CFLAGS = @CFLAGS@ -D_REENTRANT
CPP = gcc -x assembler-with-cpp -E -P
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
$NetBSD: patch-src_runtime_objs_mk.x86-netbsd2,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-netbsd2~ 2006-02-10 22:14:59.000000000 +0000
+++ src/runtime/objs/mk.x86-netbsd2
@@ -9,7 +9,7 @@ MAKE = gmake
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
$NetBSD: patch-src_runtime_objs_mk.x86-openbsd,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-openbsd~ 2008-12-02 16:50:18.000000000 +0000
+++ src/runtime/objs/mk.x86-openbsd
@@ -9,7 +9,7 @@ MAKE = gmake
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
$NetBSD: patch-src_runtime_objs_mk.x86-solaris,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-solaris~ 2004-01-31 14:24:42.000000000 +0000
+++ src/runtime/objs/mk.x86-solaris
@@ -12,7 +12,7 @@ AS = gas
AR = /usr/ccs/bin/ar
GCC = gcc
CC = $(GCC)
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
RANLIB = $(AR) ts
--- pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd 2016/04/14 22:10:31 1.2
+++ pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd 2016/07/03 19:29:27 1.3
| @@ -1,24 +1,24 @@ | | | @@ -1,24 +1,24 @@ |
1 | $NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.2 2016/04/14 22:10:31 dholland Exp $ | | 1 | $NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.3 2016/07/03 19:29:27 dholland Exp $ |
2 | | | 2 | |
3 | Configure for pkgsrc. Build as 32-bit. | | 3 | Configure for pkgsrc. Build as 32-bit. |
4 | | | 4 | |
5 | --- src/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000 | | 5 | --- src/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000 |
6 | +++ src/runtime/objs/mk.x86-netbsd | | 6 | +++ src/runtime/objs/mk.x86-netbsd |
7 | @@ -7,9 +7,10 @@ SHELL = /bin/sh | | 7 | @@ -7,9 +7,10 @@ SHELL = /bin/sh |
8 | | | 8 | |
9 | MAKE = gmake | | 9 | MAKE = gmake |
10 | | | 10 | |
11 | +AS = as --32 | | 11 | +AS = as --32 |
12 | ARFLAGS = Trcv | | 12 | ARFLAGS = Trcv |
13 | CC = gcc -ansi | | 13 | CC = gcc -ansi |
14 | -CFLAGS = -O2 | | 14 | -CFLAGS = -O2 |
15 | +CFLAGS = -O2 -m32 | | 15 | +CFLAGS = @CFLAGS@ -m32 |
16 | CPP = gcc -x assembler-with-cpp -E -P | | 16 | CPP = gcc -x assembler-with-cpp -E -P |
17 | #CPP = /usr/bin/cpp -P | | 17 | #CPP = /usr/bin/cpp -P |
18 | | | 18 | |
19 | @@ -23,4 +24,4 @@ VERSION = v-x86-netbsd | | 19 | @@ -23,4 +24,4 @@ VERSION = v-x86-netbsd |
20 | RUNTIME = run.x86-netbsd | | 20 | RUNTIME = run.x86-netbsd |
21 | | | 21 | |
22 | all: | | 22 | all: |
23 | - ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) | | 23 | - ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) |
24 | + ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) | | 24 | + ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) |
--- pkgsrc/lang/smlnj11072/distinfo 2016/07/03 19:26:35 1.7
+++ pkgsrc/lang/smlnj11072/distinfo 2016/07/03 19:29:27 1.8
| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | $NetBSD: distinfo,v 1.7 2016/07/03 19:26:35 dholland Exp $ | | 1 | $NetBSD: distinfo,v 1.8 2016/07/03 19:29:27 dholland Exp $ |
2 | | | 2 | |
3 | SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a | | 3 | SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a |
4 | RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb | | 4 | RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb |
5 | Size (smlnj-110.72/MLRISC.tgz) = 1432663 bytes | | 5 | Size (smlnj-110.72/MLRISC.tgz) = 1432663 bytes |
6 | SHA1 (smlnj-110.72/boot.x86-unix.tgz) = 799f02f3e880a829b48962994b563f7321385d87 | | 6 | SHA1 (smlnj-110.72/boot.x86-unix.tgz) = 799f02f3e880a829b48962994b563f7321385d87 |
7 | RMD160 (smlnj-110.72/boot.x86-unix.tgz) = bd2962ea25d6f384a3f458759a1c655960dc4208 | | 7 | RMD160 (smlnj-110.72/boot.x86-unix.tgz) = bd2962ea25d6f384a3f458759a1c655960dc4208 |
8 | Size (smlnj-110.72/boot.x86-unix.tgz) = 5847908 bytes | | 8 | Size (smlnj-110.72/boot.x86-unix.tgz) = 5847908 bytes |
9 | SHA1 (smlnj-110.72/ckit.tgz) = 0ebcdbd0a494eb051b4e6081f5e9312a0a54f03d | | 9 | SHA1 (smlnj-110.72/ckit.tgz) = 0ebcdbd0a494eb051b4e6081f5e9312a0a54f03d |
10 | RMD160 (smlnj-110.72/ckit.tgz) = 0d94d522b22b21600ad99aaf22fb671c12a6ea59 | | 10 | RMD160 (smlnj-110.72/ckit.tgz) = 0d94d522b22b21600ad99aaf22fb671c12a6ea59 |
11 | Size (smlnj-110.72/ckit.tgz) = 199126 bytes | | 11 | Size (smlnj-110.72/ckit.tgz) = 199126 bytes |
12 | SHA1 (smlnj-110.72/cm.tgz) = 0a85eaecc101c45c769e6beb8ace8a8bf0f4d32f | | 12 | SHA1 (smlnj-110.72/cm.tgz) = 0a85eaecc101c45c769e6beb8ace8a8bf0f4d32f |
13 | RMD160 (smlnj-110.72/cm.tgz) = 821eb682bfb4e6ef6a71fe341ba018059301a233 | | 13 | RMD160 (smlnj-110.72/cm.tgz) = 821eb682bfb4e6ef6a71fe341ba018059301a233 |
14 | Size (smlnj-110.72/cm.tgz) = 201235 bytes | | 14 | Size (smlnj-110.72/cm.tgz) = 201235 bytes |
| @@ -70,14 +70,31 @@ SHA1 (patch-aj) = 6318548da4c943c60fe63d | | | @@ -70,14 +70,31 @@ SHA1 (patch-aj) = 6318548da4c943c60fe63d |
70 | SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3 | | 70 | SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3 |
71 | SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511 | | 71 | SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511 |
72 | SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7 | | 72 | SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7 |
73 | SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31 | | 73 | SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31 |
74 | SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b | | 74 | SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b |
75 | SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 | | 75 | SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 |
76 | SHA1 (patch-ar) = 727afe6de54eb244c48e99c661f6b8ae3f780de0 | | 76 | SHA1 (patch-ar) = 727afe6de54eb244c48e99c661f6b8ae3f780de0 |
77 | SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c | | 77 | SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c |
78 | SHA1 (patch-config___arch-n-opsys) = 7035758667350aa9558a14e28245d022e43369ea | | 78 | SHA1 (patch-config___arch-n-opsys) = 7035758667350aa9558a14e28245d022e43369ea |
79 | SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 | | 79 | SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 |
80 | SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d | | 80 | SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d |
81 | SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c | | 81 | SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c |
82 | SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154 | | 82 | SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154 |
83 | SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = d2ede7ce4fca3c400f82ae09ee352ee6872bb1b1 | | 83 | SHA1 (patch-src_runtime_objs_mk.alpha32-dunix) = 9e3a36f4663cd685459f2fbde41b8c5f154bd9c2 |
| | | 84 | SHA1 (patch-src_runtime_objs_mk.alpha32x-osf1) = 6e91f672aadb77bd1d1ab65bfa66e3d7f745846c |
| | | 85 | SHA1 (patch-src_runtime_objs_mk.hppa-hpux) = 40ca27d05490983e734b4d20eecd268935ad2461 |
| | | 86 | SHA1 (patch-src_runtime_objs_mk.hppa-hpux11) = c7ad7769ba05b4fe609a6396d2c8dadb80256e06 |
| | | 87 | SHA1 (patch-src_runtime_objs_mk.hppa-hpux9) = 6adacac502cd12576ea65882984979ce3aa78b41 |
| | | 88 | SHA1 (patch-src_runtime_objs_mk.ppc-aix) = 509ffc0152b2cdfa4e0f6621bed026fe0f1edc99 |
| | | 89 | SHA1 (patch-src_runtime_objs_mk.ppc-darwin) = 6ae822c7b39255b5204e358e3c21aa23b93883ec |
| | | 90 | SHA1 (patch-src_runtime_objs_mk.ppc-darwin5) = 35ddd1f10a907ebbe6b4a3310c3bded83bda8ca0 |
| | | 91 | SHA1 (patch-src_runtime_objs_mk.ppc-linux) = 171ec491a536aa782880d3b3392cf0d728fd9c03 |
| | | 92 | SHA1 (patch-src_runtime_objs_mk.x86-cygwin) = b9e1174a956a63b1023eaf70322776fe93717782 |
| | | 93 | SHA1 (patch-src_runtime_objs_mk.x86-darwin) = 7770986d2805f66f1c4d4faff2fb66b2fb4b7b8d |
| | | 94 | SHA1 (patch-src_runtime_objs_mk.x86-freebsd) = 2420f6a04ae78ca306daeb94a312f0e4fdcd0410 |
| | | 95 | SHA1 (patch-src_runtime_objs_mk.x86-linux) = 4905280351b88b5a74f3bd68dadcdca6fd2037ac |
| | | 96 | SHA1 (patch-src_runtime_objs_mk.x86-linux-pthreads) = 5c2730e09b05c3a00abb3ea6c732e39775973f79 |
| | | 97 | SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = 3a8e93e55ed9bba470a680c327cb4e4d22d69ff4 |
| | | 98 | SHA1 (patch-src_runtime_objs_mk.x86-netbsd2) = 98408821e7c1f3ca6f50f5d9e230c903173029e1 |
| | | 99 | SHA1 (patch-src_runtime_objs_mk.x86-openbsd) = da536769b231e01a5fb045fe7dd329eee15b6706 |
| | | 100 | SHA1 (patch-src_runtime_objs_mk.x86-solaris) = 125814c60fd42389df9a1d5dbcd4313e7cabb53c |
$NetBSD: patch-src_runtime_objs_mk.alpha32-dunix,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.alpha32-dunix~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.alpha32-dunix
@@ -6,7 +6,7 @@
SHELL = /bin/sh
CC = cc -std
-CFLAGS = -O
+CFLAGS = @CFLAGS@
LDFLAGS = -non_shared -T 20000000 -D 40000000
AS = as -nocpp
AR = /usr/ucb/ar
$NetBSD: patch-src_runtime_objs_mk.alpha32x-osf1,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.alpha32x-osf1~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.alpha32x-osf1
@@ -4,7 +4,7 @@
SHELL = /bin/sh
CC = cc -std
-CFLAGS = -O
+CFLAGS = @CFLAGS@
LDFLAGS = -non_shared -T 20000000 -D 40000000
AS = as -nocpp
AR = /usr/ucb/ar
$NetBSD: patch-src_runtime_objs_mk.hppa-hpux,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.hppa-hpux~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.hppa-hpux
@@ -12,7 +12,7 @@ CC = cc -Aa -N -D__STDC__
#CC = gcc -ansi -D__STDC__
CPP = /lib/cpp.ansi
-CFLAGS = -O
+CFLAGS = @CFLAGS@
AS = /usr/ccs/bin/as
RANLIB = ar ts
$NetBSD: patch-src_runtime_objs_mk.hppa-hpux11,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.hppa-hpux11~ 2005-07-20 14:30:18.000000000 +0000
+++ src/runtime/objs/mk.hppa-hpux11
@@ -13,7 +13,7 @@ CC = gcc -ansi -D__STDC__
#CPP = /lib/cpp.ansi
CPP = cpp
-CFLAGS = -O
+CFLAGS = @CFLAGS@
AS = /usr/ccs/bin/as
RANLIB = ar ts
$NetBSD: patch-src_runtime_objs_mk.hppa-hpux9,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.hppa-hpux9~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.hppa-hpux9
@@ -9,7 +9,7 @@ SHELL = /bin/sh
CC = cc -Aa -D__STDC__
CPP = /lib/cpp.ansi
-CFLAGS = -O
+CFLAGS = @CFLAGS@
AS = /bin/as
RANLIB = ar ts
$NetBSD: patch-src_runtime_objs_mk.ppc-aix,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-aix~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.ppc-aix
@@ -5,7 +5,7 @@ SHELL = /bin/sh
# note: the vendor cpp isn't expanding nested macro applications correctly.
CC = cc
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = /lib/cpp
#CC = gcc -ansi
$NetBSD: patch-src_runtime_objs_mk.ppc-darwin,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-darwin~ 2007-10-31 16:04:18.000000000 +0000
+++ src/runtime/objs/mk.ppc-darwin
@@ -11,7 +11,7 @@ SHELL = /bin/sh
MAKE = make
CC = cc -ansi
-CFLAGS = -g -O2 -D_NONSTD_SOURCE
+CFLAGS = @CFLAGS@ -D_NONSTD_SOURCE
CPP = cc -x assembler-with-cpp -E -P -ansi
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
$NetBSD: patch-src_runtime_objs_mk.ppc-darwin5,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-darwin5~ 2002-10-10 17:08:59.000000000 +0000
+++ src/runtime/objs/mk.ppc-darwin5
@@ -9,7 +9,7 @@ SHELL = /bin/sh
MAKE = make
CC = cc -ansi
-CFLAGS = -g -O2
+CFLAGS = @CFLAGS@
CPP = cc -x assembler-with-cpp -E -P -ansi
XOBJS =
XLIBS =
$NetBSD: patch-src_runtime_objs_mk.ppc-linux,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-linux~ 2000-11-10 14:04:49.000000000 +0000
+++ src/runtime/objs/mk.ppc-linux
@@ -6,7 +6,7 @@ SHELL = /bin/sh
MAKE = make
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x c -E -P -ansi
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
$NetBSD: patch-src_runtime_objs_mk.x86-cygwin,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-cygwin~ 2004-03-19 18:54:52.000000000 +0000
+++ src/runtime/objs/mk.x86-cygwin
@@ -5,7 +5,7 @@ SHELL = /bin/sh
MAKE = make
CC = gcc
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
$NetBSD: patch-src_runtime_objs_mk.x86-darwin,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-darwin~ 2009-09-13 17:50:53.000000000 +0000
+++ src/runtime/objs/mk.x86-darwin
@@ -13,7 +13,7 @@ SHELL = /bin/sh
MAKE = make
AS = /usr/bin/as -arch i386
CC = cc -m32 -ansi
-CFLAGS = -g -O2 -D_DARWIN_C_SOURCE
+CFLAGS = @CFLAGS@ -D_DARWIN_C_SOURCE
CPP = cc -x assembler-with-cpp -E -P -ansi
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
$NetBSD: patch-src_runtime_objs_mk.x86-freebsd,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-freebsd~ 2006-04-20 15:28:53.000000000 +0000
+++ src/runtime/objs/mk.x86-freebsd
@@ -9,7 +9,7 @@ MAKE = gmake
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
$NetBSD: patch-src_runtime_objs_mk.x86-linux,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-linux~ 2006-04-20 15:28:53.000000000 +0000
+++ src/runtime/objs/mk.x86-linux
@@ -6,7 +6,7 @@ SHELL = /bin/sh
MAKE = make
AS = as --32
CC = gcc -ansi
-CFLAGS = -O2 -m32
+CFLAGS = @CFLAGS@ -m32
CPP = gcc -x assembler-with-cpp -E -P
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
$NetBSD: patch-src_runtime_objs_mk.x86-linux-pthreads,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-linux-pthreads~ 2004-01-31 14:24:42.000000000 +0000
+++ src/runtime/objs/mk.x86-linux-pthreads
@@ -5,7 +5,7 @@ SHELL = /bin/sh
MAKE = make
CC = gcc -ansi
-CFLAGS = -O2 -D_REENTRANT
+CFLAGS = @CFLAGS@ -D_REENTRANT
CPP = gcc -x assembler-with-cpp -E -P
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
$NetBSD: patch-src_runtime_objs_mk.x86-netbsd2,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-netbsd2~ 2006-02-10 22:14:59.000000000 +0000
+++ src/runtime/objs/mk.x86-netbsd2
@@ -9,7 +9,7 @@ MAKE = gmake
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
$NetBSD: patch-src_runtime_objs_mk.x86-openbsd,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-openbsd~ 2008-12-02 16:50:18.000000000 +0000
+++ src/runtime/objs/mk.x86-openbsd
@@ -9,7 +9,7 @@ MAKE = gmake
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
$NetBSD: patch-src_runtime_objs_mk.x86-solaris,v 1.1 2016/07/03 19:29:28 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-solaris~ 2004-01-31 14:24:42.000000000 +0000
+++ src/runtime/objs/mk.x86-solaris
@@ -12,7 +12,7 @@ AS = gas
AR = /usr/ccs/bin/ar
GCC = gcc
CC = $(GCC)
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
RANLIB = $(AR) ts
--- pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-netbsd 2016/07/03 18:52:32 1.1
+++ pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.x86-netbsd 2016/07/03 19:29:28 1.2
| @@ -1,24 +1,24 @@ | | | @@ -1,24 +1,24 @@ |
1 | $NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.1 2016/07/03 18:52:32 dholland Exp $ | | 1 | $NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.2 2016/07/03 19:29:28 dholland Exp $ |
2 | | | 2 | |
3 | Configure for pkgsrc. Build as 32-bit. | | 3 | Configure for pkgsrc. Build as 32-bit. |
4 | | | 4 | |
5 | --- src/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000 | | 5 | --- src/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000 |
6 | +++ src/runtime/objs/mk.x86-netbsd | | 6 | +++ src/runtime/objs/mk.x86-netbsd |
7 | @@ -7,9 +7,10 @@ SHELL = /bin/sh | | 7 | @@ -7,9 +7,10 @@ SHELL = /bin/sh |
8 | | | 8 | |
9 | MAKE = gmake | | 9 | MAKE = gmake |
10 | | | 10 | |
11 | +AS = as --32 | | 11 | +AS = as --32 |
12 | ARFLAGS = Trcv | | 12 | ARFLAGS = Trcv |
13 | CC = gcc -ansi | | 13 | CC = gcc -ansi |
14 | -CFLAGS = -O2 | | 14 | -CFLAGS = -O2 |
15 | +CFLAGS = -O2 -m32 | | 15 | +CFLAGS = @CFLAGS@ -m32 |
16 | CPP = gcc -x assembler-with-cpp -E -P | | 16 | CPP = gcc -x assembler-with-cpp -E -P |
17 | #CPP = /usr/bin/cpp -P | | 17 | #CPP = /usr/bin/cpp -P |
18 | | | 18 | |
19 | @@ -23,4 +24,4 @@ VERSION = v-x86-netbsd | | 19 | @@ -23,4 +24,4 @@ VERSION = v-x86-netbsd |
20 | RUNTIME = run.x86-netbsd | | 20 | RUNTIME = run.x86-netbsd |
21 | | | 21 | |
22 | all: | | 22 | all: |
23 | - ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) | | 23 | - ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) |
24 | + ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) | | 24 | + ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) |