diff options
| author | Timo Aaltonen <[email protected]> | 2008-07-03 09:31:23 +0300 |
|---|---|---|
| committer | Timo Aaltonen <[email protected]> | 2008-07-03 09:31:23 +0300 |
| commit | 99a35fd4e1002efc0f49f2deb2b3aed5892da02c (patch) | |
| tree | ed834e8a99617c86a8e482d1e3eb7c857898552c /debian | |
| parent | cbaac82c2cf7704203a7eeaa81b02fa6cebba40a (diff) | |
01_fix-libdir.patch: libdir handling is broken in configure.ac, fix it.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/01_fix-libdir.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 2714139de91..9b53749f807 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,10 @@ mesa (7.1~rc1-1) UNRELEASED; urgency=low * rules: Replace the old build system with the new autotools-based system. * Run autoreconf before building the various flavours.. + * 01_fix-libdir.patch: libdir handling is broken in configure.ac, fix + it. - -- Timo Aaltonen <[email protected]> Thu, 03 Jul 2008 00:20:15 +0300 + -- Timo Aaltonen <[email protected]> Thu, 03 Jul 2008 09:30:30 +0300 mesa (7.0.3-4) unstable; urgency=low diff --git a/debian/patches/01_fix-libdir.patch b/debian/patches/01_fix-libdir.patch new file mode 100644 index 00000000000..c041c941dea --- /dev/null +++ b/debian/patches/01_fix-libdir.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index f15d9ff..7de1017 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,7 +64,7 @@ m4_ifdef([PKG_PROG_PKG_CONFIG],[],[ + PKG_PROG_PKG_CONFIG() + + dnl LIB_DIR - library basename +-LIB_DIR=`echo $libdir | $SED 's%.*/%%'` ++LIB_DIR=`echo $libdir | $SED 's%[^/]*/[^/]*/%%'` + AC_SUBST([LIB_DIR]) + + dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later + diff --git a/debian/patches/series b/debian/patches/series index abb18b908ed..fa395b1a4ca 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +01_fix-libdir.patch 02_use-ieee-fp-on-s390-and-m68k.patch 03_optional-progs-and-install.patch |