summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2013-04-11 19:56:04 +0200
committerTreeve Jelbert2013-04-13 10:50:15 +0200
commitfd21b828da498426fef8043986550adb2107e5eb (patch)
tree3bca0ed3c4c00c5f95a5efd21a6a031a8231693c
parent5a28a027018269ea3bd290510b15426dd0db3f10 (diff)
x11/nxcomp: enforce CXXFLAGS
-rw-r--r--x11/nxcomp/0001-respect-CXXFLAGS.patch26
-rwxr-xr-xx11/nxcomp/DEPENDS3
-rw-r--r--x11/nxcomp/HISTORY4
-rwxr-xr-xx11/nxcomp/PRE_BUILD3
4 files changed, 34 insertions, 2 deletions
diff --git a/x11/nxcomp/0001-respect-CXXFLAGS.patch b/x11/nxcomp/0001-respect-CXXFLAGS.patch
new file mode 100644
index 0000000000..49458591c9
--- /dev/null
+++ b/x11/nxcomp/0001-respect-CXXFLAGS.patch
@@ -0,0 +1,26 @@
+From 5993fd4c4fa70b31525924322f031dd1039033d1 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Tue, 9 Apr 2013 18:49:58 +0200
+Subject: [PATCH] respect CXXFLAGS
+
+---
+ configure.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e9ab81d..e102c2a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -7,8 +7,7 @@ AC_PREREQ(2.13)
+
+ dnl Set our default compilation flags.
+
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="${CXXFLAGS} -fno-rtti -fno-exceptions"
+
+ dnl Reset default linking directives.
+
+--
+1.8.2
+
diff --git a/x11/nxcomp/DEPENDS b/x11/nxcomp/DEPENDS
index ccc6b114b7..c5aeb36aea 100755
--- a/x11/nxcomp/DEPENDS
+++ b/x11/nxcomp/DEPENDS
@@ -1,4 +1,5 @@
depends JPEG &&
depends libpng &&
depends -sub CXX gcc &&
-depends X11-SERVER
+depends X11-SERVER &&
+depends autoconf
diff --git a/x11/nxcomp/HISTORY b/x11/nxcomp/HISTORY
index a4e155d369..4348b3895a 100644
--- a/x11/nxcomp/HISTORY
+++ b/x11/nxcomp/HISTORY
@@ -1,3 +1,7 @@
+2013-04-11 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-respect-CXXFLAGS.patch: force the spell
+ to respect CXXFLAGS
+
2013-04-09 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 3.5.0-2
diff --git a/x11/nxcomp/PRE_BUILD b/x11/nxcomp/PRE_BUILD
index a98ca9e931..fd366d56cc 100755
--- a/x11/nxcomp/PRE_BUILD
+++ b/x11/nxcomp/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SCRIPT_DIRECTORY/Loop.cpp.diff
+patch -p1 < $SPELL_DIRECTORY/0001-respect-CXXFLAGS.patch &&
+autoreconf -fi