Skip to contentSkip to conversation

package/oprofile: fix build with binutils >= 2.34

PATCH New Thomas Petazzoni 2 participants 3 messages Mar 25, 2020 – Apr 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/oprofile: fix build with binutils >= 2.34

The libbfd library provided by binutils unfortunately changed its API in binutils >= 2.34. This is causing some build failures at the moment on architectures such as ARC that are using a very recent binutils version, but it would also cause build failures on other architectures once they start using binutils 2.34.

We fix this build issue by backporting an upstream oprofile patch. However, this patch touches configure.ac, which means we need to autoreconf, which needs another fix in configure.ac for autoreconf to succeed.

With all that in place, this commit fixes:

http://autobuild.buildroot.net/results/583d281c6cd2aecb65556080b379db24101ae3a8/

---
 ...d-foreign-option-to-AM_INIT_AUTOMAKE.patch |  36 ++++
 ...o-handle-the-binutils-2.34-api-chang.patch | 169 ++++++++++++++++++
 package/oprofile/oprofile.mk                  |   3 +
 3 files changed, 208 insertions(+)
 create mode 100644 package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch
 create mode 100644 package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch
package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch new file +36 -0
new file mode 100644
index 0000000000..98dcac6906
@@ -0,0 +1,36 @@
+From ff172a49d1ca5708f45939b9b4f125cafba01db3 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Tue, 24 Mar 2020 22:50:32 +0100
+Subject: [PATCH] configure.ac: add foreign option to AM_INIT_AUTOMAKE
+
+oprofile doesn't provide the NEWS, AUTHORS and ChangeLog file, so
+autoreconf complains with:
+
+Makefile.am: error: required file './NEWS' not found
+Makefile.am: error: required file './AUTHORS' not found
+Makefile.am: error: required file './ChangeLog' not found
+
+Such errors can be avoided by passing the "foreign" option to
+AM_INIT_AUTOMAKE.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 00e30079..87afe2b7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@ AC_PREREQ(2.13)
+ 
+ AC_INIT([OProfile], [1.3.0])
+ AC_CONFIG_SRCDIR([libop/op_config.h])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_HEADERS(config.h)
+ 
+ AC_CHECK_DECLS([basename], [], [], [[#include <libgen.h>]])
+-- 
+2.25.1
+
package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch new file +169 -0

169 lines not on this page · raw message

package/oprofile/oprofile.mk +3 -0
index cc41e5c6da..b9d7d9e608 100644
@@ -8,6 +8,9 @@ OPROFILE_VERSION = 1.3.0
 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
 OPROFILE_LICENSE = GPL-2.0+
 OPROFILE_LICENSE_FILES = COPYING
+# 0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch
+# 0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch
+OPROFILE_AUTORECONF = YES
 OPROFILE_CONF_OPTS = \
 	--disable-account-check \
 	--enable-gui=no \
Signature · 1 line
2.25.1
author Applied
#1 lore raw

PATCH 1/1 package/oprofile: fix build with binutils >= 2.34

Quoted 15 lines · On Wed, 25 Mar 2020 07:26:34 +0100 Thomas Petazzoni…

The libbfd library provided by binutils unfortunately changed its API in binutils >= 2.34. This is causing some build failures at the moment on architectures such as ARC that are using a very recent binutils version, but it would also cause build failures on other architectures once they start using binutils 2.34.

We fix this build issue by backporting an upstream oprofile patch. However, this patch touches configure.ac, which means we need to autoreconf, which needs another fix in configure.ac for autoreconf to succeed.

With all that in place, this commit fixes:

http://autobuild.buildroot.net/results/583d281c6cd2aecb65556080b379db24101ae3a8/

Quoted 8 lines
---
 ...d-foreign-option-to-AM_INIT_AUTOMAKE.patch |  36 ++++
 ...o-handle-the-binutils-2.34-api-chang.patch | 169 ++++++++++++++++++
 package/oprofile/oprofile.mk                  |   3 +
 3 files changed, 208 insertions(+)
 create mode 100644 package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch
 create mode 100644 package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/oprofile: fix build with binutils >= 2.34

In reply to Thomas Petazzoni
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

The libbfd library provided by binutils unfortunately changed its API in binutils >= 2.34. This is causing some build failures at the moment on architectures such as ARC that are using a very recent binutils version, but it would also cause build failures on other architectures once they start using binutils 2.34.

We fix this build issue by backporting an upstream oprofile patch. However, this patch touches configure.ac, which means we need to autoreconf, which needs another fix in configure.ac for autoreconf to succeed.

Quoted 5 lines

With all that in place, this commit fixes:

http://autobuild.buildroot.net/results/583d281c6cd2aecb65556080b379db24101ae3a8/

Committed to 2020.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard