[X2Go-Commits] [nx-libs] 18/29: Honour compiler/linker option flags.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 3384aba386c44ec26d3f131b897f77da440324d7
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Feb 9 15:22:07 2015 +0100

    Honour compiler/linker option flags.
    
     026_nxcompext_honour-optflags.full.patch
     026_nxcomp_honour-optflags.full+lite.patch
     026_nxcompshad_honour-optflags.full.patch
---
 .../026_nxcomp_honour-optflags.full+lite.patch     |   31 --------------------
 .../026_nxcompext_honour-optflags.full.patch       |   17 -----------
 .../026_nxcompshad_honour-optflags.full.patch      |   17 -----------
 debian/patches/series                              |    3 --
 nxcomp/configure.in                                |    4 +--
 nxcompext/configure.in                             |    4 +--
 nxcompshad/configure.in                            |    4 +--
 nxproxy/configure.in                               |    4 +--
 8 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch b/debian/patches/026_nxcomp_honour-optflags.full+lite.patch
deleted file mode 100644
index a2713a1..0000000
--- a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Honour compiler/linker option flags
-Forwarded: pending
-Author: Orion Poplawski <orion at cora.nwra.com>
-diff -up a/nxcomp/configure.in b/nxcomp/configure.in
---- a/nxcomp/configure.in	2012-11-10 06:40:55.000000000 -0700
-+++ b/nxcomp/configure.in	2012-12-11 13:13:19.390229196 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Set our default compilation flags.
- 
--CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
-+CFLAGS="$CFLAGS -O3"
- 
- dnl Reset default linking directives.
- 
-diff -up a/nxproxy/configure.in b/nxproxy/configure.in
---- a/nxproxy/configure.in	2012-11-10 06:40:55.000000000 -0700
-+++ b/nxproxy/configure.in	2012-12-11 13:16:19.955301045 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Reset default compilation flags.
- 
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3"
-+CPPFLAGS="$CPPFLAGS -O3"
- 
- dnl Prefer headers and libraries from nx-X11 if present.
- 
diff --git a/debian/patches/026_nxcompext_honour-optflags.full.patch b/debian/patches/026_nxcompext_honour-optflags.full.patch
deleted file mode 100644
index 4d5df3e..0000000
--- a/debian/patches/026_nxcompext_honour-optflags.full.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Honour compiler/linker option flags
-Forwarded: pending
-Author: Orion Poplawski <orion at cora.nwra.com>
-diff -up a/nxcompext/configure.in b/nxcompext/configure.in
---- a/nxcompext/configure.in	2012-11-10 06:40:55.000000000 -0700
-+++ b/nxcompext/configure.in	2012-12-11 13:15:26.712576302 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Reset default compilation flags.
- 
--CXXFLAGS="-O3"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3"
-+CFLAGS="$CFLAGS -O3"
- 
- dnl Reset default linking directives.
- 
diff --git a/debian/patches/026_nxcompshad_honour-optflags.full.patch b/debian/patches/026_nxcompshad_honour-optflags.full.patch
deleted file mode 100644
index ea1d2ad..0000000
--- a/debian/patches/026_nxcompshad_honour-optflags.full.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Honour compiler/linker option flags
-Forwarded: pending
-Author: Orion Poplawski <orion at cora.nwra.com>
-diff -up a/nxcompshad/configure.in b/nxcompshad/configure.in
---- a/nxcompshad/configure.in	2012-11-10 06:40:56.000000000 -0700
-+++ b/nxcompshad/configure.in	2012-12-11 13:13:25.915196300 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Reset default compilation flags.
- 
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3"
-+CPPFLAGS="$CPPFLAGS -O3"
- 
- dnl Reset default linking directives.
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6eadd7b..ca6b6dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-026_nxcompext_honour-optflags.full.patch
-026_nxcomp_honour-optflags.full+lite.patch
-026_nxcompshad_honour-optflags.full.patch
 027_nxcomp_abstract-X11-socket.full+lite.patch
 028_nx-X11_abstract-kernel-sockets.full.patch
 029_nxcomp_ppc64.full+lite.patch
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index e9ab81d..6fa9757 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Set our default compilation flags.
 
-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
-CFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
+CFLAGS="$CFLAGS -O3"
 
 dnl Reset default linking directives.
 
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index fe5abf7..08c48a7 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CFLAGS="$CFLAGS -O3"
 
 dnl Reset default linking directives.
 
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index f0bdecd..13149b3 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CPPFLAGS="$CPPFLAGS -O3"
 
 dnl Reset default linking directives.
 
diff --git a/nxproxy/configure.in b/nxproxy/configure.in
index bd930f1..b86828d 100644
--- a/nxproxy/configure.in
+++ b/nxproxy/configure.in
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CPPFLAGS="$CPPFLAGS -O3"
 
 dnl Prefer headers and libraries from nx-X11 if present.
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git