1 From 32b6c22006767f0762edfa116b8b0f7be0c5c121 Mon Sep 17 00:00:00 2001
2 From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
3 Date: Wed, 27 Jul 2016 15:43:16 +0200
4 Subject: [PATCH] build-sys: revert use of ln relative option.
6 Systemd build system now uses the `--relative` option from `ln(1)`.
8 This option was added to GNU coreutils 8.16, which is not widely
9 deployed yet by GNU/Linux distributions (not available in Debian Wheezy
12 Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
13 [Maxime: refresh the patch]
14 Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
16 Makefile.am | 15 +++------------
18 2 files changed, 3 insertions(+), 14 deletions(-)
20 diff --git a/Makefile.am b/Makefile.am
21 index 0c27f81..4de1595 100644
24 @@ -255,7 +255,7 @@ define move-to-rootlibdir
25 $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
26 so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
27 rm -f $(DESTDIR)$(libdir)/$$libname && \
28 - $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
29 + $(LN_S) -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
30 mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
33 @@ -312,9 +312,9 @@ install-aliases-hook:
34 set -- $(SYSTEM_UNIT_ALIASES) && \
35 dir=$(systemunitdir) && $(install-aliases)
36 set -- $(USER_UNIT_ALIASES) && \
37 - dir=$(userunitdir) && $(install-relative-aliases)
38 + dir=$(userunitdir) && $(install-aliases)
39 set -- $(GENERAL_ALIASES) && \
40 - dir= && $(install-relative-aliases)
41 + dir= && $(install-aliases)
43 define install-aliases
44 while [ -n "$$1" ]; do \
45 @@ -325,15 +325,6 @@ define install-aliases
49 -define install-relative-aliases
50 - while [ -n "$$1" ]; do \
51 - $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
52 - rm -f $(DESTDIR)$$dir/$$2 && \
53 - $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
54 - shift 2 || exit $$?; \
58 install-touch-usr-hook:
59 touch -c $(DESTDIR)/$(prefix)
61 diff --git a/configure.ac b/configure.ac
62 index cf595e6..d58f303 100644
65 @@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
66 AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
67 AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
69 -AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
73 AC_CHECK_TOOL(OBJCOPY, objcopy)