From 6e2cca2158b0a2650bbd5c70bf02b979020afa88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krystian=20Bac=C5=82awski?= <krystian.baclawski@gmail.com>
Date: Sun, 25 May 2014 21:35:37 +0200
Subject: [PATCH] Don't use '-D' flag for install (GNU extension).

---
 bootstrap.sh                        |  9 +++++----
 patches/fd2sfd-1.0/Makefile.in.diff | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 02efb87..f2d82bd 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -543,10 +543,13 @@ function build {
     ARCH="-m32"
   fi
 
+  # Take over the path -- to preserve hermetic build. 
+  export PATH="/usr/bin:/bin:/usr/local/bin:/opt/local/bin"
+
   # Make sure we always choose known compiler (from the distro) and not one
   # in user's path that could shadow the original one.
-  CC="$(which gcc)"
-  CXX="$(which g++)"
+  CC="$(which gcc) -std=gnu89"
+  CXX="$(which g++) -std=gnu++98"
 
   # Define extra options for gcc's configure script.
   if [ "${VERSION}" != "4" ]; then
@@ -564,8 +567,6 @@ function build {
                          "--disable-shared")
   fi
 
-  # Take over the path -- to preserve hermetic build. 
-  export PATH="/opt/local/bin:/usr/local/bin:/usr/bin:/bin"
   export CC CXX
 
   readonly FLAGS_FOR_TARGET=( \
diff --git a/patches/fd2sfd-1.0/Makefile.in.diff b/patches/fd2sfd-1.0/Makefile.in.diff
index e9b2b54..c1b09e0 100644
--- a/patches/fd2sfd-1.0/Makefile.in.diff
+++ b/patches/fd2sfd-1.0/Makefile.in.diff
@@ -1,7 +1,15 @@
---- fd2sfd-1.0/Makefile.in.orig	2014-01-02 21:21:41.000000000 +0100
-+++ fd2sfd-1.0/Makefile.in	2014-01-02 21:23:12.000000000 +0100
-@@ -45,45 +45,6 @@
- 	  $(INSTALL_DATA) -D $(srcdir)/cross/share/$${f} $(fd2sfddir)/$${f}; \
+--- fd2sfd-1.0/Makefile.in.orig	2003-07-31 08:10:19.000000000 +0200
++++ fd2sfd-1.0/Makefile.in	2014-05-25 20:46:57.000000000 +0200
+@@ -40,50 +40,12 @@
+ 
+ 	# Install tools
+ 	$(INSTALL_PROGRAM) $(EXECUTABLE) $(bindir)
+-	$(INSTALL_PROGRAM) cross/bin/gg-fix-includes $(bindir)
++	$(INSTALL_DATA) cross/bin/gg-fix-includes $(bindir)
+ 	for f in `cd $(srcdir)/cross/share/ && find * -type f`; do \
+-	  $(INSTALL_DATA) -D $(srcdir)/cross/share/$${f} $(fd2sfddir)/$${f}; \
++	  mkdir -p `dirname $(fd2sfddir)/$${f}`; \
++	  $(INSTALL_DATA) $(srcdir)/cross/share/$${f} `dirname $(fd2sfddir)/$${f}`; \
  	done
  
 -	# Install example file structure for FDs