Thanks, applied as dd466b0a49919f31ea7d401576b05bb20488bbf7. Michael
[sent from post-receive hook] On Thu, 12 Sep 2024 14:12:25 +0200, Alexander Dahl <[email protected]> wrote: > Otherwise we get linker errors like this (e.g. with > OSELAS.Toolchain-2020.08 coming with glibc 2.32): > > % p -v -j1 compile util-linux > > -------------------------- > target: util-linux.compile > -------------------------- > > ptxdist: executing: > PATH=/home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/sysroot-cross/usr/bin:/home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/sysroot-cross/usr/sbin:/home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/sysroot-host/usr/lib/wrapper:/home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/sysroot-host/usr/bin:/home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/sysroot-host/usr/sbin:/home/adahl/Work/bsp/thorsis/ncl/tmp/selected_toolchain:/usr/local/lib/ptxdist-2024.05.0/bin:/home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/sysroot-host/usr/bin:/home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/sysroot-host/usr/sbin:/home/adahl/Work/bsp/thorsis/ncl/tmp/selected_toolchain:/usr/local/lib/ptxdist-2024.04.0/bin:/home/adahl/bin:/home/adahl/.local/bin:/usr/local/bin:/usr/bin:/bin:/usr/games > HTTPS_PROXY=PTXDIST-UNALLOWED-DOWNLOAD HTTP_PROXY=PTXDIST-UNALLOWED-DOWNLOAD > https_proxy=PTXDIST-UNALLOWED-DOWNLOAD http_proxy=PTXDIST-UNALLOWED-DOWNLOAD > PKGCONFIG_WHITELIST_HOST='' PKGCONFIG_WHITELIST_TARGET='' > PKGCONFIG_WHITELIST_SRC='util-linux' > SYSROOT='/home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/sysroot-target' > V=1 VERBOSE=1 LC_ALL='C.utf8' > KBUILD_BUILD_TIMESTAMP=2020-08-01T00:00:00+00:00 KBUILD_BUILD_USER=ptxdist > KBUILD_BUILD_HOST=ptxdist ninja -C > /home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/build-target/util-linux-2.40.2-build > -v -j1 > > ninja: Entering directory > `/home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/build-target/util-linux-2.40.2-build' > [1/75] arm-v5te-linux-gnueabi-gcc -o test_pty > test_pty.p/lib_pty-session.c.o test_pty.p/lib_monotonic.c.o -Wl,--as-needed > -Wl,--no-undefined -Wl,--start-group lib/libcommon.a -lm -lrt -Wl,--end-group > FAILED: test_pty > arm-v5te-linux-gnueabi-gcc -o test_pty test_pty.p/lib_pty-session.c.o > test_pty.p/lib_monotonic.c.o -Wl,--as-needed -Wl,--no-undefined > -Wl,--start-group lib/libcommon.a -lm -lrt -Wl,--end-group > > /opt/OSELAS.Toolchain-2020.08.0/arm-v5te-linux-gnueabi/gcc-10.2.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/arm-v5te-linux-gnueabi/10.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: > test_pty.p/lib_pty-session.c.o: in function `ul_pty_setup': > > platform-ncl/build-target/util-linux-2.40.2-build/../util-linux-2.40.2/lib/pty-session.c:198: > undefined reference to `openpty' > > /opt/OSELAS.Toolchain-2020.08.0/arm-v5te-linux-gnueabi/gcc-10.2.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/arm-v5te-linux-gnueabi/10.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: > > platform-ncl/build-target/util-linux-2.40.2-build/../util-linux-2.40.2/lib/pty-session.c:188: > undefined reference to `openpty' > collect2: error: ld returned 1 exit status > ninja: build stopped: subcommand failed. > make: *** > [/usr/local/lib/ptxdist-2024.05.0/rules/post/ptxd_make_world_compile.make:20: > /home/adahl/Work/bsp/thorsis/ncl/tmp/platform-ncl/state/util-linux.compile] > Error 1 > > Suggested-by: Michael Olbrich <[email protected]> > Fixes: 18c9c0f89c41 ("util-linux: switch to meson") > Link: https://lore.ptxdist.org/ptxdist/[email protected]/T/#u > Signed-off-by: Alexander Dahl <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/util-linux.make b/rules/util-linux.make > index 62cd995a07e6..8cf82bd8336a 100644 > --- a/rules/util-linux.make > +++ b/rules/util-linux.make > @@ -155,7 +155,7 @@ UTIL_LINUX_CONF_OPT := \ > -Dlibpcre2-posix=disabled \ > -Dlibuser=disabled \ > -Dlibutempter=disabled \ > - -Dlibutil=disabled \ > + -Dlibutil=$(call ptx/disen, PTXCONF_GLIBC_2_34)d \ > -Dmagic=disabled \ > -Dncurses=$(call ptx/endis, UTIL_LINUX_USES_NCURSES)d \ > -Dncursesw=$(call ptx/endis, PTXCONF_UTIL_LINUX_USES_NCURSESW)d \
