From 580255b6560c7d4205fb1f90d2cdbf3cf541ad2d Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 26 Nov 2019 18:25:20 -0500 Subject: [PATCH] configury: drop bundled-elfutils mode Bundling elfutils has only been necessary on systems that lacked elfutils, and for some reason the normal autoconf % LDFLAGS=-L/path/ CPPFLAGS=-I/path/ configure trick didn't work. This kludge is now obstructing us as some distro build (koji rawhide!) systems presume that even conditional sources are real sources, and lead to failure. So long, bundled-elfutils build mode, and thanks for all the fish. --- Makefile.am | 29 +---- Makefile.in | 72 ++++------- README | 5 +- configure | 131 ++------------------- configure.ac | 102 ++-------------- doc/Makefile.in | 3 +- doc/SystemTap_Tapset_Reference/Makefile.in | 1 - doc/beginners/Makefile.in | 1 - httpd/Makefile.in | 3 +- httpd/docker/Makefile.in | 20 ++-- java/Makefile.in | 5 +- man/Makefile.in | 1 - man/cs/Makefile.in | 1 - python/Makefile.in | 22 ++-- stap-exporter/Makefile.in | 3 +- stapbpf/Makefile.am | 6 - stapbpf/Makefile.in | 9 +- stapdyn/Makefile.am | 6 - stapdyn/Makefile.in | 10 +- staprun/Makefile.am | 5 - staprun/Makefile.in | 33 +++--- systemtap.spec | 41 +------ 22 files changed, 93 insertions(+), 416 deletions(-) diff --git a/Makefile.am b/Makefile.am index 988491ff9..a640e425d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,32 +166,6 @@ stap_SOURCES += client-http.cxx stap_LDADD += $(libcurl_LIBS) $(jsonc_LIBS) $(openssl_LIBS) endif -if BUILD_ELFUTILS -stap_CPPFLAGS += -Iinclude-elfutils -stap_LDFLAGS += -Llib-elfutils -Wl,-rpath-link,lib-elfutils \ - -Wl,--enable-new-dtags,-rpath,$(pkglibdir) - - -BUILT_SOURCES += stamp-elfutils -CLEANFILES += stamp-elfutils -stamp-elfutils: config.status - $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all bin_PROGRAMS= - for dir in libelf libebl libdw libdwfl libdwelf backends; do \ - $(MAKE) $(AM_MAKEFLAGS) -j1 -C build-elfutils/$$dir bin_PROGRAMS= install; \ - done - $(MAKE) $(AM_MAKEFLAGS) -j1 -C build-elfutils install-pkgincludeHEADERS; - touch $@ -stap_DEPENDENCIES += lib-elfutils/libdw.so -lib-elfutils/libdw.so: stamp-elfutils ; - -PHONIES += install-elfutils -install-elfutils: - mkdir -p $(DESTDIR)$(pkglibdir) - for file in lib-elfutils/*.so* lib-elfutils/${PACKAGE_NAME}/*.so*; do \ - $(INSTALL_PROGRAM) $$file $(DESTDIR)$(pkglibdir); \ - done -install-exec-local: install-elfutils -endif endif CLEANFILES += $(pkglibexec_PROGRAMS) @@ -325,7 +299,6 @@ clean-local: rm -rf staplog.so distclean-local: - rm -rf build-elfutils include-elfutils lib-elfutils rm -f doc/beginners/en-US doc/beginners/build/en-US/testsuite uninstall-local: @@ -441,7 +414,7 @@ update-po: # Any extra flags, such as: # --define "with_docs 0" -# --define "with_bundled_elfutils 1" --define "elfutils_version 0.135" +# --define "elfutils_version 0.135" RPMBUILDFLAGS= PHONIES += dist-gzip rpm srpm diff --git a/Makefile.in b/Makefile.in index fe89bfbeb..2fa738d14 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,21 +117,13 @@ bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_20 = install-scripts @BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@am__append_21 = client-http.cxx @BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@am__append_22 = $(libcurl_LIBS) $(jsonc_LIBS) $(openssl_LIBS) -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_23 = -Iinclude-elfutils -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_24 = -Llib-elfutils -Wl,-rpath-link,lib-elfutils \ -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) - -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_25 = stamp-elfutils -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_26 = stamp-elfutils -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_27 = lib-elfutils/libdw.so -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_28 = install-elfutils -@BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@@HAVE_NSS_TRUE@am__append_29 = $(openssl_LIBS) -@BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@@HAVE_NSS_TRUE@am__append_30 = $(openssl_LIBS) -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_AVAHI_TRUE@@HAVE_NSS_TRUE@am__append_31 = $(avahi_CFLAGS) -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_AVAHI_TRUE@@HAVE_NSS_TRUE@am__append_32 = $(avahi_CFLAGS) -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_AVAHI_TRUE@@HAVE_NSS_TRUE@am__append_33 = $(avahi_LIBS) -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@@HAVE_NSS_TRUE@am__append_34 = $(openssl_LIBS) -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@@HAVE_NSS_TRUE@am__append_35 = $(openssl_LIBS) +@BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@@HAVE_NSS_TRUE@am__append_23 = $(openssl_LIBS) +@BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@@HAVE_NSS_TRUE@am__append_24 = $(openssl_LIBS) +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_AVAHI_TRUE@@HAVE_NSS_TRUE@am__append_25 = $(avahi_CFLAGS) +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_AVAHI_TRUE@@HAVE_NSS_TRUE@am__append_26 = $(avahi_CFLAGS) +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_AVAHI_TRUE@@HAVE_NSS_TRUE@am__append_27 = $(avahi_LIBS) +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@@HAVE_NSS_TRUE@am__append_28 = $(openssl_LIBS) +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_HTTP_SUPPORT_TRUE@@HAVE_NSS_TRUE@am__append_29 = $(openssl_LIBS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -572,7 +564,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -690,7 +681,7 @@ oldinclude_HEADERS = includes/sys/sdt.h includes/sys/sdt-config.h @BUILD_TRANSLATOR_TRUE@ @LIBINTL@ -lpthread $(am__append_8) \ @BUILD_TRANSLATOR_TRUE@ $(am__append_13) $(am__append_19) \ @BUILD_TRANSLATOR_TRUE@ $(am__append_22) -@BUILD_TRANSLATOR_TRUE@stap_DEPENDENCIES = $(am__append_27) +@BUILD_TRANSLATOR_TRUE@stap_DEPENDENCIES = @BUILD_TRANSLATOR_TRUE@@BUILD_VIRT_TRUE@stapvirt_SOURCES = stapvirt.c @BUILD_TRANSLATOR_TRUE@@BUILD_VIRT_TRUE@stapvirt_CFLAGS = \ @BUILD_TRANSLATOR_TRUE@@BUILD_VIRT_TRUE@ $(AM_CFLAGS) \ @@ -707,20 +698,18 @@ oldinclude_HEADERS = includes/sys/sdt.h includes/sys/sdt-config.h # of foo-bar.c if it is newer than the foo-bar.o file. Using noinst_foo_SOURCES # instead of foo_SOURCES prevents shipping git_version.h in dist tarballs, # which may cause false GIT_FOO readings. -BUILT_SOURCES = git_version.stamp $(am__append_25) -CLEANFILES = git_version.h $(am__append_26) $(pkglibexec_PROGRAMS) +BUILT_SOURCES = git_version.stamp +CLEANFILES = git_version.h $(pkglibexec_PROGRAMS) GIT_VERSION_CMD = $(SHELL) $(top_srcdir)/git_version.sh -PHONIES = $(am__append_20) $(am__append_28) runcheck update-po \ - dist-gzip rpm srpm uprobes install-uprobes +PHONIES = $(am__append_20) runcheck update-po dist-gzip rpm srpm \ + uprobes install-uprobes @BUILD_TRANSLATOR_TRUE@stap_CFLAGS = $(AM_CFLAGS) @PIECFLAGS@ \ @BUILD_TRANSLATOR_TRUE@ $(am__append_16) @BUILD_TRANSLATOR_TRUE@stap_CXXFLAGS = $(AM_CXXFLAGS) @PIECXXFLAGS@ \ @BUILD_TRANSLATOR_TRUE@ $(am__append_11) $(am__append_17) @BUILD_TRANSLATOR_TRUE@stap_CPPFLAGS = $(AM_CPPFLAGS) -DSTAP_SDT_V2 \ -@BUILD_TRANSLATOR_TRUE@ $(am__append_12) $(am__append_18) \ -@BUILD_TRANSLATOR_TRUE@ $(am__append_23) -@BUILD_TRANSLATOR_TRUE@stap_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ \ -@BUILD_TRANSLATOR_TRUE@ $(am__append_24) +@BUILD_TRANSLATOR_TRUE@ $(am__append_12) $(am__append_18) +@BUILD_TRANSLATOR_TRUE@stap_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_SOURCES = stap-sign-module.cxx nsscommon.cxx util.cxx @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_CPPFLAGS = $(AM_CPPFLAGS) @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_CXXFLAGS = $(AM_CXXFLAGS) @PIECXXFLAGS@ $(nss_CFLAGS) @@ -728,7 +717,7 @@ PHONIES = $(am__append_20) $(am__append_28) runcheck update-po \ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_LDADD = \ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(nss_LIBS) \ -@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_29) +@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_23) @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_authorize_cert_SOURCES = stap-authorize-cert.cxx nsscommon.cxx util.cxx @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_authorize_cert_CPPFLAGS = $(AM_CPPFLAGS) @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_authorize_cert_CXXFLAGS = $(AM_CXXFLAGS) @PIECXXFLAGS@ $(nss_CFLAGS) @@ -736,27 +725,27 @@ PHONIES = $(am__append_20) $(am__append_28) runcheck update-po \ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_authorize_cert_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_authorize_cert_LDADD = \ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(nss_LIBS) \ -@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_30) +@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_24) @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_serverd_SOURCES = stap-serverd.cxx cscommon.cxx util.cxx privilege.cxx nsscommon.cxx cmdline.cxx @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_serverd_CXXFLAGS = $(AM_CXXFLAGS) \ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ @PIECXXFLAGS@ \ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(nss_CFLAGS) \ -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_32) +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_26) @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_serverd_CFLAGS = $(AM_CFLAGS) \ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ @PIECFLAGS@ \ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(nss_CFLAGS) \ -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_31) +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_25) @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_serverd_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_serverd_LDADD = $(nss_LIBS) \ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ -lpthread \ -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_33) \ -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_34) +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_27) \ +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_28) @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_gen_cert_SOURCES = stap-gen-cert.cxx util.cxx nsscommon.cxx @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_gen_cert_CXXFLAGS = $(AM_CXXFLAGS) @PIECXXFLAGS@ $(nss_CFLAGS) @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_gen_cert_CFLAGS = $(AM_CFLAGS) @PIECFLAGS@ $(nss_CFLAGS) @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_gen_cert_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_gen_cert_LDADD = $(nss_LIBS) \ -@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_35) +@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ $(am__append_29) # crash(8) extension @BUILD_CRASHMOD_TRUE@STAPLOG = staplog.so @@ -773,7 +762,7 @@ EXTRA_DIST = m4/ChangeLog # Any extra flags, such as: # --define "with_docs 0" -# --define "with_bundled_elfutils 1" --define "elfutils_version 0.135" +# --define "elfutils_version 0.135" RPMBUILDFLAGS = ACLOCAL_AMFLAGS = -I m4 all: $(BUILT_SOURCES) config.h @@ -2227,8 +2216,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -@BUILD_CRASHMOD_FALSE@@BUILD_ELFUTILS_FALSE@@HAVE_NSS_FALSE@install-exec-local: @BUILD_CRASHMOD_FALSE@@BUILD_TRANSLATOR_FALSE@install-exec-local: +@BUILD_CRASHMOD_FALSE@@HAVE_NSS_FALSE@install-exec-local: clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-local \ @@ -2504,20 +2493,6 @@ cscope: @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ for f in $(pkglibexec_SCRIPTS); do \ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ sed -i -e "/INSTALL-HOOK/d;s,sysconfdir=.*,sysconfdir=$(sysconfdir),;s,pkglibexecdir=.*,pkglibexecdir=$(pkglibexecdir)/,;s,localstatedir=.*,localstatedir=$(localstatedir),;s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(pkglibexecdir)/$$f; \ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@ done -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@stamp-elfutils: config.status -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all bin_PROGRAMS= -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ for dir in libelf libebl libdw libdwfl libdwelf backends; do \ -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -j1 -C build-elfutils/$$dir bin_PROGRAMS= install; \ -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ done -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -j1 -C build-elfutils install-pkgincludeHEADERS; -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ touch $@ -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@lib-elfutils/libdw.so: stamp-elfutils ; -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@install-elfutils: -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ mkdir -p $(DESTDIR)$(pkglibdir) -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ for file in lib-elfutils/*.so* lib-elfutils/${PACKAGE_NAME}/*.so*; do \ -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ $(INSTALL_PROGRAM) $$file $(DESTDIR)$(pkglibdir); \ -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@ done -@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@install-exec-local: install-elfutils @BUILD_CRASHMOD_TRUE@$(STAPLOG): staplog.c @BUILD_CRASHMOD_TRUE@ $(CC) $(staplog_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -shared -rdynamic \ @@ -2579,7 +2554,6 @@ clean-local: rm -rf staplog.so distclean-local: - rm -rf build-elfutils include-elfutils lib-elfutils rm -f doc/beginners/en-US doc/beginners/build/en-US/testsuite uninstall-local: diff --git a/README b/README index 13b71c7b8..1dfa69e6a 100644 --- a/README +++ b/README @@ -60,9 +60,8 @@ Build steps: - Build systemtap normally: % .../configure [other autoconf options] - Or, with build it with a bundled internal copy of elfutils: - % .../configure --with-elfutils=ELFUTILS-SOURCE-DIR [other autoconf options] - (Ensure decompression library headers/libraries are installed for elfutils' use.) + Add env LDFLAGS=-L/path/ CPPFLAGS=-I/path/ before configure + to locate libraries in non-system directories. Consider configuring with "--enable-dejazilla" to automatically contribute to our public test result database. diff --git a/configure b/configure index 187fdce66..829b5845e 100755 --- a/configure +++ b/configure @@ -689,9 +689,6 @@ CXXCPP stapbpf_LIBS staprun_LIBS stap_LIBS -elfutils_abs_srcdir -BUILD_ELFUTILS_FALSE -BUILD_ELFUTILS_TRUE preferred_python HAVE_LIBREADLINE_FALSE HAVE_LIBREADLINE_TRUE @@ -918,7 +915,6 @@ enable_server with_avahi with_rpm with_python3 -with_elfutils with_dyninst enable_virt enable_libvirt @@ -1643,8 +1639,6 @@ Optional Packages: --without-avahi Do not use Avahi even if present --with-rpm query rpm database for missing debuginfos --with-python3 prefer python version 3 - --with-elfutils=DIRECTORY - find elfutils source code in DIRECTORY --with-dyninst=DIRECTORY find dyninst headers/libraries in DIRECTORY --without-python2-probes @@ -11421,36 +11415,10 @@ else as_fn_error $? "neither python version 2 nor 3 found" "$LINENO" 5 fi -build_elfutils=no - -# Check whether --with-elfutils was given. -if test "${with_elfutils+set}" = set; then : - withval=$with_elfutils; -case "$with_elfutils" in -yes) as_fn_error $? "--with-elfutils requires an argument" "$LINENO" 5 ;; -''|no) ;; -*) build_elfutils=yes ;; -esac -fi - - if test $build_elfutils = yes; then - BUILD_ELFUTILS_TRUE= - BUILD_ELFUTILS_FALSE='#' -else - BUILD_ELFUTILS_TRUE='#' - BUILD_ELFUTILS_FALSE= -fi - -elfutils_abs_srcdir=`if test $build_elfutils = yes; then : - cd $with_elfutils && pwd -fi` - - if test $enable_translator = yes; then - if test $build_elfutils = no; then # Need libdwfl-capable recent elfutils http://elfutils.org/ - - # On modern debian/ubuntu, libebl has been merged into libdw + # On modern debian/ubuntu and modern elfutils, libebl has been + # merged into libdw # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=457543 save_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ebl_get_elfmachine in -lebl" >&5 @@ -11596,10 +11564,6 @@ fi stap_LIBS="$stap_LIBS -Wl,--start-group -ldw $ebl_LIBS -Wl,--end-group -lelf" LIBS="$save_LIBS" - else - # We built our own and stap_LDFLAGS points at the install. - stap_LIBS="$stap_LIBS -Wl,--start-group -ldw -lebl -Wl,--end-group -lelf" - fi fi @@ -11607,9 +11571,8 @@ fi $as_echo "$as_me: stap will link $stap_LIBS" >&6;} # staprun has more modest libelf needs -if test $build_elfutils = no; then - save_LIBS="$LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_getshdrstrndx in -lelf" >&5 +save_LIBS="$LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_getshdrstrndx in -lelf" >&5 $as_echo_n "checking for elf_getshdrstrndx in -lelf... " >&6; } if ${ac_cv_lib_elf_elf_getshdrstrndx+:} false; then : $as_echo_n "(cached) " >&6 @@ -11654,20 +11617,15 @@ _ACEOF else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "libelf too old, need 0.142+ See \`config.log' for more details" "$LINENO" 5; } fi - staprun_LIBS="$staprun_LIBS -lelf" - stapbpf_LIBS="$stapbpf_LIBS -lelf" - LIBS="$save_LIBS" -else - # We built our own and staprun_LDFLAGS points at the install. - staprun_LIBS="$staprun_LIBS -lelf" - stapbpf_LIBS="$stapbpf_LIBS -lelf" -fi +staprun_LIBS="$staprun_LIBS -lelf" +stapbpf_LIBS="$stapbpf_LIBS -lelf" +LIBS="$save_LIBS" @@ -12599,75 +12557,6 @@ $as_echo "#define HAVE_BPF_PROG_TYPE_RAW_TRACEPOINT 1" >>confdefs.h fi -if test $build_elfutils = yes -a $enable_translator = yes; then - here=`pwd` - case "$with_elfutils" in - /*) elfutils_srcdir="$with_elfutils" ;; - *) elfutils_srcdir="${here}/$with_elfutils" ;; - esac - - if ! test -f ${elfutils_srcdir}/configure; then - as_fn_error $? "No ${elfutils_srcdir}/configure, forgot to run autoreconf -i?" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: running ${elfutils_srcdir}/configure" >&5 -$as_echo "$as_me: running ${elfutils_srcdir}/configure" >&6;} - - save_CFLAGS="$CFLAGS" - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fgnu89-inline" - CFLAGS="$CFLAGS -fgnu89-inline" - gnu89_inline_flag="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int something (); -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling elfutils with gcc -fgnu89-inline" >&5 -$as_echo "$as_me: Compiling elfutils with gcc -fgnu89-inline" >&6;} - gnu89_inline_flag="-fgnu89-inline" -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: Compiler does not support -fgnu89-inline" >&5 -$as_echo "$as_me: Compiler does not support -fgnu89-inline" >&6;} -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$save_CFLAGS" - CXXFLAGS="$save_CXXFLAGS" - - # Our libdw.so's libebl will look in $ORIGIN/../lib/... but that - # $ORIGIN is where libdw.so resides, which is not where there is a ../lib. - # Note that $libdir might be using a quoted use of $exec_prefix or $prefix. - # So we must make sure to pass those settings to elfutils configure. - elfutils_rpath="-Wl,--enable-new-dtags,-rpath,${libdir}/${PACKAGE_NAME}" - # Check whether this is a source release, or a source checkout. - # We need --enable-maintainer-mode if it isn't a source release. - # elfutils.spec is only distributed in source releases. - if test -f ${elfutils_srcdir}/elfutils.spec; then - need_maintainer_option="" - else - need_maintainer_option="--enable-maintainer-mode" - fi - (mkdir -p build-elfutils && cd build-elfutils && - bash ${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \ - --includedir="${here}/include-elfutils" \ - --libdir="${here}/lib-elfutils" \ - --exec-prefix="$exec_prefix" \ - --prefix="$prefix" \ - --enable-dwz \ - ${need_maintainer_option} \ - CFLAGS="${CFLAGS/-Wall/} $gnu89_inline_flag -fexceptions" \ - LDFLAGS="$LDFLAGS $elfutils_rpath" && - if test -f ${elfutils_srcdir}/config/version.h.in; then - echo Found elfutils/version.h header... - else - echo elfutils/version.h header not found, need elfutils 0.142+... - exit -1 - fi - ) - if test $? != 0; then exit -1; fi -fi - # Check whether --with-selinux was given. if test "${with_selinux+set}" = set; then : @@ -13452,10 +13341,6 @@ if test -z "${HAVE_LIBREADLINE_TRUE}" && test -z "${HAVE_LIBREADLINE_FALSE}"; th as_fn_error $? "conditional \"HAVE_LIBREADLINE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_ELFUTILS_TRUE}" && test -z "${BUILD_ELFUTILS_FALSE}"; then - as_fn_error $? "conditional \"BUILD_ELFUTILS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${HAVE_DYNINST_TRUE}" && test -z "${HAVE_DYNINST_FALSE}"; then as_fn_error $? "conditional \"HAVE_DYNINST\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 5715a001c..4b6115a0b 100644 --- a/configure.ac +++ b/configure.ac @@ -572,27 +572,10 @@ AS_IF([test "x$with_python3" = "xyes"], [AC_SUBST(preferred_python,[$PYTHON])], [AC_MSG_ERROR([neither python version 2 nor 3 found])]) -dnl Handle elfutils. If '--with-elfutils=DIR' wasn't specified, used -dnl the system's elfutils. -build_elfutils=no -AC_ARG_WITH([elfutils], - AS_HELP_STRING([--with-elfutils=DIRECTORY], - [find elfutils source code in DIRECTORY]), - [ -case "$with_elfutils" in -yes) AC_MSG_ERROR([--with-elfutils requires an argument]) ;; -''|no) ;; -*) build_elfutils=yes ;; -esac]) -AM_CONDITIONAL(BUILD_ELFUTILS, test $build_elfutils = yes) -AC_SUBST(elfutils_abs_srcdir, `AS_IF([test $build_elfutils = yes], - [cd $with_elfutils && pwd])`) - if test $enable_translator = yes; then - if test $build_elfutils = no; then # Need libdwfl-capable recent elfutils http://elfutils.org/ - - # On modern debian/ubuntu, libebl has been merged into libdw + # On modern debian/ubuntu and modern elfutils, libebl has been + # merged into libdw # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=457543 save_LIBS="$LIBS" AC_CHECK_LIB(ebl, ebl_get_elfmachine,[ebl_LIBS=-lebl],[ebl_LIBS=]) @@ -607,29 +590,19 @@ if test $enable_translator = yes; then [-Wl,--start-group -ldw $ebl_LIBS -Wl,--end-group -lelf]) stap_LIBS="$stap_LIBS -Wl,--start-group -ldw $ebl_LIBS -Wl,--end-group -lelf" LIBS="$save_LIBS" - else - # We built our own and stap_LDFLAGS points at the install. - stap_LIBS="$stap_LIBS -Wl,--start-group -ldw -lebl -Wl,--end-group -lelf" - fi fi AC_SUBST(stap_LIBS) AC_MSG_NOTICE([stap will link $stap_LIBS]) # staprun has more modest libelf needs -if test $build_elfutils = no; then - save_LIBS="$LIBS" - dnl this will only succeed with elfutils 0.142+ - AC_CHECK_LIB(elf,elf_getshdrstrndx,[],[ - AC_MSG_FAILURE([libelf too old, need 0.142+])]) - staprun_LIBS="$staprun_LIBS -lelf" - stapbpf_LIBS="$stapbpf_LIBS -lelf" - LIBS="$save_LIBS" -else - # We built our own and staprun_LDFLAGS points at the install. - staprun_LIBS="$staprun_LIBS -lelf" - stapbpf_LIBS="$stapbpf_LIBS -lelf" -fi +save_LIBS="$LIBS" +dnl this will only succeed with elfutils 0.142+ +AC_CHECK_LIB(elf,elf_getshdrstrndx,[],[ + AC_MSG_FAILURE([libelf too old, need 0.142+])]) +staprun_LIBS="$staprun_LIBS -lelf" +stapbpf_LIBS="$stapbpf_LIBS -lelf" +LIBS="$save_LIBS" AC_SUBST(staprun_LIBS) AC_SUBST(stapbpf_LIBS) @@ -856,63 +829,6 @@ AC_CHECK_DECLS([BPF_PROG_TYPE_RAW_TRACEPOINT], [], [#include ]) -if test $build_elfutils = yes -a $enable_translator = yes; then - here=`pwd` - case "$with_elfutils" in - /*) elfutils_srcdir="$with_elfutils" ;; - *) elfutils_srcdir="${here}/$with_elfutils" ;; - esac - - if ! test -f ${elfutils_srcdir}/configure; then - AC_MSG_ERROR([No ${elfutils_srcdir}/configure, forgot to run autoreconf -i?]) - fi - AC_MSG_NOTICE([running ${elfutils_srcdir}/configure]) - - save_CFLAGS="$CFLAGS" - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fgnu89-inline" - CFLAGS="$CFLAGS -fgnu89-inline" - gnu89_inline_flag="" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([int something ();])], [ - AC_MSG_NOTICE([Compiling elfutils with gcc -fgnu89-inline]) - gnu89_inline_flag="-fgnu89-inline"],[ - AC_MSG_NOTICE([Compiler does not support -fgnu89-inline])]) - CFLAGS="$save_CFLAGS" - CXXFLAGS="$save_CXXFLAGS" - - # Our libdw.so's libebl will look in $ORIGIN/../lib/... but that - # $ORIGIN is where libdw.so resides, which is not where there is a ../lib. - # Note that $libdir might be using a quoted use of $exec_prefix or $prefix. - # So we must make sure to pass those settings to elfutils configure. - elfutils_rpath="-Wl,--enable-new-dtags,-rpath,${libdir}/${PACKAGE_NAME}" - # Check whether this is a source release, or a source checkout. - # We need --enable-maintainer-mode if it isn't a source release. - # elfutils.spec is only distributed in source releases. - if test -f ${elfutils_srcdir}/elfutils.spec; then - need_maintainer_option="" - else - need_maintainer_option="--enable-maintainer-mode" - fi - (mkdir -p build-elfutils && cd build-elfutils && - bash ${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \ - --includedir="${here}/include-elfutils" \ - --libdir="${here}/lib-elfutils" \ - --exec-prefix="$exec_prefix" \ - --prefix="$prefix" \ - --enable-dwz \ - ${need_maintainer_option} \ - CFLAGS="${CFLAGS/-Wall/} $gnu89_inline_flag -fexceptions" \ - LDFLAGS="$LDFLAGS $elfutils_rpath" && - if test -f ${elfutils_srcdir}/config/version.h.in; then - echo Found elfutils/version.h header... - else - echo elfutils/version.h header not found, need elfutils 0.142+... - exit -1 - fi - ) - if test $? != 0; then exit -1; fi -fi - dnl Optional libselinux support allows stapdyn to check dnl for booleans that would prevent Dyninst from working. AC_ARG_WITH([selinux], diff --git a/doc/Makefile.in b/doc/Makefile.in index 3dc73a53f..cc7182895 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -280,7 +280,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -529,8 +528,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@BUILD_DOCS_FALSE@clean-local: @BUILD_DOCS_FALSE@uninstall-local: +@BUILD_DOCS_FALSE@clean-local: @BUILD_DOCS_FALSE@install-data-hook: clean: clean-recursive diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in index 2196b5ec2..227b214d0 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.in +++ b/doc/SystemTap_Tapset_Reference/Makefile.in @@ -288,7 +288,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ diff --git a/doc/beginners/Makefile.in b/doc/beginners/Makefile.in index e039a2c99..5ca97ee4b 100644 --- a/doc/beginners/Makefile.in +++ b/doc/beginners/Makefile.in @@ -246,7 +246,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ diff --git a/httpd/Makefile.in b/httpd/Makefile.in index d12a18469..ea3292fac 100644 --- a/httpd/Makefile.in +++ b/httpd/Makefile.in @@ -349,7 +349,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -923,8 +922,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -@HAVE_HTTP_SUPPORT_FALSE@uninstall-local: @HAVE_HTTP_SUPPORT_FALSE@install-data-local: +@HAVE_HTTP_SUPPORT_FALSE@uninstall-local: clean: clean-recursive clean-am: clean-generic clean-pkglibexecPROGRAMS mostlyclean-am diff --git a/httpd/docker/Makefile.in b/httpd/docker/Makefile.in index 2a3c81d1b..f1dad6068 100644 --- a/httpd/docker/Makefile.in +++ b/httpd/docker/Makefile.in @@ -161,7 +161,7 @@ am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) am__installdirs = "$(DESTDIR)$(pkglibexecdockerdir)" \ "$(DESTDIR)$(pkgdatadockerdir)" am__pep3147_tweak = \ - sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' + sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' py_compile = $(top_srcdir)/py-compile DATA = $(pkgdatadocker_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) @@ -292,7 +292,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -444,15 +443,20 @@ uninstall-pkglibexecdockerPYTHON: dir='$(DESTDIR)$(pkglibexecdockerdir)'; \ pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ + py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ + echo "$$py_files_pep3147";\ + pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ + pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ st=0; \ - for files in "$$py_files" "$$pyc_files" "$$pyo_files"; do \ + for files in \ + "$$py_files" \ + "$$pyc_files" \ + "$$pyo_files" \ + "$$pyc_files_pep3147" \ + "$$pyo_files_pep3147" \ + ; do \ $(am__uninstall_files_from_dir) || st=$$?; \ done; \ - dir='$(DESTDIR)$(pkglibexecdockerdir)/__pycache__'; \ - echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \ - while read files; do \ - $(am__uninstall_files_from_dir) || st=$$?; \ - done || exit $$?; \ exit $$st install-pkgdatadockerDATA: $(pkgdatadocker_DATA) @$(NORMAL_INSTALL) diff --git a/java/Makefile.in b/java/Makefile.in index c8188d730..18ea681e6 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -335,7 +335,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -674,9 +673,9 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -@HAVE_JAVA_FALSE@install-data-local: -@HAVE_JAVA_FALSE@install-exec-local: @HAVE_JAVA_FALSE@uninstall-local: +@HAVE_JAVA_FALSE@install-exec-local: +@HAVE_JAVA_FALSE@install-data-local: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ diff --git a/man/Makefile.in b/man/Makefile.in index 217f1231c..15b7f2010 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -318,7 +318,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ diff --git a/man/cs/Makefile.in b/man/cs/Makefile.in index 1a3faef22..6293d0760 100644 --- a/man/cs/Makefile.in +++ b/man/cs/Makefile.in @@ -282,7 +282,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ diff --git a/python/Makefile.in b/python/Makefile.in index 1d19ea012..228d43982 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -159,7 +159,7 @@ am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) am__installdirs = "$(DESTDIR)$(pkglibexecpythondir)" \ "$(DESTDIR)$(pkglibexecpythondir)" am__pep3147_tweak = \ - sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' + sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' DATA = $(pkglibexecpython_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ACLOCAL = @ACLOCAL@ @@ -289,7 +289,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -443,15 +442,20 @@ uninstall-pkglibexecpythonPYTHON: dir='$(DESTDIR)$(pkglibexecpythondir)'; \ pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ + py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ + echo "$$py_files_pep3147";\ + pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ + pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ st=0; \ - for files in "$$py_files" "$$pyc_files" "$$pyo_files"; do \ + for files in \ + "$$py_files" \ + "$$pyc_files" \ + "$$pyo_files" \ + "$$pyc_files_pep3147" \ + "$$pyo_files_pep3147" \ + ; do \ $(am__uninstall_files_from_dir) || st=$$?; \ done; \ - dir='$(DESTDIR)$(pkglibexecpythondir)/__pycache__'; \ - echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \ - while read files; do \ - $(am__uninstall_files_from_dir) || st=$$?; \ - done || exit $$?; \ exit $$st install-pkglibexecpythonDATA: $(pkglibexecpython_DATA) @$(NORMAL_INSTALL) @@ -518,8 +522,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@HAVE_PYTHON_PROBES_FALSE@install-exec-local: @HAVE_PYTHON_PROBES_FALSE@clean-local: +@HAVE_PYTHON_PROBES_FALSE@install-exec-local: clean: clean-am clean-am: clean-generic clean-local mostlyclean-am diff --git a/stap-exporter/Makefile.in b/stap-exporter/Makefile.in index 587e2bd2b..7efdf31a4 100644 --- a/stap-exporter/Makefile.in +++ b/stap-exporter/Makefile.in @@ -279,7 +279,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -511,9 +510,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@HAVE_PYTHON3_PROBES_FALSE@uninstall-local: @HAVE_PYTHON3_PROBES_FALSE@clean-local: @HAVE_PYTHON3_PROBES_FALSE@install-data-local: -@HAVE_PYTHON3_PROBES_FALSE@uninstall-local: clean: clean-am clean-am: clean-generic clean-local mostlyclean-am diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am index dc2795e6c..1c3e4d930 100644 --- a/stapbpf/Makefile.am +++ b/stapbpf/Makefile.am @@ -25,12 +25,6 @@ stapbpf_CXXFLAGS = $(AM_CXXFLAGS) stapbpf_LDFLAGS = $(AM_LDFLAGS) stapbpf_LDADD = $(stapbpf_LIBS) -lpthread -if BUILD_ELFUTILS -stapbpf_CPPFLAGS += -I../include-elfutils -stapbpf_LDFLAGS += -L../lib-elfutils -Wl,-rpath-link,lib-elfutils \ - -Wl,--enable-new-dtags,-rpath,$(pkglibdir) -endif - BUILT_SOURCES = CLEANFILES = diff --git a/stapbpf/Makefile.in b/stapbpf/Makefile.in index 49bf65b80..3e2bb8770 100644 --- a/stapbpf/Makefile.in +++ b/stapbpf/Makefile.in @@ -92,10 +92,6 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @HAVE_BPF_DECLS_TRUE@bin_PROGRAMS = stapbpf$(EXEEXT) -@BUILD_ELFUTILS_TRUE@@HAVE_BPF_DECLS_TRUE@am__append_1 = -I../include-elfutils -@BUILD_ELFUTILS_TRUE@@HAVE_BPF_DECLS_TRUE@am__append_2 = -L../lib-elfutils -Wl,-rpath-link,lib-elfutils \ -@BUILD_ELFUTILS_TRUE@@HAVE_BPF_DECLS_TRUE@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) - subdir = stapbpf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -348,7 +344,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -435,10 +430,10 @@ AM_CPPFLAGS = -D_GNU_SOURCE -I$(srcdir)/../includes \ AM_LDFLAGS = @PIELDFLAGS@ @HAVE_BPF_DECLS_TRUE@man_MANS = stapbpf.8 @HAVE_BPF_DECLS_TRUE@stapbpf_SOURCES = stapbpf.cxx bpfinterp.cxx libbpf.c ../util.cxx -@HAVE_BPF_DECLS_TRUE@stapbpf_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1) +@HAVE_BPF_DECLS_TRUE@stapbpf_CPPFLAGS = $(AM_CPPFLAGS) @HAVE_BPF_DECLS_TRUE@stapbpf_CFLAGS = $(AM_CFLAGS) @HAVE_BPF_DECLS_TRUE@stapbpf_CXXFLAGS = $(AM_CXXFLAGS) -@HAVE_BPF_DECLS_TRUE@stapbpf_LDFLAGS = $(AM_LDFLAGS) $(am__append_2) +@HAVE_BPF_DECLS_TRUE@stapbpf_LDFLAGS = $(AM_LDFLAGS) @HAVE_BPF_DECLS_TRUE@stapbpf_LDADD = $(stapbpf_LIBS) -lpthread # Arrange for the top-level git_version.h to be regenerated at every "make". diff --git a/stapdyn/Makefile.am b/stapdyn/Makefile.am index c79466c23..362a96027 100644 --- a/stapdyn/Makefile.am +++ b/stapdyn/Makefile.am @@ -40,12 +40,6 @@ dynsdt_CXXFLAGS = $(AM_CXXFLAGS) @DYNINST_CXXFLAGS@ dynsdt_LDFLAGS = $(AM_LDFLAGS) @DYNINST_LDFLAGS@ dynsdt_LDADD = -ldl -lelf -ldyninstAPI -lsymtabAPI -lpthread -if BUILD_ELFUTILS -dynsdt_CPPFLAGS += -I../include-elfutils -dynsdt_LDFLAGS += -L../lib-elfutils -Wl,-rpath-link,lib-elfutils \ - -Wl,--enable-new-dtags,-rpath,$(pkglibdir) -endif - endif # HAVE_DYNINST BUILT_SOURCES = diff --git a/stapdyn/Makefile.in b/stapdyn/Makefile.in index 2de0e5dd7..0f8811910 100644 --- a/stapdyn/Makefile.in +++ b/stapdyn/Makefile.in @@ -97,10 +97,6 @@ bin_PROGRAMS = $(am__EXEEXT_1) noinst_PROGRAMS = $(am__EXEEXT_2) @HAVE_DYNINST_TRUE@am__append_3 = stapdyn @HAVE_DYNINST_TRUE@am__append_4 = dynsdt -@BUILD_ELFUTILS_TRUE@@HAVE_DYNINST_TRUE@am__append_5 = -I../include-elfutils -@BUILD_ELFUTILS_TRUE@@HAVE_DYNINST_TRUE@am__append_6 = -L../lib-elfutils -Wl,-rpath-link,lib-elfutils \ -@BUILD_ELFUTILS_TRUE@@HAVE_DYNINST_TRUE@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) - subdir = stapdyn ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -353,7 +349,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -446,10 +441,9 @@ AM_LDFLAGS = @PIELDFLAGS@ @BOOST_SYSTEM_LIB@ $(am__append_2) @HAVE_DYNINST_TRUE@stapdyn_LDFLAGS = $(AM_LDFLAGS) @DYNINST_LDFLAGS@ @HAVE_DYNINST_TRUE@stapdyn_LDADD = -ldl -ldyninstAPI -lsymtabAPI -lpthread @HAVE_DYNINST_TRUE@dynsdt_SOURCES = dynsdt.cxx dynutil.cxx ../util.cxx -@HAVE_DYNINST_TRUE@dynsdt_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_5) +@HAVE_DYNINST_TRUE@dynsdt_CPPFLAGS = $(AM_CPPFLAGS) @HAVE_DYNINST_TRUE@dynsdt_CXXFLAGS = $(AM_CXXFLAGS) @DYNINST_CXXFLAGS@ -@HAVE_DYNINST_TRUE@dynsdt_LDFLAGS = $(AM_LDFLAGS) @DYNINST_LDFLAGS@ \ -@HAVE_DYNINST_TRUE@ $(am__append_6) +@HAVE_DYNINST_TRUE@dynsdt_LDFLAGS = $(AM_LDFLAGS) @DYNINST_LDFLAGS@ @HAVE_DYNINST_TRUE@dynsdt_LDADD = -ldl -lelf -ldyninstAPI -lsymtabAPI -lpthread # Arrange for the top-level git_version.h to be regenerated at every "make". diff --git a/staprun/Makefile.am b/staprun/Makefile.am index dd1c920b4..95005750f 100644 --- a/staprun/Makefile.am +++ b/staprun/Makefile.am @@ -29,11 +29,6 @@ staprun_CXXFLAGS = $(AM_CXXFLAGS) -DSINGLE_THREADED staprun_CPPFLAGS = $(AM_CPPFLAGS) staprun_LDADD = libstrfloctime.a $(staprun_LIBS) staprun_LDFLAGS = $(AM_LDFLAGS) -if BUILD_ELFUTILS -staprun_CPPFLAGS += -I../include-elfutils -staprun_LDFLAGS += -L../lib-elfutils -Wl,-rpath-link,lib-elfutils \ - -Wl,--enable-new-dtags,-rpath,$(pkglibdir) -endif if HAVE_NSS staprun_SOURCES += modverify.c ../nsscommon.cxx diff --git a/staprun/Makefile.in b/staprun/Makefile.in index 35368520e..b1659f957 100644 --- a/staprun/Makefile.in +++ b/staprun/Makefile.in @@ -94,16 +94,12 @@ host_triplet = @host@ target_triplet = @target@ bin_PROGRAMS = staprun$(EXEEXT) stap-merge$(EXEEXT) stapsh$(EXEEXT) pkglibexec_PROGRAMS = stapio$(EXEEXT) -@BUILD_ELFUTILS_TRUE@am__append_1 = -I../include-elfutils -@BUILD_ELFUTILS_TRUE@am__append_2 = -L../lib-elfutils -Wl,-rpath-link,lib-elfutils \ -@BUILD_ELFUTILS_TRUE@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) - -@HAVE_NSS_TRUE@am__append_3 = modverify.c ../nsscommon.cxx -@HAVE_NSS_TRUE@am__append_4 = $(nss_CFLAGS) -@HAVE_NSS_TRUE@am__append_5 = $(nss_CFLAGS) -@HAVE_NSS_TRUE@am__append_6 = $(nss_LIBS) -@HAVE_HTTP_SUPPORT_TRUE@am__append_7 = $(openssl_LIBS) -@HAVE_MONITOR_LIBS_TRUE@am__append_8 = $(jsonc_LIBS) -lpanel $(ncurses_LIBS) +@HAVE_NSS_TRUE@am__append_1 = modverify.c ../nsscommon.cxx +@HAVE_NSS_TRUE@am__append_2 = $(nss_CFLAGS) +@HAVE_NSS_TRUE@am__append_3 = $(nss_CFLAGS) +@HAVE_NSS_TRUE@am__append_4 = $(nss_LIBS) +@HAVE_HTTP_SUPPORT_TRUE@am__append_5 = $(openssl_LIBS) +@HAVE_MONITOR_LIBS_TRUE@am__append_6 = $(jsonc_LIBS) -lpanel $(ncurses_LIBS) subdir = staprun ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -400,7 +396,6 @@ docdir = @docdir@ dracutbindir = @dracutbindir@ dracutstap = @dracutstap@ dvidir = @dvidir@ -elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_fop = @have_fop@ @@ -493,15 +488,15 @@ noinst_LIBRARIES = libstrfloctime.a libstrfloctime_a_SOURCES = strfloctime.c libstrfloctime_a_CFLAGS = $(AM_CFLAGS) -Wno-format-nonliteral staprun_SOURCES = staprun.c staprun_funcs.c ctl.c common.c \ - ../privilege.cxx ../util.cxx $(am__append_3) -staprun_CFLAGS = $(AM_CFLAGS) -DSINGLE_THREADED $(am__append_4) -staprun_CXXFLAGS = $(AM_CXXFLAGS) -DSINGLE_THREADED $(am__append_5) -staprun_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1) -staprun_LDADD = libstrfloctime.a $(staprun_LIBS) $(am__append_6) \ - $(am__append_7) -staprun_LDFLAGS = $(AM_LDFLAGS) $(am__append_2) + ../privilege.cxx ../util.cxx $(am__append_1) +staprun_CFLAGS = $(AM_CFLAGS) -DSINGLE_THREADED $(am__append_2) +staprun_CXXFLAGS = $(AM_CXXFLAGS) -DSINGLE_THREADED $(am__append_3) +staprun_CPPFLAGS = $(AM_CPPFLAGS) +staprun_LDADD = libstrfloctime.a $(staprun_LIBS) $(am__append_4) \ + $(am__append_5) +staprun_LDFLAGS = $(AM_LDFLAGS) stapio_SOURCES = stapio.c mainloop.c common.c ctl.c relay.c relay_old.c monitor.c -stapio_LDADD = libstrfloctime.a -lpthread $(am__append_8) +stapio_LDADD = libstrfloctime.a -lpthread $(am__append_6) man_MANS = staprun.8 stap_merge_SOURCES = stap_merge.c stap_merge_CFLAGS = $(AM_CFLAGS) diff --git a/systemtap.spec b/systemtap.spec index 52686408c..135b7a22d 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -10,7 +10,6 @@ %{!?with_crash: %global with_crash 1} %endif %{!?with_rpm: %global with_rpm 1} -%{!?with_bundled_elfutils: %global with_bundled_elfutils 0} %{!?elfutils_version: %global elfutils_version 0.142} %{!?pie_supported: %global pie_supported 1} %{!?with_boost: %global with_boost 0} @@ -154,14 +153,7 @@ BuildRequires: crash-devel zlib-devel %if %{with_rpm} BuildRequires: rpm-devel %endif -%if %{with_bundled_elfutils} -Source1: elfutils-%{elfutils_version}.tar.gz -Patch1: elfutils-portability.patch -BuildRequires: m4 -%global setup_elfutils -a1 -%else BuildRequires: elfutils-devel >= %{elfutils_version} -%endif %if %{with_docs} BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 @@ -514,35 +506,10 @@ systemtap-runtime-virthost machine to execute systemtap scripts. # ------------------------------------------------------------------------ %prep -%setup -q %{?setup_elfutils} - -%if %{with_bundled_elfutils} -cd elfutils-%{elfutils_version} -%patch1 -p1 -sleep 1 -find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch -sleep 1 -find . \( -name configure -o -name config.h.in \) -print | xargs touch -cd .. -%endif +%setup -q %build -%if %{with_bundled_elfutils} -# Build our own copy of elfutils. -%global elfutils_config --with-elfutils=elfutils-%{elfutils_version} - -# We have to prevent the standard dependency generation from identifying -# our private elfutils libraries in our provides and requires. -%global _use_internal_dependency_generator 0 -%global filter_eulibs() /bin/sh -c "%{1} | sed '/libelf/d;/libdw/d;/libebl/d'" -%global __find_provides %{filter_eulibs /usr/lib/rpm/find-provides} -%global __find_requires %{filter_eulibs /usr/lib/rpm/find-requires} - -# This will be needed for running stap when not installed, for the test suite. -%global elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils -%endif - # Enable/disable the dyninst pure-userspace backend %if %{with_dyninst} %global dyninst_config --with-dyninst @@ -638,7 +605,7 @@ cd .. # We don't ship compileworthy python code, just oddball samples %global py_auto_byte_compile 0 -%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" +%configure %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" make %{?_smp_mflags} %if %{with_emacsvim} @@ -1090,10 +1057,6 @@ done %dir %{_libexecdir}/systemtap %{_libexecdir}/systemtap/libHelperSDT_*.so %endif -%if %{with_bundled_elfutils} -%dir %{_libdir}/systemtap -%{_libdir}/systemtap/lib*.so* -%endif %if %{with_emacsvim} %{_emacs_sitelispdir}/*.el* %{_emacs_sitestartdir}/systemtap-init.el -- 2.43.5