[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1893-g504e0b5

[Markus Gothe]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  504e0b5f66794c44b5eda87be851ba63ce42f6c0 (commit)
       via  4afcb112e2fdc9be3d12f31317a7db29facec2ed (commit)
      from  090deffef2431a40846cb672ba5524eb02eacf80 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=504e0b5f66794c44b5eda87be851ba63ce42f6c0


commit 504e0b5f66794c44b5eda87be851ba63ce42f6c0
Merge: 4afcb11 090deff
Author: Markus Gothe <address@hidden>
Date:   Mon Apr 21 20:55:55 2014 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=4afcb112e2fdc9be3d12f31317a7db29facec2ed


commit 4afcb112e2fdc9be3d12f31317a7db29facec2ed
Author: Markus Gothe <address@hidden>
Date:   Mon Apr 21 20:49:05 2014 +0200

    Check if compiling on Darwin, IFF then assume it is Apple's ld.

diff --git a/configure.ac b/configure.ac
index 0d580a7..55836f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2885,7 +2885,11 @@ if test x"$harden" = x"yes" -a x"${host_cpu}" != mips -a 
x"${android}" != xyes;
     CPPFLAGS="${CPPFLAGS} -D_FORTIFY_SOURCE=2"
     CFLAGS="${CFLAGS} -fPIE -fstack-protector --param ssp-buffer-size=4 
-Wformat -Werror=format-security"
     CXXFLAGS="${CXXFLAGS} -fPIE -fstack-protector --param ssp-buffer-size=4 
-Wformat -Werror=format-security"
-    LDFLAGS="${LDFLAGS} -fPIE -pie -Wl,-z,relro -Wl,-z,now"
+       if test x"$darwin" = x"yes"; then
+               LDFLAGS="${LDFLAGS} -fPIE -pie"
+       else
+               LDFLAGS="${LDFLAGS} -fPIE -pie -Wl,-z,relro -Wl,-z,now"
+       fi
 fi
 
 dnl Define convenience constants so Gnash can print out the

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash