forked from pool/systemd
Marcus Meissner
f35f0221c2
- Update to new upstream release 218 I really want networkd with a functioning machinectl --network-veth (broken in 13.2). OBS-URL: https://build.opensuse.org/request/show/280821 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=844
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
---
|
|
Makefile.am | 4 ++++
|
|
Makefile.in | 2 +-
|
|
configure.ac | 4 ----
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
Index: systemd-218/Makefile.am
|
|
===================================================================
|
|
--- systemd-218.orig/Makefile.am
|
|
+++ systemd-218/Makefile.am
|
|
@@ -4695,6 +4695,10 @@ systemd_cryptsetup_CFLAGS = \
|
|
$(AM_CFLAGS) \
|
|
$(LIBCRYPTSETUP_CFLAGS)
|
|
|
|
+systemd_cryptsetup_LDFLAGS = \
|
|
+ $(AM_LDFLAGS) \
|
|
+ -Wl,-rpath-link=$(top_srcdir)/.libs
|
|
+
|
|
systemd_cryptsetup_LDADD = \
|
|
libsystemd-label.la \
|
|
libudev-internal.la \
|
|
Index: systemd-218/Makefile.in
|
|
===================================================================
|
|
--- systemd-218.orig/Makefile.in
|
|
+++ systemd-218/Makefile.in
|
|
@@ -11109,7 +11109,7 @@ src/cryptsetup/systemd_cryptsetup-crypts
|
|
|
|
systemd-cryptsetup$(EXEEXT): $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_DEPENDENCIES) $(EXTRA_systemd_cryptsetup_DEPENDENCIES)
|
|
@rm -f systemd-cryptsetup$(EXEEXT)
|
|
- $(AM_V_CCLD)$(systemd_cryptsetup_LINK) $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_LDADD) $(LIBS)
|
|
+ $(AM_V_CCLD)$(systemd_cryptsetup_LINK) $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_LDFLAGS) $(systemd_cryptsetup_LDADD) $(LIBS)
|
|
src/cryptsetup/cryptsetup-generator.$(OBJEXT): \
|
|
src/cryptsetup/$(am__dirstamp) \
|
|
src/cryptsetup/$(DEPDIR)/$(am__dirstamp)
|
|
Index: systemd-218/configure.ac
|
|
===================================================================
|
|
--- systemd-218.orig/configure.ac
|
|
+++ systemd-218/configure.ac
|
|
@@ -206,10 +206,6 @@ AS_CASE([$CC], [*clang*],
|
|
-Wno-gnu-variable-sized-type-not-at-end \
|
|
])])
|
|
|
|
-AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
|
|
- [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
|
|
- -flto -ffat-lto-objects])],
|
|
- [AC_MSG_RESULT([skipping -flto, optimization not enabled])])
|
|
AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags")
|
|
|
|
AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
|