--- a/exception_lists/packaging Wed Dec 16 10:23:41 2015 -0800
+++ b/exception_lists/packaging Mon Jan 04 15:55:51 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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"),
@@ -30,12 +30,6 @@
# but not included in any packages - this is intentional.
#
-# These should be empty directories left from the libdrm workaround for
-# pkgconfig installation
-usr/lib/xorg/pkgconfig
-usr/lib/xorg/amd64/pkgconfig i386
-usr/lib/xorg/sparcv9/pkgconfig sparc
-
# /var/run is a symlink to a tmpfs filesystem created at system boot
var/run
--- a/open-src/lib/libdrm/Makefile Wed Dec 16 10:23:41 2015 -0800
+++ b/open-src/lib/libdrm/Makefile Mon Jan 04 15:55:51 2016 -0800
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -90,20 +90,7 @@
@rm -f $@
ln -s libdrm $@
-# Upstream seems to install in $(X11_SERVERLIBS_SUBDIR)/pkgconfig no matter
-# what, so just move them afterwards
-PC_FILES_i386 = libdrm_intel.pc libdrm_radeon.pc
-PC_FILES = libdrm.pc libkms.pc $(PC_FILES_$(MACH))
-MOVED_PC_FILES = $(PC_FILES:%=$(PROTODIR)/$(PKGCONFIG_DIR)/%)
-XSERVER_PC_DIR = $(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)/pkgconfig
-
-install-gen: $(MOVED_PC_FILES) install_fixed_manpages
-
-$(PROTODIR)/$(PKGCONFIG_DIR)/%.pc: $(PROTODIR)/$(XSERVER_PC_DIR)/%.pc
- -rm -f $@
- mv $< $@
-
-$(PC_FILES:%=$(PROTODIR)/$(XSERVER_PC_DIR)/%): default_install
+install-gen: install_fixed_manpages
# Need to apply suntouch changes to man pages generated during build
MANDIR = $(PROTODIR)$(X11_MAN_DIR)
--- a/open-src/lib/mesa/Makefile Wed Dec 16 10:23:41 2015 -0800
+++ b/open-src/lib/mesa/Makefile Mon Jan 04 15:55:51 2016 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# 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"),
@@ -99,6 +99,7 @@
# Need to use GNU Make to build
MODULE_MAKE=$(GNUMAKE)
MODULE_MAKE_SET=yes
+MODULE_MAKEFLAGS = TOP="$(PWD)/$(BUILD_DIR)"
# Need to build with gcc
MODULE_COMPILER=gcc