lirc: fix build on ubuntu
autoconf looks in /proc/version for `Ubuntu` and on match overrides the `--with-systemdsystemunitdir` value set in `configureFlags` causing the build to fail. > mkdir -p '/lib/systemd/system' > mkdir: cannot create directory '/lib': Permission denied patch `configure.ac` to prevent the override when building on ubuntu
This commit is contained in:
committed by
Bjørn Forsman
parent
d6a39b5a29
commit
3348c12496
@@ -46,6 +46,11 @@ stdenv.mkDerivation rec {
|
||||
# Add a workaround for linux-headers-5.18 until upstream adapts:
|
||||
# https://sourceforge.net/p/lirc/git/merge-requests/45/
|
||||
./linux-headers-5.18.patch
|
||||
|
||||
# remove check for `Ubuntu` in /proc/version which will override
|
||||
# --with-systemdsystemunitdir
|
||||
# https://sourceforge.net/p/lirc/tickets/385/
|
||||
./ubuntu.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d28c673..1cd0548 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -434,16 +434,7 @@ AC_CHECK_LIB([udev], [udev_device_new_from_device_id], [
|
||||
LIBS="$LIBS $LIBUDEV_LIBS"
|
||||
])
|
||||
|
||||
-dnl Ubuntu's systemd pkg-config seems broken beyond repair. So:
|
||||
-kernelversion=`cat /proc/version || echo "non-linux"`
|
||||
-AS_CASE([$kernelversion],
|
||||
- [*Ubuntu*],[
|
||||
- AC_MSG_NOTICE([Hardwiring Ubuntu systemd setup])
|
||||
- AC_SUBST([systemdsystemunitdir], [/lib/systemd/system])
|
||||
- AM_CONDITIONAL([WITH_SYSTEMDSYSTEMUNITDIR], [true])
|
||||
- ],[*],[
|
||||
- SYSTEMD_SYSTEMUNITDIR
|
||||
-])
|
||||
+SYSTEMD_SYSTEMUNITDIR
|
||||
|
||||
AC_ARG_WITH(lockdir,
|
||||
[ --with-lockdir=DIR Old-school device lock files in DIR (/var/lock{/lockdev})],
|
||||
Reference in New Issue
Block a user