Skip to content
Snippets Groups Projects
Commit 155df79c authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

Move to c++17 for pqxx

parent 757f261d
No related branches found
No related tags found
1 merge request!48hope ubutnu24 just works
Pipeline #31020 failed
Showing
with 18 additions and 18 deletions
...@@ -13,7 +13,7 @@ cpppath=''' ...@@ -13,7 +13,7 @@ cpppath='''
files=Glob( Dir('.').srcnode().abspath+"/*.cpp") files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
myenv.Append(CPPFLAGS="-std=c++14") myenv.Append(CPPFLAGS="-std=c++17")
pgm="dump_insns.exe" pgm="dump_insns.exe"
......
...@@ -11,7 +11,7 @@ cpppath=''' ...@@ -11,7 +11,7 @@ cpppath='''
$IRDB_SDK/include $IRDB_SDK/include
''' '''
myenv.Append(CPPFLAGS="-std=c++14") myenv.Append(CPPFLAGS="-std=c++17")
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib" LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
LIBS=Split( " irdb-core irdb-cfg irdb-util irdb-transform ") LIBS=Split( " irdb-core irdb-cfg irdb-util irdb-transform ")
......
...@@ -24,7 +24,7 @@ if 'build_tools' not in myenv or myenv['build_tools'] is None or int(myenv['buil ...@@ -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=myenv.Clone(CPPPATH=Split(cpppath))
myenv.Append(CCFLAGS=" -std=c++14 -Wall") myenv.Append(CCFLAGS=" -std=c++17 -Wall")
ehframe=myenv.SharedObject("read_ehframe.cpp"); ehframe=myenv.SharedObject("read_ehframe.cpp");
split_eh_frame=myenv.SharedObject("split_eh_frame.cpp"); split_eh_frame=myenv.SharedObject("split_eh_frame.cpp");
......
...@@ -20,7 +20,7 @@ cpppath=''' ...@@ -20,7 +20,7 @@ cpppath='''
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
myenv.Append(CXXFLAGS=" -std=c++14 -Wall -Werror ") myenv.Append(CXXFLAGS=" -std=c++17 -Wall -Werror ")
lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core pebliss"), LIBPATH="$SECURITY_TRANSFORMS_HOME/lib" ) lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core pebliss"), LIBPATH="$SECURITY_TRANSFORMS_HOME/lib" )
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib) install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
......
...@@ -30,7 +30,7 @@ if "CYGWIN" in sysname: ...@@ -30,7 +30,7 @@ if "CYGWIN" in sysname:
libs = libs + " iconv" libs = libs + " iconv"
myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath)) myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath))
myenv.Append(CXXFLAGS=" -Wall -Werror -std=c++14 ") myenv.Append(CXXFLAGS=" -Wall -Werror -std=c++17 ")
pgm=myenv.Program(libname, Split(files)) pgm=myenv.Program(libname, Split(files))
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm) install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
......
...@@ -21,7 +21,7 @@ libpath=''' ...@@ -21,7 +21,7 @@ libpath='''
$SECURITY_TRANSFORMS_HOME/lib $SECURITY_TRANSFORMS_HOME/lib
''' '''
myenv.Append(CCFLAGS=" -Wall -std=c++14 -fmax-errors=2 ") myenv.Append(CCFLAGS=" -Wall -std=c++17 -fmax-errors=2 ")
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core"), LIBPATH=Split(libpath)) lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core"), LIBPATH=Split(libpath))
......
...@@ -56,7 +56,7 @@ libpath=''' ...@@ -56,7 +56,7 @@ libpath='''
$SECURITY_TRANSFORMS_HOME/lib $SECURITY_TRANSFORMS_HOME/lib
''' '''
myenv.Append(CCFLAGS=" -Wall -std=c++14 -fmax-errors=2") myenv.Append(CCFLAGS=" -Wall -std=c++17 -fmax-errors=2")
myenv.Append(LIBPATH=libpath) myenv.Append(LIBPATH=libpath)
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
......
...@@ -20,7 +20,7 @@ cpppath=''' ...@@ -20,7 +20,7 @@ cpppath='''
#myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ") #myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
myenv.Append(CXXFLAGS = " -std=c++14 ") myenv.Append(CXXFLAGS = " -std=c++17 ")
lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core irdb-util irdb-transform stars MEDSannotation"), LIBPATH=Split("$SECURITY_TRANSFORMS_HOME/lib")) 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) install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
......
...@@ -20,7 +20,7 @@ LIBPATH="$SECURITY_TRANSFORMS_HOME/lib" ...@@ -20,7 +20,7 @@ LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
LIBS=Split("irdb-core irdb-transform") LIBS=Split("irdb-core irdb-transform")
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
myenv.Append(CXXFLAGS = " -std=c++14 ") myenv.Append(CXXFLAGS = " -std=c++17 ")
lib=myenv.SharedLibrary("irdb-elfdep", Split(files), LIBPATH=LIBPATH, LIBS=LIBS) lib=myenv.SharedLibrary("irdb-elfdep", Split(files), LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib) install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
......
...@@ -11,7 +11,7 @@ myenv.Replace(ZIPR_HOME=os.environ['ZIPR_HOME']) ...@@ -11,7 +11,7 @@ myenv.Replace(ZIPR_HOME=os.environ['ZIPR_HOME'])
myenv.Replace(ZIPR_SDK=os.environ['ZIPR_SDK']) myenv.Replace(ZIPR_SDK=os.environ['ZIPR_SDK'])
myenv.Replace(IRDB_SDK=os.environ['IRDB_SDK']) myenv.Replace(IRDB_SDK=os.environ['IRDB_SDK'])
myenv.Replace(CXXFLAGS = " -g -std=c++14 -Wall ") myenv.Replace(CXXFLAGS = " -g -std=c++17 -Wall ")
myenv.Append(LINKFLAGS = " -Wl,-unresolved-symbols=ignore-in-shared-libs ") myenv.Append(LINKFLAGS = " -Wl,-unresolved-symbols=ignore-in-shared-libs ")
cpppath=''' cpppath='''
......
...@@ -18,7 +18,7 @@ cpppath=''' ...@@ -18,7 +18,7 @@ cpppath='''
#myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ") #myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
myenv.Append(CXXFLAGS = " -std=c++14 ") myenv.Append(CXXFLAGS = " -std=c++17 ")
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
......
...@@ -24,7 +24,7 @@ LIBPATH="$SECURITY_TRANSFORMS_HOME/lib" ...@@ -24,7 +24,7 @@ LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
LIBS=Split("irdb-core irdb-cfg irdb-util MEDSannotation capstone keystone") LIBS=Split("irdb-core irdb-cfg irdb-util MEDSannotation capstone keystone")
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
myenv.Append(CXXFLAGS = " -std=c++14 ") myenv.Append(CXXFLAGS = " -std=c++17 ")
lib=myenv.SharedLibrary("irdb-transform", Split(files), LIBPATH=LIBPATH, LIBS=LIBS) lib=myenv.SharedLibrary("irdb-transform", Split(files), LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib) install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
......
...@@ -22,7 +22,7 @@ cpppath=''' ...@@ -22,7 +22,7 @@ cpppath='''
#myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ") #myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
myenv.Append(CXXFLAGS = " -std=c++14 ") myenv.Append(CXXFLAGS = " -std=c++17 ")
lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core"), LIBPATH=Split("$SECURITY_TRANSFORMS_HOME/lib")) lib=myenv.SharedLibrary(libname, Split(files), LIBS=Split("irdb-core"), LIBPATH=Split("$SECURITY_TRANSFORMS_HOME/lib"))
install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib) install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
......
...@@ -29,7 +29,7 @@ cpppath=''' ...@@ -29,7 +29,7 @@ cpppath='''
#CFLAGS="-fPIC " #CFLAGS="-fPIC "
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
myenv.Append(CXXFLAGS=" -std=c++14 -Wall -Werror ") myenv.Append(CXXFLAGS=" -std=c++17 -Wall -Werror ")
lib=myenv.SharedLibrary(lib, Split(files)) lib=myenv.SharedLibrary(lib, Split(files))
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib) install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
......
...@@ -19,7 +19,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp") + Glob(Dir('.').srcnode().abspa ...@@ -19,7 +19,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp") + Glob(Dir('.').srcnode().abspa
pgm="meds2pdb" pgm="meds2pdb"
myenv.Append(CXXFLAGS = " -std=c++14 ") myenv.Append(CXXFLAGS = " -std=c++17 ")
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib" LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
LIBS=Split(" irdb-cfg irdb-util irdb-transform EXEIO MEDSannotation pqxx "+env.subst('$BASE_IRDB_LIBS')) LIBS=Split(" irdb-cfg irdb-util irdb-transform EXEIO MEDSannotation pqxx "+env.subst('$BASE_IRDB_LIBS'))
myenv=myenv.Clone(CPPPATH=Split(cpppath)) myenv=myenv.Clone(CPPPATH=Split(cpppath))
......
...@@ -14,7 +14,7 @@ cpppath=''' ...@@ -14,7 +14,7 @@ cpppath='''
files=Glob( Dir('.').srcnode().abspath+"/*.cpp") files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
myenv.Append(CXXFLAGS = " -std=c++14 -Wall ") myenv.Append(CXXFLAGS = " -std=c++17 -Wall ")
pgm="thanos.exe" pgm="thanos.exe"
......
...@@ -48,7 +48,7 @@ libpath=''' ...@@ -48,7 +48,7 @@ libpath='''
if sysname != "SunOS": if sysname != "SunOS":
myenv.Append(CCFLAGS=" -Wall -Werror -fmax-errors=2") myenv.Append(CCFLAGS=" -Wall -Werror -fmax-errors=2")
myenv.Append(CXXFLAGS=" -std=c++14 ") myenv.Append(CXXFLAGS=" -std=c++17 ")
myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath), SHLIBSUFFIX=".zpi", SHLIBPREFIX="") myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath), SHLIBSUFFIX=".zpi", SHLIBPREFIX="")
lib=myenv.SharedLibrary("push64_relocs", Split(files)) lib=myenv.SharedLibrary("push64_relocs", Split(files))
......
...@@ -50,7 +50,7 @@ libpath=''' ...@@ -50,7 +50,7 @@ libpath='''
if sysname != "SunOS": if sysname != "SunOS":
myenv.Append(CCFLAGS=" -Wall -Werror -fmax-errors=2") myenv.Append(CCFLAGS=" -Wall -Werror -fmax-errors=2")
myenv.Append(CXXFLAGS=" -std=c++14 ") myenv.Append(CXXFLAGS=" -std=c++17 ")
myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath), SHLIBSUFFIX=".zpi", SHLIBPREFIX="") myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath), SHLIBSUFFIX=".zpi", SHLIBPREFIX="")
lib=myenv.SharedLibrary("unpin", Split(files)) lib=myenv.SharedLibrary("unpin", Split(files))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment