3ff877be29
With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds a --enable-static flags causing htop to be built as a static binary. Adding a --disable-static reverts this. This will fix the following build failure with hwloc raised since bump to version 3.3.0 in commit09243186dfandc8a61850dd: /home/autobuild/autobuild/instance-3/output-1/host/bin/mipsel-buildroot-linux-gnu-gcc -std=c99 -pedantic -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -I/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -I/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/include/libxml2 -Wall -Wcast-align -Wcast-qual -Wextra -Wfloat-equal -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef -Wunused -Wwrite-strings -Wnull-dereference -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR="\"/etc\"" -I"./linux" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=2 -static -rdynamic -static -o htop htop.o Action.o Affinity.o AffinityPanel.o AvailableColumnsPanel.o AvailableMetersPanel.o BatteryMeter.o CategoriesPanel.o ClockMeter.o ColorsPanel.o ColumnsPanel.o CommandLine.o CommandScreen. o Compat.o CPUMeter.o CRT.o DateMeter.o DateTimeMeter.o DiskIOMeter.o DisplayOptionsPanel.o DynamicColumn.o DynamicMeter.o DynamicScreen.o EnvScreen.o FileDescriptorMeter.o FunctionBar.o Hashtable.o Header.o HeaderOptionsPanel.o HostnameMeter.o IncSet.o InfoScreen.o ListItem.o LoadAverageMeter.o Machine.o MainPanel.o MemoryMeter.o MemorySwapMeter.o Meter.o MetersPanel.o NetworkIOMeter.o Object.o OpenFilesScreen.o OptionItem.o Panel.o Process.o ProcessLocksScreen.o ProcessTable.o Row.o RichString.o Scheduling.o ScreenManager.o ScreensPanel.o ScreenTabsPanel.o Settings.o SignalsPanel.o SwapMeter.o SysArchMeter.o Table.o TasksMeter.o TraceScreen.o UptimeMeter.o UsersTable.o Vector.o XUtils.o generic/gettime.o generic/hostname.o generic/uname.o linux/CGroupUtils.o linux/HugePageMeter.o linux/IOPriorityPanel.o linux/LibSensors.o linux/LinuxMachine.o linux/LinuxProcess.o linux/LinuxProcessTable.o linux/Platform.o linux/PressureStallMeter.o linux/SELinuxMeter.o linux/SystemdMeter.o linux/Z ramMeter.o zfs/ZfsArcMeter.o zfs/ZfsCompressedArcMeter.o -lcap -llzma -L/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lncurses -lm -L/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -lhwloc /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Action.o: in function `Action_setUserOnly': Action.c:(.text+0x2490): warning: Using 'getpwnam' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Settings.o: in function `Settings_new': Settings.c:(.text+0x2dd0): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/libhwloc.a(topology-xml-libxml.o): in function `hwloc_libxml_free_buffer': topology-xml-libxml.c:(.text+0x2c): undefined reference to `xmlFree' Fixes: - http://autobuild.buildroot.org/results/04bd5633750ff5cef048ea78c9de043d3ffcfa32 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 21f312a53e49a3338db870df778665e42cf72dbf) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
58 lines
1.7 KiB
Makefile
58 lines
1.7 KiB
Makefile
################################################################################
|
|
#
|
|
# htop
|
|
#
|
|
################################################################################
|
|
|
|
HTOP_VERSION = 3.3.0
|
|
HTOP_SOURCE = htop-$(HTOP_VERSION).tar.xz
|
|
HTOP_SITE = https://github.com/htop-dev/htop/releases/download/$(HTOP_VERSION)
|
|
HTOP_DEPENDENCIES = ncurses
|
|
# Prevent htop build system from searching the host paths
|
|
HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
|
|
HTOP_LICENSE = GPL-2.0+
|
|
HTOP_LICENSE_FILES = COPYING
|
|
|
|
# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test
|
|
# provided by autoconf relies on wchar_t.
|
|
HTOP_CONF_ENV += ac_cv_prog_cc_c99=-std=gnu99
|
|
|
|
# --enable-static has a non-standard semantic in htop, and causes the
|
|
# main binary to be linked statically, not just the production of
|
|
# static libraries. This causes issues with BR2_SHARED_STATIC_LIBS as
|
|
# htop is linked statically, but pkg-config returns results relevant
|
|
# for a shared library build. Since htop is only building an
|
|
# application, let's disable this bogus behavior.
|
|
ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
|
HTOP_CONF_OPTS += --disable-static
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_HWLOC),y)
|
|
HTOP_CONF_OPTS += --enable-hwloc
|
|
HTOP_DEPENDENCIES += hwloc
|
|
else
|
|
HTOP_CONF_OPTS += --disable-hwloc
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
|
HTOP_CONF_OPTS += --enable-capabilities
|
|
HTOP_DEPENDENCIES += libcap
|
|
else
|
|
HTOP_CONF_OPTS += --disable-capabilities
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LM_SENSORS),y)
|
|
HTOP_CONF_OPTS += --enable-sensors
|
|
HTOP_DEPENDENCIES += lm-sensors
|
|
else
|
|
HTOP_CONF_OPTS += --disable-sensors
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
|
|
HTOP_CONF_OPTS += --enable-unicode
|
|
else
|
|
HTOP_CONF_OPTS += --disable-unicode
|
|
endif
|
|
|
|
$(eval $(autotools-package))
|