package/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch

   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.
   5
   6 Systemd build system now uses the `--relative` option from `ln(1)`.
   7
   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
  10 for example).
  11
  12 Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
  13 [Maxime: refresh the patch]
  14 [Vincent:
  15   refresh the patch, move-to-rootlibdir removed by:
  16   https://github.com/systemd/systemd/commit/082210c7a837063fd8b520b18c221b42059d7eff
  17 ]
  18 Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
  19 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  20 ---
  21  Makefile.am  | 11 ++---------
  22  configure.ac |  2 --
  23  2 files changed, 2 insertions(+), 11 deletions(-)
  24
  25 diff --git a/Makefile.am b/Makefile.am
  26 index 0c27f81..4de1595 100644
  27 --- a/Makefile.am
  28 +++ b/Makefile.am
  29 @@ -312,9 +312,9 @@ install-aliases-hook:
  30         set -- $(SYSTEM_UNIT_ALIASES) && \
  31                 dir=$(systemunitdir) && $(install-aliases)
  32         set -- $(USER_UNIT_ALIASES) && \
  33 -               dir=$(userunitdir) && $(install-relative-aliases)
  34 +               dir=$(userunitdir) && $(install-aliases)
  35         set -- $(GENERAL_ALIASES) && \
  36 -               dir= && $(install-relative-aliases)
  37 +               dir= && $(install-aliases)
  38
  39  define install-aliases
  40         while [ -n "$$1" ]; do \
  41 @@ -325,15 +325,6 @@ define install-aliases
  42         done
  43  endef
  44
  45 -define install-relative-aliases
  46 -       while [ -n "$$1" ]; do \
  47 -               $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
  48 -               rm -f $(DESTDIR)$$dir/$$2 && \
  49 -               $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
  50 -               shift 2 || exit $$?; \
  51 -       done
  52 -endef
  53 -
  54  install-touch-usr-hook:
  55         touch -c $(DESTDIR)/$(prefix)
  56
  57 diff --git a/configure.ac b/configure.ac
  58 index cf595e6..d58f303 100644
  59 --- a/configure.ac
  60 +++ b/configure.ac
  61 @@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
  62  AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
  63  AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
  64
  65 -AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
  66 -
  67  M4_DEFINES=
  68
  69  AC_CHECK_TOOL(OBJCOPY, objcopy)
  70 --
  71 2.8.1
  72