diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-06-21 14:58:06 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-06-21 14:58:06 +0000 |
| commit | aa0e2034c59e259d0a868e067f3b9328ce7b1fc8 (patch) | |
| tree | b982d410d7f8082c906bed849e2480c7a1b25419 | |
| parent | 12669cf4ed201c9b95e15ff6ccabb776d68ea933 (diff) | |
| download | pkgsrc-aa0e2034c59e259d0a868e067f3b9328ce7b1fc8.tar.gz | |
On EL6 systems the 'systemtap-sdt-devel' RPM installs a /usr/bin/dtrace
which is emphatically not DTrace, causing nothing but problems for
builds. Explicitly disable DTrace support if /usr/bin/dtrace is found.
| -rw-r--r-- | lang/ruby200-base/Makefile | 7 | ||||
| -rw-r--r-- | lang/ruby21-base/Makefile | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lang/ruby200-base/Makefile b/lang/ruby200-base/Makefile index a2c41647633..59d5c2f248e 100644 --- a/lang/ruby200-base/Makefile +++ b/lang/ruby200-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2015/04/30 03:34:31 taca Exp $ +# $NetBSD: Makefile,v 1.18 2015/06/21 14:58:06 jperkin Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -45,6 +45,11 @@ CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ .include "../../mk/compiler.mk" +# /usr/bin/dtrace is not DTrace. +.if ${OPSYS} == "Linux" && exists(/usr/bin/dtrace) +CONFIGURE_ARGS+= --disable-dtrace +.endif + .if !empty(PKGSRC_COMPILER:Msunpro) LIBS.SunOS+= -B static -lsunmath -B dynamic -lm LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib -Wl,-R${SUNWSPROBASE}/lib diff --git a/lang/ruby21-base/Makefile b/lang/ruby21-base/Makefile index c6dad9e1deb..bf917d1cb64 100644 --- a/lang/ruby21-base/Makefile +++ b/lang/ruby21-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2015/04/30 03:27:20 taca Exp $ +# $NetBSD: Makefile,v 1.13 2015/06/21 15:10:17 jperkin Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -32,6 +32,11 @@ CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ .include "../../mk/compiler.mk" +# /usr/bin/dtrace is not DTrace. +.if ${OPSYS} == "Linux" && exists(/usr/bin/dtrace) +CONFIGURE_ARGS+= --disable-dtrace +.endif + .if !empty(PKGSRC_COMPILER:Msunpro) LIBS.SunOS+= -B static -lsunmath -B dynamic -lm LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib -Wl,-R${SUNWSPROBASE}/lib |