From cbd7f39d9267e24159023db91712ca91558c5cc8 Mon Sep 17 00:00:00 2001 From: Christian Babeux Date: Tue, 27 Nov 2012 23:42:52 -0500 Subject: [PATCH] Disable build of libraries/tests that rely on the RTLD_NEXT GNU extension The liblttng-ust-fork and liblttng-ust-libc-wrapper rely on the RTLD_NEXT GNU extension of dlsym(3) to lookup/override symbols in libc. This extension is not available on Cygwin. Disable building of these libraries for the moment. --- Makefile.am | 8 ++++++-- configure.ac | 10 +++++++--- tests/Makefile.am | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index c726b816..e6d7f8b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,12 +3,16 @@ ACLOCAL_AMFLAGS = -I config SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ liblttng-ust \ liblttng-ust-ctl \ - liblttng-ust-fork \ - liblttng-ust-libc-wrapper \ tools \ tests \ doc +# Disabled for now, because these libraries +# rely on the dlsym(3) RTLD_NEXT GNU extension. +# This is not implemented in Cygwin. +# liblttng-ust-fork +# liblttng-ust-libc-wrapper + #disabled for 2.0 #if BUILD_JNI_INTERFACE #SUBDIRS += liblttng-ust-java diff --git a/configure.ac b/configure.ac index 22d5ee5d..73c7b897 100644 --- a/configure.ac +++ b/configure.ac @@ -281,6 +281,13 @@ AS_IF([test "x$with_sdt" = "xyes"],[ # liblttng-ust-java/Makefile +# Disabled for now, because these libraries +# rely on the dlsym(3) RTLD_NEXT GNU extension. +# This is not implemented in Cygwin. +#liblttng-ust-fork/Makefile +#liblttng-ust-libc-wrapper/Makefile +#tests/fork/Makefile + AC_CONFIG_FILES([ Makefile doc/Makefile @@ -292,15 +299,12 @@ AC_CONFIG_FILES([ liblttng-ust-comm/Makefile liblttng-ust/Makefile liblttng-ust-ctl/Makefile - liblttng-ust-fork/Makefile - liblttng-ust-libc-wrapper/Makefile tools/Makefile tests/Makefile tests/hello/Makefile tests/hello-static-lib/Makefile tests/hello.cxx/Makefile tests/demo/Makefile - tests/fork/Makefile tests/ust-basic-tracing/Makefile tests/ust-multi-test/Makefile lttng-ust.pc diff --git a/tests/Makefile.am b/tests/Makefile.am index e79ab7ce..6672b038 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo hello.cxx -#SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast +SUBDIRS = . hello hello-static-lib ust-basic-tracing ust-multi-test demo hello.cxx +#SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast fork dist_noinst_SCRIPTS = test_loop runtests trace_matches -- 2.34.1