aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-12-12 13:23:37 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-12-12 13:23:37 +0100
commit3727d736b600096b9a177bec5b8639605ba776ac (patch)
treed5cffd9a5c905f035b367a30eedf2258b6869f03
parent923b7c7eb08520622becfa86389abc2a45e771b7 (diff)
downloadnx-libs-3727d736b600096b9a177bec5b8639605ba776ac.tar.gz
nx-libs-3727d736b600096b9a177bec5b8639605ba776ac.tar.bz2
nx-libs-3727d736b600096b9a177bec5b8639605ba776ac.zip
add (forgotten) files belong to last commit
-rw-r--r--debian/patches/026_nxcomp_honour-optflags.full+lite.patch31
-rw-r--r--debian/patches/026_nxcompext_honour-optflags.full.patch17
-rw-r--r--debian/patches/026_nxcompshad_honour-optflags.full.patch17
3 files changed, 65 insertions, 0 deletions
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 <orion@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
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 <orion@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
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 <orion@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.
+