[Buildroot] [PATCH v2, 1/2] package/openipmi: add libexecinfo optional dependency

[Buildroot] [PATCH v2, 1/2] package/openipmi: add libexecinfo optional dependency

[Fabrice Fontaine]

Add libexecinfo optional dependency as upstream rejected the patch to
add --with-execinfo=no

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Yann E. Morin):
 - Add missing local patch

 ...igure.ac-add-without-execinfo-option.patch | 55 -------------------
 package/openipmi/openipmi.mk                  |  6 +-
 2 files changed, 5 insertions(+), 56 deletions(-)
 delete mode 100644 package/openipmi/0002-configure.ac-add-without-execinfo-option.patch

diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch
deleted file mode 100644
index e1838a06f4..0000000000
--- a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 3 Jan 2022 23:27:21 +0100
-Subject: [PATCH] configure.ac: add --without-execinfo option
-
-Add an option to allow the user to disable execinfo to avoid the
-following build failure on musl with
-https://github.com/mikroskeem/libexecinfo:
-
-/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace'
-
-Fixes:
- - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://sourceforge.net/p/openipmi/patches/36]
----
- configure.ac | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 607864b9..f369166f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs,
-     POPTLIBS="$withval"
- )
- 
-+tryexecinfo=yes
-+AC_ARG_WITH(execinfo,
-+[  --with-execinfo[[=yes|no]]      Look for execinfo.],
-+    if test "x$withval" = "xyes"; then
-+      tryexecinfo=yes
-+    elif test "x$withval" = "xno"; then
-+      tryexecinfo=no
-+    fi,
-+)
-+
- # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib
- tryopenssl=yes
- AC_ARG_WITH(openssl,
-@@ -275,7 +285,9 @@ AM_PROG_CC_C_O
- AC_PROG_LIBTOOL
- AC_STDC_HEADERS
- 
--AC_CHECK_HEADERS(execinfo.h)
-+if test "x$tryexecinfo" != "xno"; then
-+   AC_CHECK_HEADERS(execinfo.h)
-+fi
- AC_CHECK_HEADERS([netinet/ether.h])
- AC_CHECK_HEADERS([sys/ethernet.h])
- 
--- 
-2.34.1
-
diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk
index b3a4d90d4b..81492ec131 100644
--- a/package/openipmi/openipmi.mk
+++ b/package/openipmi/openipmi.mk
@@ -15,7 +15,6 @@ OPENIPMI_INSTALL_STAGING = YES
 OPENIPMI_AUTORECONF = YES
 OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)"
 OPENIPMI_CONF_OPTS = \
-	--with-execinfo=no \
 	--with-glib=no \
 	--with-tcl=no \
 	--with-perl=no \
@@ -26,6 +25,11 @@ ifeq ($(BR2_PACKAGE_GDBM),y)
 OPENIPMI_DEPENDENCIES += gdbm
 endif
 
+ifeq ($(BR2_PACKAGE_LIBEXECINFO),y)
+OPENIPMI_DEPENDENCIES += libexecinfo
+OPENIPMI_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo"
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 OPENIPMI_DEPENDENCIES += openssl
 OPENIPMI_CONF_OPTS += --with-openssl=yes
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2, 2/2] package/openipmi: bump to version 2.0.33

[Fabrice Fontaine]

Drop patch (already in version) and so also drop autoreconf

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...01-Avoid-searching-host-library-path.patch | 53 -------------------
 package/openipmi/openipmi.hash                |  6 +--
 package/openipmi/openipmi.mk                  |  4 +-
 3 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 package/openipmi/0001-Avoid-searching-host-library-path.patch

diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch
deleted file mode 100644
index 15b4510f67..0000000000
--- a/package/openipmi/0001-Avoid-searching-host-library-path.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Wed, 22 Jul 2015 07:04:33 +0300
-Subject: [PATCH] Avoid searching host library path
-
-The $(libdir) variable points to the location of the directory on the target
-system, /usr/lib by default. When cross compiling this directory contains the
-host libraries which may be different than target libraries. Don't use
-$(libdir) in the library search path.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-[Fabrice: refresh patch for 2.0.32]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://sourceforge.net/p/openipmi/patches/35]
----
- cmdlang/Makefile.am | 3 +--
- unix/Makefile.am    | 6 ++----
- 2 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
-index 264ee12be79f..0b3843784656 100644
---- a/cmdlang/Makefile.am
-+++ b/cmdlang/Makefile.am
-@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \
- 	$(top_builddir)/utils/libOpenIPMIutils.la \
- 	$(top_builddir)/lib/libOpenIPMI.la
- libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-L$(libdir) -no-undefined
-+	-no-undefined
- 
- bin_PROGRAMS = openipmish
- 
-diff --git a/unix/Makefile.am b/unix/Makefile.am
-index 5128839dad13..bd0f897ba8d6 100644
---- a/unix/Makefile.am
-+++ b/unix/Makefile.am
-@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la
- libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
- 	$(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB)
- libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-L$(libdir) -no-undefined
-+	-no-undefined
- 
- libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
- libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
- 	$(GDBM_LIB) $(RT_LIB)
- libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-L$(libdir) -no-undefined
-+	-no-undefined
- 
- noinst_HEADERS = heap.h
- 
diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash
index eded076ade..fc3cf1a520 100644
--- a/package/openipmi/openipmi.hash
+++ b/package/openipmi/openipmi.hash
@@ -1,8 +1,8 @@
 # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/
-sha1  73d7dce4312b006983b11367e4a43d4ec52cf888  OpenIPMI-2.0.32.tar.gz
-md5  532404c9df7d0e8bde975b95b9e6775b  OpenIPMI-2.0.32.tar.gz
+sha1  4387f227aad92756e296d1c9421e83231d355dbd  OpenIPMI-2.0.33.tar.gz
+md5  923d2914dbbc3307712f8c58401bab0f  OpenIPMI-2.0.33.tar.gz
 # Locally computed
-sha256  f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945  OpenIPMI-2.0.32.tar.gz
+sha256  fb53e9ea5e2681cf8af7cda024b1a0044c675f84116ca27ae9616c8b7ad95b49  OpenIPMI-2.0.33.tar.gz
 sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
 sha256  185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e  COPYING.BSD
 sha256  5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509  COPYING.LIB
diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk
index 81492ec131..ccf86f93cd 100644
--- a/package/openipmi/openipmi.mk
+++ b/package/openipmi/openipmi.mk
@@ -4,15 +4,13 @@
 #
 ################################################################################
 
-OPENIPMI_VERSION = 2.0.32
+OPENIPMI_VERSION = 2.0.33
 OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library
 OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz
 OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause
 OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD
 OPENIPMI_DEPENDENCIES = popt ncurses readline host-pkgconf
 OPENIPMI_INSTALL_STAGING = YES
-# Patching Makefile.am
-OPENIPMI_AUTORECONF = YES
 OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)"
 OPENIPMI_CONF_OPTS = \
 	--with-glib=no \
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2, 1/2] package/openipmi: add libexecinfo optional dependency

[Yann E. MORIN]

Fabrice, All,

On 2022-10-30 18:56 +0100, Fabrice Fontaine spake thusly:
> Add libexecinfo optional dependency as upstream rejected the patch to
> add --with-execinfo=no

Indeed, they rejected it, but they suggested an alternate solution:
check for backtrace() and whether it requires -lexecinfo.

Something like:

    AC_SEARCH_LIBS(
        [backtrace],
        [execinfo],
        ,
        [AC_MSG_ERROR([backtrace() not found and no library provides it; maybe install libexecinfo])]
    )

Regards,
Yann E. MORIN.

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Add missing local patch
> 
>  ...igure.ac-add-without-execinfo-option.patch | 55 -------------------
>  package/openipmi/openipmi.mk                  |  6 +-
>  2 files changed, 5 insertions(+), 56 deletions(-)
>  delete mode 100644 package/openipmi/0002-configure.ac-add-without-execinfo-option.patch
> 
> diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch
> deleted file mode 100644
> index e1838a06f4..0000000000
> --- a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Mon, 3 Jan 2022 23:27:21 +0100
> -Subject: [PATCH] configure.ac: add --without-execinfo option
> -
> -Add an option to allow the user to disable execinfo to avoid the
> -following build failure on musl with
> -https://github.com/mikroskeem/libexecinfo:
> -
> -/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace'
> -
> -Fixes:
> - - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status: https://sourceforge.net/p/openipmi/patches/36]
> ----
> - configure.ac | 14 +++++++++++++-
> - 1 file changed, 13 insertions(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 607864b9..f369166f 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs,
> -     POPTLIBS="$withval"
> - )
> - 
> -+tryexecinfo=yes
> -+AC_ARG_WITH(execinfo,
> -+[  --with-execinfo[[=yes|no]]      Look for execinfo.],
> -+    if test "x$withval" = "xyes"; then
> -+      tryexecinfo=yes
> -+    elif test "x$withval" = "xno"; then
> -+      tryexecinfo=no
> -+    fi,
> -+)
> -+
> - # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib
> - tryopenssl=yes
> - AC_ARG_WITH(openssl,
> -@@ -275,7 +285,9 @@ AM_PROG_CC_C_O
> - AC_PROG_LIBTOOL
> - AC_STDC_HEADERS
> - 
> --AC_CHECK_HEADERS(execinfo.h)
> -+if test "x$tryexecinfo" != "xno"; then
> -+   AC_CHECK_HEADERS(execinfo.h)
> -+fi
> - AC_CHECK_HEADERS([netinet/ether.h])
> - AC_CHECK_HEADERS([sys/ethernet.h])
> - 
> --- 
> -2.34.1
> -
> diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk
> index b3a4d90d4b..81492ec131 100644
> --- a/package/openipmi/openipmi.mk
> +++ b/package/openipmi/openipmi.mk
> @@ -15,7 +15,6 @@ OPENIPMI_INSTALL_STAGING = YES
>  OPENIPMI_AUTORECONF = YES
>  OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)"
>  OPENIPMI_CONF_OPTS = \
> -	--with-execinfo=no \
>  	--with-glib=no \
>  	--with-tcl=no \
>  	--with-perl=no \
> @@ -26,6 +25,11 @@ ifeq ($(BR2_PACKAGE_GDBM),y)
>  OPENIPMI_DEPENDENCIES += gdbm
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y)
> +OPENIPMI_DEPENDENCIES += libexecinfo
> +OPENIPMI_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo"
> +endif
> +
>  ifeq ($(BR2_PACKAGE_OPENSSL),y)
>  OPENIPMI_DEPENDENCIES += openssl
>  OPENIPMI_CONF_OPTS += --with-openssl=yes
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2, 1/2] package/openipmi: add libexecinfo optional dependency

[Thomas Petazzoni via buildroot]

On Sun, 30 Oct 2022 18:56:31 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Add libexecinfo optional dependency as upstream rejected the patch to
> add --with-execinfo=no
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Add missing local patch

Both applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2, 1/2] package/openipmi: add libexecinfo optional dependency

[Thomas Petazzoni via buildroot]

Hello Yann,

On Sun, 30 Oct 2022 19:20:41 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Fabrice, All,
> 
> On 2022-10-30 18:56 +0100, Fabrice Fontaine spake thusly:
> > Add libexecinfo optional dependency as upstream rejected the patch to
> > add --with-execinfo=no  
> 
> Indeed, they rejected it, but they suggested an alternate solution:
> check for backtrace() and whether it requires -lexecinfo.
> 
> Something like:
> 
>     AC_SEARCH_LIBS(
>         [backtrace],
>         [execinfo],
>         ,
>         [AC_MSG_ERROR([backtrace() not found and no library provides it; maybe install libexecinfo])]
>     )
> 
> Regards,
> Yann E. MORIN.

Agreed, but for now, Fabrice's patch was good enough, so I applied
as-is. It will certainly be nice if Fabrice has the chance to work on a
better solution using AC_SEARCH_LIBS().

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot