[gentoo-commits] proj/hardened-dev:uclibc commit in: media-libs/mesa/, media-libs/mesa/files/

[Anthony G. Basile]

commit:     1db78c1c920bf8184f4f22eacfa9cfb2d5ee63c8
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 19:19:04 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 19:19:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=1db78c1c

media-libs/mesa: patch configure.ac to respect user defined macros

---
 media-libs/mesa/files/respect-user-defines.patch |   19 +++++++++++++++++++
 media-libs/mesa/files/uclibc-defines.patch       |   12 ------------
 media-libs/mesa/mesa-7.11.2-r99.ebuild           |   10 ++++++----
 media-libs/mesa/metadata.xml                     |    1 +
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/media-libs/mesa/files/respect-user-defines.patch b/media-libs/mesa/files/respect-user-defines.patch
new file mode 100644
index 0000000..291d71e
--- /dev/null
+++ b/media-libs/mesa/files/respect-user-defines.patch
@@ -0,0 +1,19 @@
+diff -Naur Mesa-7.11.2.orig/configure.ac Mesa-7.11.2/configure.ac
+--- Mesa-7.11.2.orig/configure.ac	2011-10-15 00:43:58.000000000 +0000
++++ Mesa-7.11.2/configure.ac	2012-01-06 18:38:58.213283132 +0000
+@@ -20,6 +20,7 @@
+ dnl Save user CFLAGS and CXXFLAGS so one can override the default ones
+ USER_CFLAGS="$CFLAGS"
+ USER_CXXFLAGS="$CXXFLAGS"
++USER_DEFINES="$DEFINES"
+ 
+ dnl Versions for external dependencies
+ LIBDRM_REQUIRED=2.4.24
+@@ -1836,6 +1837,7 @@
+ dnl Add user CFLAGS and CXXFLAGS
+ CFLAGS="$CFLAGS $USER_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
++DEFINES="$DEFINES $USER_DEFINES"
+ 
+ dnl Substitute the config
+ AC_CONFIG_FILES([configs/autoconf])

diff --git a/media-libs/mesa/files/uclibc-defines.patch b/media-libs/mesa/files/uclibc-defines.patch
deleted file mode 100644
index 901f9cc..0000000
--- a/media-libs/mesa/files/uclibc-defines.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Mesa-7.11.2.orig/configure Mesa-7.11.2/configure
---- Mesa-7.11.2.orig/configure	2012-01-06 12:53:32.000000000 -0500
-+++ Mesa-7.11.2/configure	2012-01-06 12:54:20.000000000 -0500
-@@ -11401,6 +11401,8 @@
- echo "        Shared libs:     $enable_shared"
- echo "        Static libs:     $enable_static"
- 
-+DEFINES+=" -U__GLIBC__ -U_GNU_SOURCE"
-+
- # cleanup the CFLAGS/CXXFLAGS/DEFINES vars
- cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
-     $SED 's/^ *//;s/  */ /;s/ *$//'`

diff --git a/media-libs/mesa/mesa-7.11.2-r99.ebuild b/media-libs/mesa/mesa-7.11.2-r99.ebuild
index e4241b7..701f4aa 100644
--- a/media-libs/mesa/mesa-7.11.2-r99.ebuild
+++ b/media-libs/mesa/mesa-7.11.2-r99.ebuild
@@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
 
 LICENSE="MIT LGPL-3 SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86" 
+KEYWORDS="amd64 x86" 
 
 INTEL_CARDS="intel"
 RADEON_CARDS="radeon"
@@ -33,7 +33,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles +llvm motif +nptl openvg osmesa pic pax_kernel selinux shared-dricore +shared-glapi"
+	bindist +classic debug +egl +gallium gbm gles +llvm motif +nptl openvg osmesa pic pax_kernel selinux shared-dricore +shared-glapi uclibc"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages which
@@ -112,6 +112,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	use uclibc && export DEFINES="-U__GLIBC__ -D__UCLIBC__"
+
 	# apply patches
 	if [[ -n ${SRC_PATCHES} ]]; then
 		EPATCH_FORCE="yes" \
@@ -123,11 +125,11 @@ src_prepare() {
 	# fix for hardened pax_kernel, bug 240956
 	epatch "${FILESDIR}"/glx_ro_text_segm.patch
 
+	epatch "${FILESDIR}"/respect-user-defines.patch
+
 	base_src_prepare
 
 	eautoreconf
-
-	epatch "${FILESDIR}"/uclibc-defines.patch
 }
 
 src_configure() {

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 4b20581..99e333e 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -15,5 +15,6 @@
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
+	<flag name='uclibc'>Disable GLIBC and enabled UCLIBC.</flag>
 </use>
 </pkgmetadata>