From 3727d736b600096b9a177bec5b8639605ba776ac Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 Dec 2012 13:23:37 +0100 Subject: add (forgotten) files belong to last commit --- .../026_nxcomp_honour-optflags.full+lite.patch | 31 ++++++++++++++++++++++ .../026_nxcompext_honour-optflags.full.patch | 17 ++++++++++++ .../026_nxcompshad_honour-optflags.full.patch | 17 ++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 debian/patches/026_nxcomp_honour-optflags.full+lite.patch create mode 100644 debian/patches/026_nxcompext_honour-optflags.full.patch create mode 100644 debian/patches/026_nxcompshad_honour-optflags.full.patch diff --git a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch b/debian/patches/026_nxcomp_honour-optflags.full+lite.patch new file mode 100644 index 000000000..a2713a1bc --- /dev/null +++ b/debian/patches/026_nxcomp_honour-optflags.full+lite.patch @@ -0,0 +1,31 @@ +Description: Honour compiler/linker option flags +Forwarded: pending +Author: Orion Poplawski +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 new file mode 100644 index 000000000..4d5df3e6b --- /dev/null +++ b/debian/patches/026_nxcompext_honour-optflags.full.patch @@ -0,0 +1,17 @@ +Description: Honour compiler/linker option flags +Forwarded: pending +Author: Orion Poplawski +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 new file mode 100644 index 000000000..ea1d2ad80 --- /dev/null +++ b/debian/patches/026_nxcompshad_honour-optflags.full.patch @@ -0,0 +1,17 @@ +Description: Honour compiler/linker option flags +Forwarded: pending +Author: Orion Poplawski +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. + -- cgit v1.2.3