summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-02-06 22:07:01 -0800
committerArwed von Merkatz2010-02-16 19:25:47 +0100
commite56f45aae73e8bdcf786e9ff00053655ecc9c834 (patch)
tree3721286fa23a0f00b482503cdf08d08a53d946cd
parent7f90f2d0ac18e66971170d4d8b582b5b06dc5a4a (diff)
glibc: Only trigger cast of libdrm if libdrm is also installed
(cherry picked from commit b55cf9626bfd2557488a9f0dbd2bbbc19f0b30e0)
-rw-r--r--libs/glibc/HISTORY3
-rwxr-xr-xlibs/glibc/UP_TRIGGERS2
2 files changed, 4 insertions, 1 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 8ef253a4cf..256732cbfd 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2010-02-06 Eric Sandall <sandalle@sourcemage.org>
+ * UP_TRIGGERS: Only trigger cast of libdrm if libdrm is also installed
+
2010-01-19 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Remove kernel DRM headers (Bug #15547)
diff --git a/libs/glibc/UP_TRIGGERS b/libs/glibc/UP_TRIGGERS
index b64343d338..a99be7bdc2 100755
--- a/libs/glibc/UP_TRIGGERS
+++ b/libs/glibc/UP_TRIGGERS
@@ -3,6 +3,6 @@ if ! spell_ok locale; then
echo
fi
-if $(gaze from $INSTALL_ROOT/usr/include/drm/drm.h|grep -q glibc); then
+if $(gaze from $INSTALL_ROOT/usr/include/drm/drm.h|grep -q glibc) && spell_ok libdrm; then
up_trigger libdrm cast_self
fi