Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
Zipr Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Open Source Software
Zipr Backend
Commits
feb9f8ea
Commit
feb9f8ea
authored
6 years ago
by
Matthew McGill
Browse files
Options
Downloads
Plain Diff
Merge branch 'thanos_support' into 'master'
Thanos support See merge request allzp/zipr!14
parents
fe312c08
37c92219
No related branches found
No related tags found
1 merge request
!14
Thanos support
Pipeline
#407
failed
6 years ago
Stage: clean
Stage: build
Stage: test
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
SConstruct
+2
-0
2 additions, 0 deletions
SConstruct
src/SConscript
+1
-3
1 addition, 3 deletions
src/SConscript
test/SConscript
+0
-2
0 additions, 2 deletions
test/SConscript
with
3 additions
and
5 deletions
SConstruct
+
2
−
0
View file @
feb9f8ea
...
...
@@ -21,6 +21,8 @@ env.Replace(debug=ARGUMENTS.get("debug",0))
env
.
Replace
(
do_cgc
=
ARGUMENTS
.
get
(
"
do_cgc
"
,
0
))
env
.
Replace
(
do_64bit_build
=
ARGUMENTS
.
get
(
"
do_64bit_build
"
,
0
))
env
.
Append
(
LINKFLAGS
=
"
-Wl,-unresolved-symbols=ignore-in-shared-libs
"
)
if
int
(
env
[
'
profile
'
])
==
1
:
print
"
Setting profile and debug mode
"
env
.
Append
(
CFLAGS
=
"
-pg
"
)
...
...
This diff is collapsed.
Click to expand it.
src/SConscript
+
1
−
3
View file @
feb9f8ea
...
...
@@ -40,13 +40,11 @@ libs='''
xform
IRDB-core
IRDB-cfg
BeaEngine_s_d
pqxx
transform
pq
dl
EXEIO
StructDiv
pqxx
'''
libpath
=
'''
...
...
This diff is collapsed.
Click to expand it.
test/SConscript
+
0
−
2
View file @
feb9f8ea
...
...
@@ -48,10 +48,8 @@ libs='''
xform
IRDB-core
IRDB-cfg
BeaEngine_s_d
pqxx
transform
pq
dl
EXEIO
'''
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment