File: c%2B%2B14.patch

package info (click to toggle)
mothur 1.48.5-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 13,676 kB
  • sloc: cpp: 161,854; makefile: 119; sh: 31
file content (40 lines) | stat: -rw-r--r-- 1,339 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
From: Debian Med Packaging Team
 <debian-med-packaging@lists.alioth.debian.org>
Date: Sun, 2 Jun 2024 10:20:18 +0200
Subject: uchime code does not fit c++17 standard - use c++14

also, make sure the CXXFLAGS are appended, see also
https://docs-archive.freebsd.org/doc/10.3-RELEASE/usr/local/share/doc/freebsd/en/books/porters-handbook/dads-cflags.html

Bug-Debian: https://bugs.debian.org/984243
Last-Update: Thu, 21 Oct 2021 11:22:32 +0200
Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984243#33
---
 source/uchime_src/makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/uchime_src/makefile b/source/uchime_src/makefile
index 61f9913..cd1cdd9 100644
--- a/source/uchime_src/makefile
+++ b/source/uchime_src/makefile
@@ -1,5 +1,4 @@
-CXXFLAGS = -O3 -std=c++11 -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 -DUCHIMES=1 -std=c++11
-LDFLAGS = -g
+CXXFLAGS += -O3 -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 -DUCHIMES=1 -std=c++14
 
 #
 # Get the list of all .cpp files, rename to .o files
@@ -10,7 +9,7 @@ LDFLAGS = -g
     OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
 
 uchime : $(OBJECTS)
-	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
 
 install : uchime
 
@@ -26,4 +25,3 @@ install : uchime
 
 clean :
 	@rm -f $(OBJECTS)
-