From 35a0125756bd68f77a2ddaf2dd6b8539e733ee1d Mon Sep 17 00:00:00 2001
From: Norm Jacobs <Norm.Jacobs@Oracle.COM>
Date: Wed, 23 Feb 2011 19:37:11 +0100
Subject: [PATCH] 6841644 OpenSolaris Python should support gdbm 6991811 Migrate Mercurial (Hg) to Python 2.6 7009592 PyOpenSSL should be updated from 0.8 to 0.11 7016735 move mercurial from sfw to userland 7018363 Userland LD_OPTIONS should include non-executable data mapfiles as well 7019410 python 2.6 should move to userland 7020772 userland build should provide more macros for common flags 7021204 userland runpath checking should relax slightly.

---
 components/ggrep/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/components/ggrep/Makefile b/components/ggrep/Makefile
index 036ebcb..e03c1cc 100644
--- a/components/ggrep/Makefile
+++ b/components/ggrep/Makefile
@@ -33,7 +33,8 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-CFLAGS	+=			$(FEATURES_EXTENSIONS)
+# We need to be able to return from void functions
+CFLAGS	+=			$(studio_FEATURES_EXTENSIONS)
 
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		--prefix=/usr

--
Gitblit v1.9.3