build with gcc6 again

diff --git a/pvepatches/fix-build-dependencies.patch b/pvepatches/fix-build-dependencies.patch
index b3c4611f8a12ea98b55ccdd2fbb2604695355f23..385d522c0f693e07054d641feffe4bc4985e46f0 100644 (file)
--- a/pvepatches/fix-build-dependencies.patch
+++ b/pvepatches/fix-build-dependencies.patch
@@ -3,25 +3,13 @@ Date: Tue, 18 Oct 2016 11:07:54 +0200
 Subject: [PATCH] fix build dependencies
 
 ---
- debian/control | 5 ++---
- debian/rules   | 4 ++--
- 2 files changed, 4 insertions(+), 5 deletions(-)
+ debian/control | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/debian/control b/debian/control
 index ba596b6..f251da5 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 7.4.2~),
-  po-debconf,
-  help2man,
-  texinfo,
-- gcc-6,
-- gcc-6-multilib [i386 kopensolaris-i386 any-amd64 any-ppc64 any-sparc],
-+ gcc-4.9,
-+ gcc-4.9-multilib [i386 kopensolaris-i386 any-amd64 any-ppc64 any-sparc],
-  xfonts-unifont,
-  libfreetype6-dev,
-  gettext,
 @@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 7.4.2~),
   libgeom-dev (>= 8.2+ds1-1~) [kfreebsd-any] | libgeom-dev (<< 8.2) [kfreebsd-any],
   libsdl1.2-dev [!hurd-any],
@@ -30,28 +18,3 @@ index ba596b6..f251da5 100644
   cpio [i386 kopensolaris-i386 amd64 x32],
   parted [!hurd-any],
   libfuse-dev (>= 2.8.4-1.4) [linux-any kfreebsd-any],
-diff --git a/debian/rules b/debian/rules
-index 8c73042..f4e6e98 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -21,7 +21,7 @@ export HOST_CPPFLAGS
- export HOST_CFLAGS
- export HOST_LDFLAGS
- export TARGET_CPPFLAGS := -Wno-unused-but-set-variable
--export TARGET_LDFLAGS := -no-pie
-+export TARGET_LDFLAGS
- 
- ifeq (,$(shell which qemu-system-i386 2>/dev/null))
- with_check := no
-@@ -29,7 +29,7 @@ else
- with_check := yes
- endif
- 
--CC := gcc-6
-+CC := gcc-4.9
- 
- confflags = \
-       PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version)" \
--- 
-2.1.4
-