-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160
Package: encfs
Version: 1.7.4-3
Control: tag -1 patch
Hi,
Here's a patch with a workaround for the output of `DEB_HOST_GNU_TYPE`
that's making encfs FTBFS on `linux-i386` and `kfreebsd-i386` since
1.7.4-3.
The output is `i486-linux-gnu` which do not match with
`/usr/lib/i386-linux-gnu` that `--with-libboost-dir` expects during
the `./configure`.
Kind regards.
- --
Jose Luis Rivas - @ghostbar
The Debian Project
GPG: 0xCACAB118
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iEYEAREDAAYFAlNZ8jwACgkQOKCtW8rKsRhaLwCfeCxqA9B/diJFiVvh7jYOtcaZ
sCwAoJnhxefjTe77bNCPtuK+LpJ7lBbJ
=1W7V
-----END PGP SIGNATURE-----
From: Jose Luis Rivas <ghost...@debian.org>
Date: Thu, 24 Apr 2014 22:06:21 -0700
Subject: [PATCH] Using MOD_ARCH instead of DEB_HOST_GNU_TYPE
DEB_HOST_GNU_TYPE on i386 architectures shows `i486-linux-gnu` or
`i486-kfreebsd-gnu` while configure is expecting `i386-linux-gnu` or
`i486-kfreebsd-gnu` which makes it break when loading the Boost library
during the `./configure` with `--with-boost-libdir`. Using MOD_ARCH
catches this input checking if DEB_HOST_GNU_CPU is `i486` and converting
it then to `i386` while bypassing the other types.
---
debian/rules | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index 3255b55..bf6c939 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,12 @@ else
CFLAGS += -O2
endif
+ifeq ($(DEB_HOST_GNU_CPU),i486)
+ MOD_ARCH = i386
+else
+ MOD_ARCH = $(DEB_HOST_GNU_CPU)
+endif
+
export CFLAGS
export LDFLAGS
@@ -31,7 +37,7 @@ config.status: configure
dh_testdir
# Add here commands to configure the package.
#-autoreconf -fi
- ./configure $(CONFARG) || ./configure $(CONFARG)
--with-boost-libdir=/usr/lib/$(DEB_HOST_GNU_TYPE)
+ ./configure $(CONFARG) || ./configure $(CONFARG)
--with-boost-libdir=/usr/lib/$(MOD_ARCH)-$(DEB_HOST_GNU_SYSTEM)
touch config.status
build: build-stamp
@@ -49,7 +55,7 @@ clean:
dh_testdir
dh_testroot
rm -f build-stamp
- ./configure $(CONFARG) || ./configure $(CONFARG)
--with-boost-libdir=/usr/lib/$(DEB_HOST_GNU_TYPE)
+ ./configure $(CONFARG) || ./configure $(CONFARG)
--with-boost-libdir=/usr/lib/$(MOD_ARCH)-$(DEB_HOST_GNU_SYSTEM)
$(MAKE) distclean || true
-rm -f config.log
#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
--
2.0.0.rc0
