From dd6c4a9929b4980b4a3b4dc3232cd23882dd3789 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Apr 2022 13:04:55 +0200 Subject: [PATCH] package/htop: fix hwloc static build Fix the following static build failure with hwloc raised since commit c83bf9720632bcd4d438094a9fc30feff69fc555: checking for hwloc_get_proc_cpubind in -lhwloc... no configure: error: can not find required library libhwloc Fixes: - http://autobuild.buildroot.org/results/5d815ec08c580005a863df6ac9ac29deff7d4128 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...igure.ac-fix-static-build-with-hwloc.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/htop/0001-configure.ac-fix-static-build-with-hwloc.patch diff --git a/package/htop/0001-configure.ac-fix-static-build-with-hwloc.patch b/package/htop/0001-configure.ac-fix-static-build-with-hwloc.patch new file mode 100644 index 0000000000..0ac79766c5 --- /dev/null +++ b/package/htop/0001-configure.ac-fix-static-build-with-hwloc.patch @@ -0,0 +1,54 @@ +From 4ccad4604586c921b4ad831b254496c2cdece9fc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 2 Apr 2022 17:27:01 +0200 +Subject: [PATCH] configure.ac: fix static build with hwloc + +Retrieve hwloc dependencies through pkg-config to avoid the following +static build failure: + +checking for hwloc_get_proc_cpubind in -lhwloc... no +configure: error: can not find required library libhwloc + +This build failure is raised because without pkg-config, hwloc +dependencies such as libxml2 are not retrieved: + +configure:8999: checking for hwloc_get_proc_cpubind in -lhwloc +configure:9022: /home/autobuild/autobuild/instance-0/output-1/host/bin/powerpc-buildroot-linux-uclibc-gcc -o conftest -D_GNU_SOURCE -I/home/autobuild/autobuild/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/bin/../../usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Og -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lhwloc -llzma -L/home/autobuild/autobuild/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/bin/../../usr/lib -lncurses -lm >&5 +/home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/bin/../../usr/lib/libhwloc.a(topology-xml-libxml.o): in function `hwloc_libxml_free_buffer': +topology-xml-libxml.c:(.text+0x6a): undefined reference to `xmlFree' + +Fixes: + - http://autobuild.buildroot.org/results/5d815ec08c580005a863df6ac9ac29deff7d4128 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/htop-dev/htop/commit/4ccad4604586c921b4ad831b254496c2cdece9fc] +--- + configure.ac | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4ecac1ecf..6bb7eb69f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -456,8 +456,18 @@ case "$enable_hwloc" in + no) + ;; + yes) +- AC_CHECK_LIB([hwloc], [hwloc_get_proc_cpubind], [], [AC_MSG_ERROR([can not find required library libhwloc])]) +- AC_CHECK_HEADERS([hwloc.h], [], [AC_MSG_ERROR([can not find require header file hwloc.h])]) ++ m4_ifdef([PKG_PROG_PKG_CONFIG], [ ++ PKG_PROG_PKG_CONFIG() ++ PKG_CHECK_MODULES(HWLOC, hwloc, [ ++ CFLAGS="$CFLAGS $HWLOC_CFLAGS" LIBS="$LIBS $HWLOC_LIBS" ++ ], [ ++ AC_CHECK_LIB([hwloc], [hwloc_get_proc_cpubind], [], [AC_MSG_ERROR([can not find required library libhwloc])]) ++ AC_CHECK_HEADERS([hwloc.h], [], [AC_MSG_ERROR([can not find require header file hwloc.h])]) ++ ]) ++ ], [ ++ AC_CHECK_LIB([hwloc], [hwloc_get_proc_cpubind], [], [AC_MSG_ERROR([can not find required library libhwloc])]) ++ AC_CHECK_HEADERS([hwloc.h], [], [AC_MSG_ERROR([can not find require header file hwloc.h])]) ++ ]) + ;; + *) + AC_MSG_ERROR([bad value '$enable_hwloc' for --enable-hwloc])