diff options
Diffstat (limited to 'dev-util/strace/files')
| -rw-r--r-- | dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch | 24 | ||||
| -rw-r--r-- | dev-util/strace/files/strace-5.5-static.patch | 178 | ||||
| -rw-r--r-- | dev-util/strace/files/strace-5.6-AR.patch | 27 |
3 files changed, 0 insertions, 229 deletions
diff --git a/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch b/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch deleted file mode 100644 index 0f277962b958..000000000000 --- a/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch +++ /dev/null @@ -1,24 +0,0 @@ -Based on 52ac53e96143f6aac52738f6e385f75203a68a7b -[PATCH] configure.ac: do not copy CFLAGS to CFLAGS_FOR_{M32,MX32} - ---- a/configure.ac -+++ b/configure.ac -@@ -984,11 +984,14 @@ AS_IF([test x$arch = xaarch64], - ]) - ]) - --# Setting default compiler variables for personalities -+# Set default compiler variables for personalities. - m4_foreach([pers], [M32, MX32], dnl -- [m4_foreach([var], [CC, CPP, CFLAGS, CPPFLAGS], dnl -- [[: ${]var[_FOR_]pers[=$]var[}] -- AC_SUBST(var[_FOR_]pers)])]) -+ [m4_foreach([var], [CC, CPP, CPPFLAGS], dnl -+ [[: ${]var[_FOR_]pers[=$]var[}] -+ AC_SUBST(var[_FOR_]pers)]) dnl -+ m4_foreach([var], [CFLAGS], dnl -+ [[: ${]var[_FOR_]pers[=][}] -+ AC_SUBST(var[_FOR_]pers)])]) - - st_MPERS([m32], [aarch64|powerpc64|s390x|sparc64|tile|x32|x86_64]) - st_MPERS([mx32], [x86_64]) 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 da57ee0f9388..000000000000 --- 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 <libunwind-ptrace.h>]], -- [[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 diff --git a/dev-util/strace/files/strace-5.6-AR.patch b/dev-util/strace/files/strace-5.6-AR.patch deleted file mode 100644 index 8386bc418827..000000000000 --- a/dev-util/strace/files/strace-5.6-AR.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 81e11a9b8c9469002833bd1707a435b1f81baf92 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sat, 2 May 2020 16:25:21 -0400 -Subject: [PATCH] configure: check AR variable for 'ar' tool - -Without this, automake always hardcodes 'AR = ar' in Makefile.in - -Bug: https://bugs.gentoo.org/720712 ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 6aabc2c8..da486c24 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -36,6 +36,7 @@ AC_PROG_CC_STDC - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_RANLIB -+AM_PROG_AR - - AC_USE_SYSTEM_EXTENSIONS - AX_CODE_COVERAGE --- -2.26.2 - |