| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From fa5e137fbd2fb081ae897575377d718ee8cb6349 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 20 Dec 2015 04:20:28 +0000 |
| 4 | Subject: [PATCH 07/36] use lnr wrapper instead of looking for --relative |
| 5 | option for ln |
| 6 | |
| 7 | Upstream-Status: Inappropriate [OE-Specific] |
| 8 | |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | Makefile.am | 6 +++--- |
| 12 | configure.ac | 2 -- |
| 13 | 2 files changed, 3 insertions(+), 5 deletions(-) |
| 14 | |
| 15 | diff --git a/Makefile.am b/Makefile.am |
| 16 | index 629740f..82b6553 100644 |
| 17 | --- a/Makefile.am |
| 18 | +++ b/Makefile.am |
| 19 | @@ -243,7 +243,7 @@ define move-to-rootlibdir |
| 20 | $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ |
| 21 | so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ |
| 22 | rm -f $(DESTDIR)$(libdir)/$$libname && \ |
| 23 | - $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ |
| 24 | + lnr $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ |
| 25 | mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ |
| 26 | fi |
| 27 | endef |
| 28 | @@ -317,7 +317,7 @@ define install-relative-aliases |
| 29 | while [ -n "$$1" ]; do \ |
| 30 | $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ |
| 31 | rm -f $(DESTDIR)$$dir/$$2 && \ |
| 32 | - $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \ |
| 33 | + lnr $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \ |
| 34 | shift 2 || exit $$?; \ |
| 35 | done |
| 36 | endef |
| 37 | @@ -2781,7 +2781,7 @@ systemd_dbus1_generator_LDADD = \ |
| 38 | dbus1-generator-install-hook: |
| 39 | $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) |
| 40 | $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator |
| 41 | - $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator |
| 42 | + $(AM_V_LN)lnr $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator |
| 43 | |
| 44 | dbus1-generator-uninstall-hook: |
| 45 | rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator |
| 46 | diff --git a/configure.ac b/configure.ac |
| 47 | index 0239fd0..c5ab9d0 100644 |
| 48 | --- a/configure.ac |
| 49 | +++ b/configure.ac |
| 50 | @@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin]) |
| 51 | AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin]) |
| 52 | AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]) |
| 53 | |
| 54 | -AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) |
| 55 | - |
| 56 | # check for few functions not implemented in uClibc |
| 57 | |
| 58 | AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate) |
| 59 | -- |
| 60 | 1.8.3.1 |
| 61 | |