From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67E7E13933E for ; Sat, 10 Jul 2021 21:16:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 672B0E0CCF; Sat, 10 Jul 2021 21:16:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D3FBE0CCF for ; Sat, 10 Jul 2021 21:16:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8BE8340831 for ; Sat, 10 Jul 2021 21:16:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2487A7C2 for ; Sat, 10 Jul 2021 21:16:15 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1625951042.8a36cb230f7a11edf480ebf6e7e2001ea49fe3f9.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/strace/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/strace/files/strace-5.5-static.patch X-VCS-Directories: dev-util/strace/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 8a36cb230f7a11edf480ebf6e7e2001ea49fe3f9 X-VCS-Branch: master Date: Sat, 10 Jul 2021 21:16:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bee0fdd1-c998-4959-99dd-a776a1125b9a X-Archives-Hash: 70c0301ef52b2a56e73fa6b0b860430e commit: 8a36cb230f7a11edf480ebf6e7e2001ea49fe3f9 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat May 1 17:55:14 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Jul 10 21:04:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a36cb23 dev-util/strace: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/20635 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> dev-util/strace/files/strace-5.5-static.patch | 178 -------------------------- 1 file changed, 178 deletions(-) diff --git a/dev-util/strace/files/strace-5.5-static.patch b/dev-util/strace/files/strace-5.5-static.patch deleted file mode 100644 index da57ee0f938..00000000000 --- a/dev-util/strace/files/strace-5.5-static.patch +++ /dev/null @@ -1,178 +0,0 @@ ---- /Makefile.am -+++ /Makefile.am -@@ -379,7 +379,6 @@ - if USE_LIBDW - strace_SOURCES += unwind-libdw.c - strace_CPPFLAGS += $(libdw_CPPFLAGS) --strace_CFLAGS += $(libdw_CFLAGS) - strace_LDFLAGS += $(libdw_LDFLAGS) - strace_LDADD += $(libdw_LIBS) - endif ---- /configure.ac -+++ /configure.ac -@@ -48,6 +48,15 @@ - AC_DEFINE([MANPAGE_DATE], "[manpage_date]", [Date]) - AC_SUBST([MANPAGE_DATE], [manpage_date]) - -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static], -+ [link strace statically])], -+ [], [enable_static=no]) -+if test "$enable_static" = "yes"; then -+ # Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread. -+ LDFLAGS="$LDFLAGS -pthread -static" -+fi -+ - AC_C_BIGENDIAN - - AC_MSG_CHECKING([for supported architecture]) ---- /m4/st_libdw.m4 -+++ /m4/st_libdw.m4 -@@ -8,7 +8,6 @@ - AC_DEFUN([st_ARG_LIBDW], [dnl - - : ${libdw_CPPFLAGS=} --: ${libdw_CFLAGS=} - : ${libdw_LDFLAGS=} - : ${libdw_LIBS=} - -@@ -34,48 +33,14 @@ - have_libdw= - - AS_IF([test "x$with_libdw" != xno && test "x$use_unwinder" = x], -- [saved_CPPFLAGS="$CPPFLAGS" -- saved_CFLAGS="$CFLAGS" -- CPPFLAGS="$CPPFLAGS $libdw_CPPFLAGS" -- CFLAGS="$CFLAGS $libdw_CFLAGS" -- -- AC_CHECK_HEADERS([elfutils/libdwfl.h], -- [AC_CHECK_LIB([dw], [dwfl_linux_proc_attach], -- [libdw_LIBS="-ldw $libdw_LIBS" -- AC_CACHE_CHECK([for elfutils version], -- [st_cv_ELFUTILS_VERSION], -- [[st_cv_ELFUTILS_VERSION="$(echo _ELFUTILS_VERSION | -- $CPP $CPPFLAGS -P -imacros elfutils/version.h - | -- grep '^[0-9]')" -- test -n "$st_cv_ELFUTILS_VERSION" || -- st_cv_ELFUTILS_VERSION=0 -- ]] -- ) -- AS_IF([test "$st_cv_ELFUTILS_VERSION" -ge 164], -- [have_libdw=yes], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_ERROR([elfutils version >= 164 is required for stack tracing support])], -- [AC_MSG_WARN([elfutils version >= 164 is required for stack tracing support])] -- ) -- ] -- ) -- ], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_FAILURE([failed to find dwfl_linux_proc_attach in libdw])], -- ) -- ], -- [$libdw_LDFLAGS $libdw_LIBS] -- ) -- ], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_FAILURE([failed to find elfutils/libdwfl.h])] -- ) -- ] -- ) -- -- CFLAGS="$saved_CFLAGS" -- CPPFLAGS="$saved_CPPFLAGS" -- ] -+ [if test "$enable_static" = "yes"; then -+ PKG_CHECK_MODULES_STATIC([LIBDW], [libdw >= 0.164]) -+ else -+ PKG_CHECK_MODULES([LIBDW], [libdw >= 0.164]) -+ fi -+ have_libdw=yes -+ libdw_CPPFLAGS="$LIBDW_CFLAGS" -+ libdw_LIBS="$LIBDW_LIBS"] - ) - - AS_IF([test "x$have_libdw" = xyes], -@@ -84,7 +49,6 @@ - [Whether to use libdw for stack tracing] - ) - AC_SUBST(libdw_CPPFLAGS) -- AC_SUBST(libdw_CFLAGS) - AC_SUBST(libdw_LDFLAGS) - AC_SUBST(libdw_LIBS) - ] ---- /m4/st_libunwind.m4 -+++ /m4/st_libunwind.m4 -@@ -28,64 +28,14 @@ - libunwind_LIBS= - - AS_IF([test "x$with_libunwind" != xno && test "x$use_unwinder" = x], -- [saved_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $libunwind_CPPFLAGS" -- -- AC_CHECK_HEADERS([libunwind-ptrace.h], -- [saved_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $libunwind_LDFLAGS" -- -- AC_CHECK_LIB([unwind], [backtrace], -- [libunwind_LIBS="-lunwind $libunwind_LIBS" -- -- AC_MSG_CHECKING([for unw_create_addr_space in libunwind-generic]) -- saved_LIBS="$LIBS" -- LIBS="-lunwind-generic $libunwind_LIBS $LIBS" -- -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[#include ]], -- [[return !unw_create_addr_space(0, 0)]]) -- ], -- [AC_MSG_RESULT([yes]) -- libunwind_LIBS="-lunwind-generic $libunwind_LIBS" -- -- AC_CHECK_LIB([unwind-ptrace], [_UPT_create], -- [libunwind_LIBS="-lunwind-ptrace $libunwind_LIBS" -- use_unwinder=libunwind -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find _UPT_create in libunwind-ptrace]) -- fi -- ], -- [$libunwind_LIBS] -- ) -- ], -- [AC_MSG_RESULT([no]) -- if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find unw_create_addr_space in libunwind-generic]) -- fi -- ] -- ) -- -- LIBS="$saved_LIBS" -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find libunwind]) -- fi -- ], -- [$libunwind_LIBS] -- ) -- -- LDFLAGS="$saved_LDFLAGS" -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find libunwind-ptrace.h]) -- fi -- ] -- ) -- -- CPPFLAGS="$saved_CPPFLAGS" -- ] -+ [if test "$enable_static" = "yes"; then -+ PKG_CHECK_MODULES_STATIC([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace]) -+ else -+ PKG_CHECK_MODULES([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace]) -+ fi -+ use_unwinder="libunwind" -+ libunwind_CPPFLAGS="$LIBUNWIND_CFLAGS" -+ libunwind_LIBS="$LIBUNWIND_LIBS"] - ) - - if test "x$use_unwinder" = xlibunwind; then