[PATCH 7/9] Install all dri drivers from the DESTDIR tree, instead of copying them from the build tree.
From: Steve Langasek <steve.langasek@ubuntu.com>
This simplifies the install rules since we know already that we're only building drivers that we want to ship, and avoids rpath problems with libtool linking to in-tree convenience libraries.
(cherry picked from commit ac89b1de473e794963e9a0d36bda6641915b3ed2)
Conflicts:
debian/changelog
debian/libgl1-mesa-dri.install.in
debian/libgl1-mesa-dri.install.linux.in
---
debian/changelog | 7 +++++++
debian/libgl1-mesa-dri.install.in | 3 +--
debian/libgl1-mesa-dri.install.kfreebsd.in | 6 ------
debian/libgl1-mesa-dri.install.linux.in | 8 --------
debian/rules | 11 -----------
5 filer ändrade, 8 tillägg(+), 27 borttagningar(-)
delete mode 100644 debian/libgl1-mesa-dri.install.kfreebsd.in
delete mode 100644 debian/libgl1-mesa-dri.install.linux.in
diff --git a/debian/changelog b/debian/changelog
index 689e140..a6ae9d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,13 @@ mesa (8.0.4-3) UNRELEASED; urgency=low
* Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building
llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.
+ [ Steve Langasek ]
+ * Install all dri drivers from the DESTDIR tree, instead of copying them
+ from the build tree; this simplifies the install rules since we know
+ already that we're only building drivers that we want to ship, and
+ avoids rpath problems with libtool linking to in-tree convenience
+ libraries.
+
-- Jon Severinsson <jon@severinsson.net> Sat, 22 Sep 2012 20:50:00 +0200
mesa (8.0.4-2) unstable; urgency=high
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
index 4a66df4..72aa08a 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,2 +1 @@
-# If this part gets modified, make sure to update .install.$os as well:
-build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libgl1-mesa-dri.install.kfreebsd.in b/debian/libgl1-mesa-dri.install.kfreebsd.in
deleted file mode 100644
index 64f9660..0000000
--- a/debian/libgl1-mesa-dri.install.kfreebsd.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# Keep this part in sync with libgl1-mesa-dri.install:
-# But there's no such file for kfreebsd-* any longer, so comment it out entirely:
-# build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-
-# This part is GNU/kFreeBSD-specific:
-build/dri/${DEB_HOST_MULTIARCH}/gallium/swrast_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in
deleted file mode 100644
index ee1acd8..0000000
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# Keep this part in sync with libgl1-mesa-dri.install:
-build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-
-# This part is Linux-specific:
-build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/vmwgfx_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/rules b/debian/rules
index 20fd465..f69251b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -288,11 +288,6 @@ binary-arch: install
dh_installdocs -s
dh_installexamples -s
- # Classic DRI and Gallium DRI are mixed up together here
- # Remove the whole tree to avoid false-positives in --list-missing, and
- # install the right files manually.
- rm -r debian/tmp/dri/usr/lib/$(DEB_HOST_MULTIARCH)/dri
-
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
@@ -303,12 +298,6 @@ binary-arch: install
dh_install -s --fail-missing
-# If the llvmpipe driver was built, copy it to the package dir
-ifneq (,$(filter swrast,$(GALLIUM_DRIVERS)))
- dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/swrast_dri.so \
- usr/lib/${DEB_HOST_MULTIARCH}/dri
-endif
-
dh_installman -s
dh_lintian -s
dh_link -s
--
1.7.10.4
Reply to: