summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2007-02-07 23:13:59 +0100
committerJulien Cristau <jcristau@debian.org>2007-02-07 23:13:59 +0100
commitd39147a8a192d56798737cd254353546be2d2dbb (patch)
tree50555c2fdfcf60892a7e7c80676bb347efdfe81a
parent7991f7e9366bf82adffd3d0d4761f1eebd3997d9 (diff)
Fix FTBFS on amd64.mesa-6.5.2-3
Set LIB_DIR and EXTRA_LIB_PATH in configs/debian-default to override settings in configs/linux-x86-64. This fixes a FTBFS on amd64, thanks to Marc 'HE' Brockschmidt for the report (closes: #410118).
-rw-r--r--configs/debian-default4
-rw-r--r--debian/changelog8
2 files changed, 12 insertions, 0 deletions
diff --git a/configs/debian-default b/configs/debian-default
index d13e5513fef..aa4721a9ee4 100644
--- a/configs/debian-default
+++ b/configs/debian-default
@@ -5,6 +5,10 @@ CONFIG_NAME = debian-default
OPT_FLAGS = -O2 -g
CFLAGS += -fno-strict-aliasing
+# override settings in configs/linux-x86-64
+LIB_DIR = lib
+EXTRA_LIB_PATH =
+
SRC_DIRS = mesa
PROGRAM_DIRS =
diff --git a/debian/changelog b/debian/changelog
index 9744a89783c..e9446fec73f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (6.5.2-3) experimental; urgency=low
+
+ * Set LIB_DIR and EXTRA_LIB_PATH in configs/debian-default to override
+ settings in configs/linux-x86-64. This fixes a FTBFS on amd64, thanks to
+ Marc 'HE' Brockschmidt for the report (closes: #410118).
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 7 Feb 2007 23:04:28 +0100
+
mesa (6.5.2-2) experimental; urgency=low
* Sync Section/Priority for all packages with the override.