Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
metadata-collect-agent
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
metadata-collect-agent
Commits
fcbc7aed
Commit
fcbc7aed
authored
Feb 08, 2022
by
Ophélie Gagnard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a bug in Makefiles for buildouts.
parent
3d4df09b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
18 deletions
+17
-18
Makefile
Makefile
+1
-1
installation/metadata-collect-agent/Makefile
installation/metadata-collect-agent/Makefile
+16
-17
No files found.
Makefile
View file @
fcbc7aed
...
@@ -17,7 +17,7 @@ bin/metadata-collect-agent:
...
@@ -17,7 +17,7 @@ bin/metadata-collect-agent:
mkdir
-p
build/metadata-collect-agent/logs
;
\
mkdir
-p
build/metadata-collect-agent/logs
;
\
cp
src/main.cpp build/metadata-collect-agent/
cp
src/main.cpp build/metadata-collect-agent/
cd
build/metadata-collect-agent
;
\
cd
build/metadata-collect-agent
;
\
make
INCLUDE_PYTHON
=
$(INCLUDE_PYTHON)
PREFIX
=
$(PREFIX)
make
install
-m
744 build/metadata-collect-agent/metadata-collect-agent bin/
install
-m
744 build/metadata-collect-agent/metadata-collect-agent bin/
lib/fluentbit_wendelin.so
:
lib/fluentbit_wendelin.so
:
...
...
installation/metadata-collect-agent/Makefile
View file @
fcbc7aed
ifeq
(,)
ifeq
($(INCLUDE_PYTHON),)
INCLUDE_PYTHON
=
$(
shell
pkg-config
--cflags
python3 |
cut
-f
1
-d
" "
)
INCLUDE_PYTHON
=
$(
shell
pkg-config
--cflags
python3 |
cut
-f
1
-d
" "
)
else
else
# INCLUDE_PYTHON = /test/test
INCLUDE_PYTHON
=
-I
/srv/slapgrid/slappart6/srv/runner/shared/python3/2e435adf7e2cb7d97668da52532ac7f3/include/python3.7m
#
INCLUDE_PYTHON = -I/srv/slapgrid/slappart6/srv/runner/shared/python3/2e435adf7e2cb7d97668da52532ac7f3/include/python3.7m
OPENSSL_PATH
=
/srv/slapgrid/slappart6/srv/runner/shared/openssl/24bd61db512fe6e4e0d214ae77943d75
#
OPENSSL_PATH = /srv/slapgrid/slappart6/srv/runner/shared/openssl/24bd61db512fe6e4e0d214ae77943d75
INCLUDE_OPENSSL
=
-I
$(OPENSSL_PATH)
/include
#
INCLUDE_OPENSSL = -I$(OPENSSL_PATH)/include
LIBRARY_OPENSSL
=
-L
$(OPENSSL_PATH)
/lib
#
LIBRARY_OPENSSL = -L$(OPENSSL_PATH)/lib
RUNPATH_OPENSSL
=
-Wl
,-rpath
=
$(OPENSSL_PATH)
/lib
#
RUNPATH_OPENSSL = -Wl,-rpath=$(OPENSSL_PATH)/lib
FMTLIB_PATH
=
/srv/slapgrid/slappart6/srv/runner/shared/fmtlib/d524cc3d1a798a140778558556ec6d0c
#
FMTLIB_PATH = /srv/slapgrid/slappart6/srv/runner/shared/fmtlib/d524cc3d1a798a140778558556ec6d0c
INCLUDE_FMTLIB
=
-I
$(FMTLIB_PATH)
/include
#
INCLUDE_FMTLIB = -I$(FMTLIB_PATH)/include
LIBRARY_FMTLIB
=
-L
$(FMTLIB_PATH)
/lib
#
LIBRARY_FMTLIB = -L$(FMTLIB_PATH)/lib
RUNPATH_FMTLIB
=
-Wl
,-rpath
=
$(FMTLIB_PATH)
/lib
#
RUNPATH_FMTLIB = -Wl,-rpath=$(FMTLIB_PATH)/lib
INCLUDE_DIRS
=
$(INCLUDE_PYTHON)
$(INCLUDE_OPENSSL)
$(INCLUDE_FMTLIB)
#
INCLUDE_DIRS = $(INCLUDE_PYTHON) $(INCLUDE_OPENSSL) $(INCLUDE_FMTLIB)
LIBPATHS
=
$(LIBRARY_OPENSSL)
$(LIBRARY_FMTLIB)
#
LIBPATHS = $(LIBRARY_OPENSSL) $(LIBRARY_FMTLIB)
RUNPATHS
=
$(RUNPATH_OPENSSL)
$(RUNPATH_FMTLIB)
#
RUNPATHS = $(RUNPATH_OPENSSL) $(RUNPATH_FMTLIB)
LDFLAGS
=
$(LIBPATHS)
$(RUNPATHS)
#
LDFLAGS = $(LIBPATHS) $(RUNPATHS)
endif
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment