| Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 1 | From ca126a2832aaff0deef3ba7eaf411dd0dc43b068 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 16 Mar 2023 11:31:14 -0700 |
| 4 | Subject: [PATCH] Unbolt ubuntu hack |
| 5 | |
| 6 | This bites during cross compiling where the target is different than |
| 7 | build host and build host might be ubuntu but that does not matter in |
| 8 | cross compilation case. This fails builds when usrmerge feature is used |
| 9 | |
| Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 10 | Upstream-Status: Inappropriate [ Cross-compile specific ] |
| Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | configure.ac | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | --- a/configure.ac |
| 17 | +++ b/configure.ac |
| 18 | @@ -429,7 +429,7 @@ AC_CHECK_LIB([udev], [udev_device_new_fr |
| 19 | ]) |
| 20 | |
| 21 | dnl Ubuntu's systemd pkg-config seems broken beyond repair. So: |
| 22 | -kernelversion=`cat /proc/version || echo "non-linux"` |
| 23 | +kernelversion="cross-compiled" |
| 24 | AS_CASE([$kernelversion], |
| 25 | [*Ubuntu*],[ |
| 26 | AC_MSG_NOTICE([Hardwiring Ubuntu systemd setup]) |