From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 15 Dec 2020 21:23:50 +0000 (+0100)
Subject: e2fsprogs: Add TARGET_LDFLAGS to e4crypt
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c9c7cdbbb7cb927586914be7cea9f7234e9f363b;p=openwrt%2Fstaging%2Frobimarko.git

e2fsprogs: Add TARGET_LDFLAGS to e4crypt

The TARGET_LDFLAGS were dropped in the linking of e4crypt.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index 8f3142b105..43ad42602a 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
 PKG_VERSION:=1.45.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
diff --git a/package/utils/e2fsprogs/patches/003-build-Add-SYSLIBS-to-e4crypt-linking.patch b/package/utils/e2fsprogs/patches/003-build-Add-SYSLIBS-to-e4crypt-linking.patch
new file mode 100644
index 0000000000..dad71cf0b3
--- /dev/null
+++ b/package/utils/e2fsprogs/patches/003-build-Add-SYSLIBS-to-e4crypt-linking.patch
@@ -0,0 +1,28 @@
+From e33ecf1595e390b2657018442c68ae824b3e13b4 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Tue, 15 Dec 2020 23:58:53 +0100
+Subject: [PATCH e2fsprogs] build: Add SYSLIBS to e4crypt linking
+
+The $(SYSLIBS) was missing when linking the e4crypt application. This is
+available in the e4crypt.profiled variant, so I assume this was just
+missing in the normal variant and is not left out intentionally.
+
+This fixes building e2fsprogrs with -fsanitize=undefined in the global
+CFLAGS nad LDFLAGS.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ misc/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -242,7 +242,7 @@ e4defrag: $(E4DEFRAG_OBJS) $(DEPLIBS)
+ e4crypt: $(E4CRYPT_OBJS) $(DEPLIBS) $(DEPSTATIC_LIBUUID)
+ 	$(E) "	LD $@"
+ 	$(Q) $(CC) $(ALL_LDFLAGS) -o e4crypt $(E4CRYPT_OBJS) \
+-		$(LIBUUID) $(LIBS)
++		$(LIBUUID) $(LIBS) $(SYSLIBS)
+ 
+ e4defrag.profiled: $(E4DEFRAG_OBJS) $(PROFILED_DEPLIBS)
+ 	$(E) "	LD $@"