summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2010-02-07 20:03:41 +0100
committerArwed von Merkatz2010-02-16 19:26:01 +0100
commitdd5ee2a83c0bf710afe619c5b2c37ab753821176 (patch)
treeed771a201b035e706062a595932e3fea9ebdb0d2
parente56f45aae73e8bdcf786e9ff00053655ecc9c834 (diff)
glibc: make libdrm up_trigger more generic, bug 15565
(cherry picked from commit 8b9b136a6aa3cf5335d951f0eafe239cfc06e419)
-rw-r--r--libs/glibc/HISTORY5
-rwxr-xr-xlibs/glibc/UP_TRIGGERS2
2 files changed, 6 insertions, 1 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 256732cbfd..cf6dc69ba8 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2010-02-07 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * UP_TRIGGERS: up_trigger libdrm even if drm.h is not in glibc install
+ log, but anything in /usr/include/drm, since cleanse will remove
+ files from the install log if libdrm was installed later, bug 15565
+
2010-02-06 Eric Sandall <sandalle@sourcemage.org>
* UP_TRIGGERS: Only trigger cast of libdrm if libdrm is also installed
diff --git a/libs/glibc/UP_TRIGGERS b/libs/glibc/UP_TRIGGERS
index a99be7bdc2..777066d00e 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) && spell_ok libdrm; then
+if $(gaze from $INSTALL_ROOT/usr/include/drm|grep -q glibc) && spell_ok libdrm; then
up_trigger libdrm cast_self
fi