changeset 360:4fd3779cba48

7060729 Utilities like flex and gcc-3 need to look in /usr/gnu/bin for their executables
author Rich Burridge <rich.burridge@oracle.com>
date Sun, 03 Jul 2011 20:12:28 -0700
parents a67615a8f492
children 22214726d642
files components/flex/Makefile components/flex/flex.p5m components/gcc3/gcc-3.p5m
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/components/flex/Makefile	Sun Jul 03 18:09:06 2011 -0700
+++ b/components/flex/Makefile	Sun Jul 03 20:12:28 2011 -0700
@@ -43,6 +43,7 @@
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		CXXFLAGS="$(CXXFLAGS)"
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(LDFLAGS)"
+CONFIGURE_OPTIONS  +=		M4="/usr/gnu/bin/m4"
 
 COMPONENT_BUILD_ENV +=		SONAME="$(SONAME)"
 COMPONENT_INSTALL_ENV +=	SONAME="$(SONAME)"
--- a/components/flex/flex.p5m	Sun Jul 03 18:09:06 2011 -0700
+++ b/components/flex/flex.p5m	Sun Jul 03 20:12:28 2011 -0700
@@ -97,7 +97,7 @@
 file path=usr/share/man/man1/flex.1 mangler.man.stability=volatile
 link path=usr/sfw/bin/flex target=../../bin/flex
 
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/gm4 type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/m4 type=require
 
 legacy pkg=SUNWflexlex \
 	name="Flex Lexer" \
--- a/components/gcc3/gcc-3.p5m	Sun Jul 03 18:09:06 2011 -0700
+++ b/components/gcc3/gcc-3.p5m	Sun Jul 03 20:12:28 2011 -0700
@@ -486,7 +486,7 @@
 
 license gcc.license license="GPLv2"
 
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/gas type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/as type=require
 
 legacy pkg=SUNWgcc \
 	name="gcc - The GNU C compiler" \