diff options
| -rw-r--r-- | configs/debian-dri-default | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/configs/debian-dri-default b/configs/debian-dri-default index 2a01bf8b7e3..b42bfc3378d 100644 --- a/configs/debian-dri-default +++ b/configs/debian-dri-default @@ -22,7 +22,7 @@ DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident ARCH_X86 = i386 amd64 -ifneq ($(findstring $(DEB_BUILD_ARCH), $(ARCH_X86)),) +ifneq ($(filter $(DEB_HOST_ARCH_CPU), $(ARCH_X86)),) DRI_DIRS += i810 i915 i965 sis unichrome endif diff --git a/debian/changelog b/debian/changelog index cf2fd6d86e3..640eb618873 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mesa (7.0.3-7) UNRELEASED; urgency=low * Cherry-pick patch from upstream: Use 3Dnow! x86-64 routines only on processors that support 3Dnow! (closes: #484180). + * Also build the x86-specific dri drivers on kfreebsd (closes: #492894). -- Julien Cristau <jcristau@debian.org> Sun, 26 Oct 2008 15:27:10 +0100 diff --git a/debian/rules b/debian/rules index 3d00bb72401..6a66df11aee 100755 --- a/debian/rules +++ b/debian/rules @@ -22,9 +22,11 @@ endif DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_BUILD_DIR ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE) export DEB_BUILD_ARCH +export DEB_HOST_ARCH_CPU # choose which configurations to build SWX11_GLU_CONFIGS = |