Skip to contentSkip to conversation

perf tests: Fix static build test

PATCH Applied Jiri Olsa 3 participants 3 messages Sep 5, 2019 – Sep 22, 2019 perf events

lore
Share & tools
lore

Jiri Olsa

author
#0 lore raw

PATCH v2 1/1 perf tests: Fix static build test

Disable the potentional shared library features,
which breaks static build if they are enabled and
detected: jvmti and vdso libraries.

---
 tools/perf/tests/make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/make +1 -1
index 6b3afed5d910..c850d1664c56 100644
@@ -100,7 +100,7 @@ make_install_info   := install-info
 make_install_pdf    := install-pdf
 make_install_prefix       := install prefix=/tmp/krava
 make_install_prefix_slash := install prefix=/tmp/krava/
-make_static         := LDFLAGS=-static
+make_static         := LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1
 
 # all the NO_* variable combined
 make_minimal        := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
Signature · 1 line
2.21.0
#1 lore raw

Em Thu, Sep 05, 2019 at 11:09:24AM +0200, Jiri Olsa escreveu:

Quoted 3 lines

Disable the potentional shared library features,
which breaks static build if they are enabled and
detected: jvmti and vdso libraries.

Thanks, applied.

- Arnaldo

Quoted 21 lines
---
 tools/perf/tests/make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/make +1 -1
index 6b3afed5d910..c850d1664c56 100644
@@ -100,7 +100,7 @@ make_install_info   := install-info
 make_install_pdf    := install-pdf
 make_install_prefix       := install prefix=/tmp/krava
 make_install_prefix_slash := install prefix=/tmp/krava/
-make_static         := LDFLAGS=-static
+make_static         := LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1
 
 # all the NO_* variable combined
 make_minimal        := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
Signature · 1 line
2.21.0
Signature · 1 line
- Arnaldo
merge bot Applied
#2 lore raw
In reply to Jiri Olsa
The following commit has been merged into the perf/urgent branch of tip:

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     b117b9b48b24cbb090dd3844b563b464d60a6278
Gitweb:        https://git.kernel.org/tip/b117b9b48b24cbb090dd3844b563b464d60a6278
Author:        Jiri Olsa <[email protected]>
AuthorDate:    Thu, 05 Sep 2019 11:09:24 +02:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Fri, 20 Sep 2019 14:37:28 -03:00

perf tests: Fix static build test

Disable the potentional shared library features, which breaks static build if they are enabled and detected: jvmti and vdso libraries.

---
 tools/perf/tests/make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/make +1 -1
index 6b3afed..c850d16 100644
@@ -100,7 +100,7 @@ make_install_info   := install-info
 make_install_pdf    := install-pdf
 make_install_prefix       := install prefix=/tmp/krava
 make_install_prefix_slash := install prefix=/tmp/krava/
-make_static         := LDFLAGS=-static
+make_static         := LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1
 
 # all the NO_* variable combined
 make_minimal        := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1