22728538 X consolidation should move to gcc 5.3
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Tue, 26 Apr 2016 19:17:51 -0700
changeset 1630 fedd05237f45
parent 1629 d07205e1f1c1
child 1631 4f761c384e9b
22728538 X consolidation should move to gcc 5.3
open-src/app/intel-gpu-tools/Makefile
open-src/common/Makefile.init
open-src/driver/xf86-input-vmmouse/Makefile
open-src/driver/xf86-video-ati/Makefile
open-src/driver/xf86-video-intel/Makefile
open-src/driver/xf86-video-vesa/Makefile
open-src/driver/xf86-video-vmware/Makefile
open-src/lib/libdrm/Makefile
open-src/lib/libepoxy/Makefile
open-src/lib/libglu/Makefile
open-src/lib/libvdpau/Makefile
open-src/lib/libxkbcommon/Makefile
pkg/manifests/library-graphics-libvdpau.p5m
--- a/open-src/app/intel-gpu-tools/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/app/intel-gpu-tools/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -2,7 +2,7 @@
 #
 # intel-gpu-tools - Intel graphics driver debug tools
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -54,6 +54,9 @@
 MODULE_COMPILER=gcc
 MODULE_COMPILER_SET=yes
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT=no
+
 # Different programs need different libraries, but upstream links them all in
 MODULE_LD_OPTIONS = $(ZDISCARD_UNUSED_DEP)
 
--- a/open-src/common/Makefile.init	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/common/Makefile.init	Tue Apr 26 19:17:51 2016 -0700
@@ -130,7 +130,7 @@
 CXX_VERSION_FLAGS_suncc		= -std=c++11 -xlang=c99
 
 ## GNU Compilers
-GCC_VERSION        		= 4.8 
+GCC_VERSION        		= 5.3
 GCC				= /usr/gcc/$(GCC_VERSION)/bin/gcc
 GXX				= /usr/gcc/$(GCC_VERSION)/bin/g++
 CC_gcc				= $(GCC)
--- a/open-src/driver/xf86-input-vmmouse/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/driver/xf86-input-vmmouse/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-input-vmmouse Makefile
 #
-# Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -43,6 +43,9 @@
 MODULE_COMPILER=gcc
 MODULE_COMPILER_SET=yes
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT=no
+
 # Need to use GNU Make to build due to Solaris make bug 15352407
 MODULE_MAKE=$(GNUMAKE)
 MODULE_MAKE_SET=yes
--- a/open-src/driver/xf86-video-ati/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/driver/xf86-video-ati/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-ati Makefile
 #
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -50,6 +50,9 @@
 MODULE_COMPILER=gcc
 MODULE_COMPILER_SET=yes
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT=no
+
 # Extra flags to pass to configure script
 MODULE_CONFIG_OPTS=--disable-kms --disable-glamor
 
--- a/open-src/driver/xf86-video-intel/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/driver/xf86-video-intel/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -67,13 +67,16 @@
 MODULE_COMPILER=gcc
 MODULE_COMPILER_SET=yes
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT=no
+
 MODULE_CFLAGS = -DHAVE_DRI1
 
 # Extra flags to pass to configure script
 # --libdir is needed to set path for XvMC libraries
 MODULE_CONFIG_OPTS=--enable-dri2 --enable-dri3 \
 	  	   --libdir='$(MODULE_FULLARCH_LIB_DIR)' \
-		   --enable-sna --enable-uxa --with-default-accel=uxa \
+		   --enable-sna --enable-uxa --with-default-accel='uxa' \
 		   --disable-udev
 
 # echo is set to workaround configure/libtool strangeness in 2.15.0 that
--- a/open-src/driver/xf86-video-vesa/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/driver/xf86-video-vesa/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-vesa Makefile
 #
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -46,6 +46,9 @@
 MODULE_COMPILER=gcc
 MODULE_COMPILER_SET=yes
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT=no
+
 # Libraries/modules to link with
 MODULE_LD_OPTIONS= \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR) \
--- a/open-src/driver/xf86-video-vmware/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/driver/xf86-video-vmware/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-vmware driver for guests inside VMWare hypervisors
 #
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -41,6 +41,9 @@
 
 AUTORECONF = yes
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT=no
+
 # Merge in additional sources from sun-src directory
 ADDITIONAL_SOURCE_DIR=sun-src
 
--- a/open-src/lib/libdrm/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/lib/libdrm/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -63,6 +63,9 @@
 # Command line options to GNU autoconf configure script
 MODULE_CONFIG_OPTS = --enable-libkms --disable-nouveau
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT = no
+
 # Man pages to apply Sun footer to & attributes to list
 #SUNTOUCHED_MANPAGES=*.man
 MODULE_STABILITY = Volatile
--- a/open-src/lib/libepoxy/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/lib/libepoxy/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -2,7 +2,7 @@
 #
 # libepoxy - library for handling OpenGL function pointers
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -63,6 +63,9 @@
 MODULE_COMPILER=gcc
 MODULE_COMPILER_SET=yes
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT=no
+
 # regenerate configure
 AUTORECONF = yes
 
--- a/open-src/lib/libglu/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/lib/libglu/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -84,6 +84,9 @@
 MODULE_COMPILER=gcc
 MODULE_COMPILER_SET=yes
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT=no
+
 ### Include common rulesets
 include ../Makefile.inc
 
--- a/open-src/lib/libvdpau/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/lib/libvdpau/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -78,5 +78,8 @@
 MODULE_COMPILER=gcc
 MODULE_COMPILER_SET=yes
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT=no
+
 ### Include common rulesets
 include ../Makefile.inc
--- a/open-src/lib/libxkbcommon/Makefile	Wed Apr 20 18:55:10 2016 -0700
+++ b/open-src/lib/libxkbcommon/Makefile	Tue Apr 26 19:17:51 2016 -0700
@@ -71,6 +71,9 @@
 
 MODULE_LD_SHARED_OPTIONS = -z gnu-version-script-compat
 
+# Cos of 23185711 - disable parfait temporarily
+USE_PARFAIT = no
+
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = doxyfile.patch,-p1
 
--- a/pkg/manifests/library-graphics-libvdpau.p5m	Wed Apr 20 18:55:10 2016 -0700
+++ b/pkg/manifests/library-graphics-libvdpau.p5m	Tue Apr 26 19:17:51 2016 -0700
@@ -45,9 +45,6 @@
 file path=usr/share/doc/libvdpau/html/classes.html
 file path=usr/share/doc/libvdpau/html/closed.png
 file path=usr/share/doc/libvdpau/html/dir_3708a2ca7cad76d93d639e89f42f5087.html
-file path=usr/share/doc/libvdpau/html/dir_3708a2ca7cad76d93d639e89f42f5087_dep.map
-file path=usr/share/doc/libvdpau/html/dir_3708a2ca7cad76d93d639e89f42f5087_dep.md5
-file path=usr/share/doc/libvdpau/html/dir_3708a2ca7cad76d93d639e89f42f5087_dep.png
 file path=usr/share/doc/libvdpau/html/doc.png
 file path=usr/share/doc/libvdpau/html/doxygen.css
 file path=usr/share/doc/libvdpau/html/doxygen.png