From 69f4052300e7c4209c2ec80c5aeead3426b194ad Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Sun, 2 Feb 2025 18:54:16 -0500
Subject: [PATCH] Revert "Move to c++17 for pqxx"
This reverts commit 155df79c89cdec88aed5cb0d62d445789921cee3.
---
irdb-libs/dump_insns/SConscript | 2 +-
irdb-libs/dump_map/SConscript | 2 +-
irdb-libs/ir_builders/SConscript | 2 +-
irdb-libs/libEXEIO/src/SConscript | 2 +-
irdb-libs/libEXEIO/test/SConscript | 2 +-
irdb-libs/libIRDB-cfg/src/SConscript | 2 +-
irdb-libs/libIRDB-core/src/SConscript | 2 +-
irdb-libs/libIRDB-deep/src/SConscript | 2 +-
irdb-libs/libIRDB-elfdep/src/SConscript | 2 +-
irdb-libs/libIRDB-elfdep/test/SConscript | 2 +-
irdb-libs/libIRDB-syscall/src/SConscript | 2 +-
irdb-libs/libIRDB-transform/src/SConscript | 2 +-
irdb-libs/libIRDB-util/src/SConscript | 2 +-
irdb-libs/libMEDSannotation/SConscript | 2 +-
irdb-libs/meds2pdb/SConscript | 2 +-
irdb-libs/thanos/SConscript | 2 +-
zipr_push64_reloc_plugin/SConscript | 2 +-
zipr_unpin_plugin/SConscript | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/irdb-libs/dump_insns/SConscript b/irdb-libs/dump_insns/SConscript
index 08948a1cc..bdd98d4d4 100644
--- a/irdb-libs/dump_insns/SConscript
+++ b/irdb-libs/dump_insns/SConscript
@@ -13,7 +13,7 @@ cpppath='''
files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
-myenv.Append(CPPFLAGS="-std=c++17")
+myenv.Append(CPPFLAGS="-std=c++14")
pgm="dump_insns.exe"
diff --git a/irdb-libs/dump_map/SConscript b/irdb-libs/dump_map/SConscript
index 9515e0384..31f7ac41b 100644
--- a/irdb-libs/dump_map/SConscript
+++ b/irdb-libs/dump_map/SConscript
@@ -11,7 +11,7 @@ cpppath='''
$IRDB_SDK/include
'''
-myenv.Append(CPPFLAGS="-std=c++17")
+myenv.Append(CPPFLAGS="-std=c++14")
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
LIBS=Split( " irdb-core irdb-cfg irdb-util irdb-transform ")
diff --git a/irdb-libs/ir_builders/SConscript b/irdb-libs/ir_builders/SConscript
index 42780e7cf..158efa768 100644
--- a/irdb-libs/ir_builders/SConscript
+++ b/irdb-libs/ir_builders/SConscript
@@ -24,7 +24,7 @@ if 'build_tools' not in myenv or myenv['build_tools'] is None or int(myenv['buil
myenv=myenv.Clone(CPPPATH=Split(cpppath))
- myenv.Append(CCFLAGS=" -std=c++17 -Wall")
+ myenv.Append(CCFLAGS=" -std=c++14 -Wall")
ehframe=myenv.SharedObject("read_ehframe.cpp");
split_eh_frame=myenv.SharedObject("split_eh_frame.cpp");
diff --git a/irdb-libs/libEXEIO/src/SConscript b/irdb-libs/libEXEIO/src/SConscript
index 2ae3a0b0a..8655f2860 100644
--- a/irdb-libs/libEXEIO/src/SConscript
+++ b/irdb-libs/libEXEIO/src/SConscript
@@ -20,7 +20,7 @@ cpppath='''
myenv=myenv.Clone(CPPPATH=Split(cpppath))
-myenv.Append(CXXFLAGS=" -std=c++17 -Wall -Werror ")
+myenv.Append(CXXFLAGS=" -std=c++14 -Wall -Werror ")
lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core pebliss"), LIBPATH="$SECURITY_TRANSFORMS_HOME/lib" )
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/irdb-libs/libEXEIO/test/SConscript b/irdb-libs/libEXEIO/test/SConscript
index 3df481f7b..e2df64a61 100644
--- a/irdb-libs/libEXEIO/test/SConscript
+++ b/irdb-libs/libEXEIO/test/SConscript
@@ -30,7 +30,7 @@ if "CYGWIN" in sysname:
libs = libs + " iconv"
myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath))
-myenv.Append(CXXFLAGS=" -Wall -Werror -std=c++17 ")
+myenv.Append(CXXFLAGS=" -Wall -Werror -std=c++14 ")
pgm=myenv.Program(libname, Split(files))
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/irdb-libs/libIRDB-cfg/src/SConscript b/irdb-libs/libIRDB-cfg/src/SConscript
index 2ef427576..0192688f5 100644
--- a/irdb-libs/libIRDB-cfg/src/SConscript
+++ b/irdb-libs/libIRDB-cfg/src/SConscript
@@ -21,7 +21,7 @@ libpath='''
$SECURITY_TRANSFORMS_HOME/lib
'''
-myenv.Append(CCFLAGS=" -Wall -std=c++17 -fmax-errors=2 ")
+myenv.Append(CCFLAGS=" -Wall -std=c++14 -fmax-errors=2 ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core"), LIBPATH=Split(libpath))
diff --git a/irdb-libs/libIRDB-core/src/SConscript b/irdb-libs/libIRDB-core/src/SConscript
index a62e70443..de6379524 100644
--- a/irdb-libs/libIRDB-core/src/SConscript
+++ b/irdb-libs/libIRDB-core/src/SConscript
@@ -56,7 +56,7 @@ libpath='''
$SECURITY_TRANSFORMS_HOME/lib
'''
-myenv.Append(CCFLAGS=" -Wall -std=c++17 -fmax-errors=2")
+myenv.Append(CCFLAGS=" -Wall -std=c++14 -fmax-errors=2")
myenv.Append(LIBPATH=libpath)
myenv=myenv.Clone(CPPPATH=Split(cpppath))
diff --git a/irdb-libs/libIRDB-deep/src/SConscript b/irdb-libs/libIRDB-deep/src/SConscript
index d980c8b97..86998c6ce 100644
--- a/irdb-libs/libIRDB-deep/src/SConscript
+++ b/irdb-libs/libIRDB-deep/src/SConscript
@@ -20,7 +20,7 @@ cpppath='''
#myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
-myenv.Append(CXXFLAGS = " -std=c++17 ")
+myenv.Append(CXXFLAGS = " -std=c++14 ")
lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core irdb-util irdb-transform stars MEDSannotation"), LIBPATH=Split("$SECURITY_TRANSFORMS_HOME/lib"))
install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/irdb-libs/libIRDB-elfdep/src/SConscript b/irdb-libs/libIRDB-elfdep/src/SConscript
index 635b6075a..86fb9c1a4 100644
--- a/irdb-libs/libIRDB-elfdep/src/SConscript
+++ b/irdb-libs/libIRDB-elfdep/src/SConscript
@@ -20,7 +20,7 @@ LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
LIBS=Split("irdb-core irdb-transform")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
-myenv.Append(CXXFLAGS = " -std=c++17 ")
+myenv.Append(CXXFLAGS = " -std=c++14 ")
lib=myenv.SharedLibrary("irdb-elfdep", Split(files), LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/irdb-libs/libIRDB-elfdep/test/SConscript b/irdb-libs/libIRDB-elfdep/test/SConscript
index 38e873618..ebd9ea15e 100644
--- a/irdb-libs/libIRDB-elfdep/test/SConscript
+++ b/irdb-libs/libIRDB-elfdep/test/SConscript
@@ -11,7 +11,7 @@ myenv.Replace(ZIPR_HOME=os.environ['ZIPR_HOME'])
myenv.Replace(ZIPR_SDK=os.environ['ZIPR_SDK'])
myenv.Replace(IRDB_SDK=os.environ['IRDB_SDK'])
-myenv.Replace(CXXFLAGS = " -g -std=c++17 -Wall ")
+myenv.Replace(CXXFLAGS = " -g -std=c++14 -Wall ")
myenv.Append(LINKFLAGS = " -Wl,-unresolved-symbols=ignore-in-shared-libs ")
cpppath='''
diff --git a/irdb-libs/libIRDB-syscall/src/SConscript b/irdb-libs/libIRDB-syscall/src/SConscript
index f81c2c557..477712163 100644
--- a/irdb-libs/libIRDB-syscall/src/SConscript
+++ b/irdb-libs/libIRDB-syscall/src/SConscript
@@ -18,7 +18,7 @@ cpppath='''
#myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
-myenv.Append(CXXFLAGS = " -std=c++17 ")
+myenv.Append(CXXFLAGS = " -std=c++14 ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
diff --git a/irdb-libs/libIRDB-transform/src/SConscript b/irdb-libs/libIRDB-transform/src/SConscript
index 49ae10447..0bc204784 100644
--- a/irdb-libs/libIRDB-transform/src/SConscript
+++ b/irdb-libs/libIRDB-transform/src/SConscript
@@ -24,7 +24,7 @@ LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
LIBS=Split("irdb-core irdb-cfg irdb-util MEDSannotation capstone keystone")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
-myenv.Append(CXXFLAGS = " -std=c++17 ")
+myenv.Append(CXXFLAGS = " -std=c++14 ")
lib=myenv.SharedLibrary("irdb-transform", Split(files), LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/irdb-libs/libIRDB-util/src/SConscript b/irdb-libs/libIRDB-util/src/SConscript
index 1669589c1..c0bfa55ec 100644
--- a/irdb-libs/libIRDB-util/src/SConscript
+++ b/irdb-libs/libIRDB-util/src/SConscript
@@ -22,7 +22,7 @@ cpppath='''
#myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
-myenv.Append(CXXFLAGS = " -std=c++17 ")
+myenv.Append(CXXFLAGS = " -std=c++14 ")
lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core"), LIBPATH=Split("$SECURITY_TRANSFORMS_HOME/lib"))
install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/irdb-libs/libMEDSannotation/SConscript b/irdb-libs/libMEDSannotation/SConscript
index c93d70e1d..f250ef67d 100644
--- a/irdb-libs/libMEDSannotation/SConscript
+++ b/irdb-libs/libMEDSannotation/SConscript
@@ -29,7 +29,7 @@ cpppath='''
#CFLAGS="-fPIC "
myenv=myenv.Clone(CPPPATH=Split(cpppath))
-myenv.Append(CXXFLAGS=" -std=c++17 -Wall -Werror ")
+myenv.Append(CXXFLAGS=" -std=c++14 -Wall -Werror ")
lib=myenv.SharedLibrary(lib, Split(files))
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/irdb-libs/meds2pdb/SConscript b/irdb-libs/meds2pdb/SConscript
index d3885fd3b..d830c12a0 100644
--- a/irdb-libs/meds2pdb/SConscript
+++ b/irdb-libs/meds2pdb/SConscript
@@ -19,7 +19,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp") + Glob(Dir('.').srcnode().abspa
pgm="meds2pdb"
-myenv.Append(CXXFLAGS = " -std=c++17 ")
+myenv.Append(CXXFLAGS = " -std=c++14 ")
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
LIBS=Split(" irdb-cfg irdb-util irdb-transform EXEIO MEDSannotation pqxx "+env.subst('$BASE_IRDB_LIBS'))
myenv=myenv.Clone(CPPPATH=Split(cpppath))
diff --git a/irdb-libs/thanos/SConscript b/irdb-libs/thanos/SConscript
index 5e9935985..99bf343a6 100644
--- a/irdb-libs/thanos/SConscript
+++ b/irdb-libs/thanos/SConscript
@@ -14,7 +14,7 @@ cpppath='''
files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
-myenv.Append(CXXFLAGS = " -std=c++17 -Wall ")
+myenv.Append(CXXFLAGS = " -std=c++14 -Wall ")
pgm="thanos.exe"
diff --git a/zipr_push64_reloc_plugin/SConscript b/zipr_push64_reloc_plugin/SConscript
index 3244ef07b..51ddc4029 100644
--- a/zipr_push64_reloc_plugin/SConscript
+++ b/zipr_push64_reloc_plugin/SConscript
@@ -48,7 +48,7 @@ libpath='''
if sysname != "SunOS":
myenv.Append(CCFLAGS=" -Wall -Werror -fmax-errors=2")
-myenv.Append(CXXFLAGS=" -std=c++17 ")
+myenv.Append(CXXFLAGS=" -std=c++14 ")
myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath), SHLIBSUFFIX=".zpi", SHLIBPREFIX="")
lib=myenv.SharedLibrary("push64_relocs", Split(files))
diff --git a/zipr_unpin_plugin/SConscript b/zipr_unpin_plugin/SConscript
index ca757d073..ce5a25432 100644
--- a/zipr_unpin_plugin/SConscript
+++ b/zipr_unpin_plugin/SConscript
@@ -50,7 +50,7 @@ libpath='''
if sysname != "SunOS":
myenv.Append(CCFLAGS=" -Wall -Werror -fmax-errors=2")
-myenv.Append(CXXFLAGS=" -std=c++17 ")
+myenv.Append(CXXFLAGS=" -std=c++14 ")
myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath), SHLIBSUFFIX=".zpi", SHLIBPREFIX="")
lib=myenv.SharedLibrary("unpin", Split(files))
--
GitLab