mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/util-linux: fix build with uclibc-ng < 1.0.42

Browse Source 
Define static_assert if needed to avoid the following build failure with
uclibc-ng < 1.0.42 raised since bump to version 2.39 in commit
ad276d94a3 and
0ff5740652:

/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: ./.libs/libsmartcols.so: undefined reference to `static_assert'

Fixes:
 - http://autobuild.buildroot.org/results/c3d38d92557ee9e59b717b85f6307810d5de1487

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ebf9fa28e3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2023-09-18 22:37:11 +02:00
committed by Peter Korsgaard
parent bdc70c3c0a
commit 6b42533bf8
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/util-linux/util-linux-libs/util-linux-libs.mk
View File

@@ -52,6 +52,9 @@ UTIL_LINUX_LIBS_CONF_OPTS += --disable-widechar
# No libs use ncurses # No libs use ncurses
UTIL_LINUX_LIBS_CONF_OPTS += --without-ncursesw --without-ncurses UTIL_LINUX_LIBS_CONF_OPTS += --without-ncursesw --without-ncurses
# workaround for static_assert on uclibc-ng < 1.0.42
UTIL_LINUX_LIBS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Dstatic_assert=_Static_assert"
# Unfortunately, the util-linux does LIBS="" at the end of its # Unfortunately, the util-linux does LIBS="" at the end of its
# configure script. So we have to pass the proper LIBS value when # configure script. So we have to pass the proper LIBS value when
# calling the configure script to make configure tests pass properly, # calling the configure script to make configure tests pass properly,

3
package/util-linux/util-linux.mk
View File

@@ -96,6 +96,9 @@ endif
UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses
endif endif
# workaround for static_assert on uclibc-ng < 1.0.42
UTIL_LINUX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Dstatic_assert=_Static_assert"
# Unfortunately, the util-linux does LIBS="" at the end of its # Unfortunately, the util-linux does LIBS="" at the end of its
# configure script. So we have to pass the proper LIBS value when # configure script. So we have to pass the proper LIBS value when
# calling the configure script to make configure tests pass properly, # calling the configure script to make configure tests pass properly,