diff -Nru olsrd-0.6.6.2/debian/changelog olsrd-0.6.6.2/debian/changelog --- olsrd-0.6.6.2/debian/changelog 2014-06-08 19:03:09.000000000 +0000 +++ olsrd-0.6.6.2/debian/changelog 2014-09-11 13:04:59.000000000 +0000 @@ -1,3 +1,9 @@ +olsrd (0.6.6.2-1ubuntu1) utopic; urgency=medium + + * Build using -fPIC everywhere except on ix86. + + -- Matthias Klose Thu, 11 Sep 2014 15:04:29 +0200 + olsrd (0.6.6.2-1) unstable; urgency=medium * New upstream release diff -Nru olsrd-0.6.6.2/debian/patches/111-build-mips-and-armhf.patch olsrd-0.6.6.2/debian/patches/111-build-mips-and-armhf.patch --- olsrd-0.6.6.2/debian/patches/111-build-mips-and-armhf.patch 2013-10-25 18:30:47.000000000 +0000 +++ olsrd-0.6.6.2/debian/patches/111-build-mips-and-armhf.patch 2014-09-11 13:04:26.000000000 +0000 @@ -2,14 +2,16 @@ make/Makefile.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- olsrd-0.6.6.1.orig/make/Makefile.linux -+++ olsrd-0.6.6.1/make/Makefile.linux +Index: b/make/Makefile.linux +=================================================================== +--- a/make/Makefile.linux ++++ b/make/Makefile.linux @@ -39,7 +39,7 @@ UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN ifdef OLSRD_PLUGIN GENERATE_PIC = true endif -ifeq ($(filter-out mips mips64 alpha x86_64 parisc64 ia64, $(ARCH)),) -+ifeq ($(filter-out armv7l mips mips64 alpha x86_64 parisc64 ia64, $(ARCH)),) ++ifeq (,$(filter $(ARCH), i386 i486 i586 i686)) GENERATE_PIC = true endif