Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7086596 userland problems on 173
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 12 Sep 2011 20:36:20 -0700
changeset 519 64d5e70ee0eb
parent 518 6168fc9cded3
child 520 9021000122ce
7086596 userland problems on 173
components/emacs/Makefile file | annotate | diff | comparison | revisions
components/ghostscript/Makefile file | annotate | diff | comparison | revisions
components/imagemagick/Makefile file | annotate | diff | comparison | revisions
components/open-fabrics/ofed.mk file | annotate | diff | comparison | revisions
tools/pkglintrc file | annotate | diff | comparison | revisions 
--- a/components/emacs/Makefile	Mon Sep 12 14:53:06 2011 -0700
+++ b/components/emacs/Makefile	Mon Sep 12 20:36:20 2011 -0700
@@ -66,7 +66,7 @@
 #CONFIGURE_PREFIX =	$(PROTO_DIR)/usr
 
 # configure options common to all variants of emacs that we want to build.
-CONFIGURE_OPTIONS +=	CC="gcc -m64"
+CONFIGURE_OPTIONS +=	CC="$(CC) -m64"
 CONFIGURE_OPTIONS +=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS +=	--datarootdir=$(CONFIGURE_PREFIX)/share
 CONFIGURE_OPTIONS +=	--libexecdir=$(CONFIGURE_PREFIX)/lib
--- a/components/ghostscript/Makefile	Mon Sep 12 14:53:06 2011 -0700
+++ b/components/ghostscript/Makefile	Mon Sep 12 20:36:20 2011 -0700
@@ -34,6 +34,8 @@
 include ../../make-rules/ips.mk
 include ../../make-rules/configure.mk
 
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+
 # configure(1) options to use
 CONFIGURE_OPTIONS +=	--with-drivers=ALL
 CONFIGURE_OPTIONS +=	--with-ijs
--- a/components/imagemagick/Makefile	Mon Sep 12 14:53:06 2011 -0700
+++ b/components/imagemagick/Makefile	Mon Sep 12 20:36:20 2011 -0700
@@ -40,6 +40,8 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+
 # IPS_COMPONENT_VERSION is by default set to $(COMPONENT_VERSION) but in
 # this case we need to replace the '-' by '.'.
 #
--- a/components/open-fabrics/ofed.mk	Mon Sep 12 14:53:06 2011 -0700
+++ b/components/open-fabrics/ofed.mk	Mon Sep 12 20:36:20 2011 -0700
@@ -29,6 +29,8 @@
 # OFED only builds with GCC
 COMPILER=gcc
 
+PATH=/usr/bin:/usr/gnu/bin:/usr/sfw/bin
+
 CPPFLAGS += "-Wformat=2"
 CFLAGS += -D_REENTRANT
 
--- a/tools/pkglintrc	Mon Sep 12 14:53:06 2011 -0700
+++ b/tools/pkglintrc	Mon Sep 12 20:36:20 2011 -0700
@@ -18,9 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 [pkglint]
 
 pkglint.ext.content = pkglint.userland
 
+# temporarily work around defect 18884
+pkglint.exclude = pkg.lint.pkglint_manifest.PkgManifestChecker.variants
upstream/oracle/userland-gate