333dccb144
Other changes:
- Removed the following patches due to being merged upstream:
- resolved-bugfix-of-null-pointer-p-question-dereferencing.patch
- resolved-simplify-alloc-size-calculation.patch
- resolved-do-not-allocate-packets-with-minimum-size.patch
- Updated the following patches to work with 234:
- fix-getty-unit.patch
- build-check-for-ln-relative.patch
- fix-am-path-libgcrypt-no-found.patch
- Updated ordering of remaining patches.
- Reformatted remaining patches as git style patches.
- Updated Upstream-Status comment in "build-check-for-ln-relative.patch" to
"Denied [No desire to support building on old distributions]"
Signed-off-by: Adam Duskett <aduskett@gmail.com>
Tested-by: Marcus Hoffmann <m.hoffmann@caretelsol.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
99 lines
3.5 KiB
Diff
99 lines
3.5 KiB
Diff
From b60e16cc2ef8c9b4c05c4348a980d3312f2e1cb4 Mon Sep 17 00:00:00 2001
|
|
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
Date: Fri, 28 Jul 2017 07:04:07 -0400
|
|
Subject: [PATCH] build: check for ln --relative
|
|
|
|
ln --relative is recent enough that not all distributions support it.
|
|
This is especially the case for enterprise-grade distributions than can
|
|
have a life-span of more than a decade.
|
|
|
|
Detect if ln supports --relative and use it if so.
|
|
|
|
If not supported, use a bit of sed magic to construct the ../ sequence,
|
|
that leads back to / when appended to the destination directory.
|
|
|
|
We introduce this as a macro that expands to a single command. To avoid
|
|
complexity in the macro, we expect paths to be passed whitout the
|
|
leading DESTDIR.
|
|
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
[Adam: Refresh for 234]
|
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
---
|
|
Upstream-Status: Denied [No desire to support building on old distributions]
|
|
https://github.com/systemd/systemd/pull/5682
|
|
|
|
Makefile.am | 25 ++++++++++++++++++++++---
|
|
configure.ac | 5 ++++-
|
|
2 files changed, 26 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index c16e622..bed097f 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -305,6 +305,24 @@ install-busnames-target-wants-hook:
|
|
what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
|
|
what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
|
|
|
|
+# Macro to emulate ln --relative when needed
|
|
+# $(1): options for ln, except --relative
|
|
+# $(2): source file, absolute path without leading DESTDIR
|
|
+# $(3): destination file, absolute path without leading DESTDIR
|
|
+if HAVE_LN_RELATIVE
|
|
+define ln-s-relative
|
|
+ $(LN_S) --relative $(1) \
|
|
+ $(DESTDIR)$(strip $(2)) \
|
|
+ $(DESTDIR)$(strip $(3))
|
|
+endef
|
|
+else
|
|
+define ln-s-relative
|
|
+ $(LN_S) $(1) \
|
|
+ `dirname $(strip $(3)) |sed -r -e 's:/+[^/]+:../:g; s:/$$::'`$(strip $(2)) \
|
|
+ $(DESTDIR)$(strip $(3))
|
|
+endef
|
|
+endif
|
|
+
|
|
define add-wants
|
|
[ -z "$$what" ] || ( \
|
|
dir=$(DESTDIR)$$dir/$$wants.wants && \
|
|
@@ -318,8 +336,9 @@ install-directories-hook:
|
|
$(MKDIR_P) $(addprefix $(DESTDIR),$(INSTALL_DIRS))
|
|
|
|
install-environment-conf-hook: install-directories-hook
|
|
- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(sysconfdir)/environment \
|
|
- $(DESTDIR)$(environmentdir)/99-environment.conf
|
|
+ $(AM_V_LN)$(call ln-s-relative,-f,\
|
|
+ $(sysconfdir)/environment,\
|
|
+ $(environmentdir)/99-environment.conf)
|
|
|
|
install-aliases-hook:
|
|
set -- $(SYSTEM_UNIT_ALIASES) && \
|
|
@@ -342,7 +361,7 @@ define install-relative-aliases
|
|
while [ -n "$$1" ]; do \
|
|
$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
|
|
rm -f $(DESTDIR)$$dir/$$2 && \
|
|
- $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
|
|
+ $(call ln-s-relative,,$$1,$$dir/$$2) && \
|
|
shift 2 || exit $$?; \
|
|
done
|
|
endef
|
|
diff --git a/configure.ac b/configure.ac
|
|
index c7537aa..9354441 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -109,7 +109,10 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
|
|
AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
|
|
AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
|
|
|
|
-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
|
|
+AC_MSG_CHECKING([if ln supports --relative])
|
|
+AS_IF([! ${LN_S} --relative --help > /dev/null 2>&1], [ln_relative=no], [ln_relative=yes])
|
|
+AC_MSG_RESULT([$ln_relative])
|
|
+AM_CONDITIONAL([HAVE_LN_RELATIVE], [test "x$ln_relative" = "xyes"])
|
|
|
|
M4_DEFINES=
|
|
|
|
--
|
|
2.13.3
|
|
|