1*4882a593SmuzhiyunFrom d5cbb4f43cc9c30100fbf18a3e0d1fb95e1c1b0a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 3*4882a593SmuzhiyunDate: Wed, 25 Nov 2015 10:50:00 +0000 4*4882a593SmuzhiyunSubject: [PATCH] mdrestore, scrub: do not do dynamic linking of libtool 5*4882a593Smuzhiyun libraries 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunAs explained in commit ece49daeff1a3cad765e106d678c608925c9d768, use 8*4882a593Smuzhiyun-static-libtool-libs instead of -static to allow fallback to the dynamic 9*4882a593Smuzhiyunlinking for libuuid only. Otherwise the build will fail like this: 10*4882a593Smuzhiyun 11*4882a593Smuzhiyunld: attempted static link of dynamic object `/usr/lib/libuuid.so' 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 14*4882a593Smuzhiyun[Sent upstream: https://www.spinics.net/lists/xfs/msg36149.html] 15*4882a593Smuzhiyun[baruch: update for v4.15.1; extend to include scrub] 16*4882a593SmuzhiyunSigned-off-by: Baruch Siach <baruch@tkos.co.il> 17*4882a593Smuzhiyun[matt: update for v4.16.1; adjusted libunistring -> libicu] 18*4882a593SmuzhiyunSigned-off-by: Matt Weber <matthew.weber@rockwellcollins.com> 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun mdrestore/Makefile | 2 +- 21*4882a593Smuzhiyun scrub/Makefile | 2 +- 22*4882a593Smuzhiyun 2 files changed, 2 insertions(+), 2 deletions(-) 23*4882a593Smuzhiyun 24*4882a593Smuzhiyundiff --git a/mdrestore/Makefile b/mdrestore/Makefile 25*4882a593Smuzhiyunindex 136ae716d691..75ff1bad78e9 100644 26*4882a593Smuzhiyun--- a/mdrestore/Makefile 27*4882a593Smuzhiyun+++ b/mdrestore/Makefile 28*4882a593Smuzhiyun@@ -10,7 +10,7 @@ CFILES = xfs_mdrestore.c 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun LLDLIBS = $(LIBXFS) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) 31*4882a593Smuzhiyun LTDEPENDENCIES = $(LIBXFS) $(LIBFROG) 32*4882a593Smuzhiyun-LLDFLAGS = -static 33*4882a593Smuzhiyun+LLDFLAGS = -static-libtool-libs 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun default: depend $(LTCOMMAND) 36*4882a593Smuzhiyun 37*4882a593Smuzhiyundiff --git a/scrub/Makefile b/scrub/Makefile 38*4882a593Smuzhiyunindex 063279400262..949f6fd8ba94 100644 39*4882a593Smuzhiyun--- a/scrub/Makefile 40*4882a593Smuzhiyun+++ b/scrub/Makefile 41*4882a593Smuzhiyun@@ -70,7 +70,7 @@ xfs_scrub.c 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBICU_LIBS) $(LIBRT) 44*4882a593Smuzhiyun LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) 45*4882a593Smuzhiyun-LLDFLAGS = -static 46*4882a593Smuzhiyun+LLDFLAGS = -static-libtool-libs 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun ifeq ($(HAVE_MALLINFO),yes) 49*4882a593Smuzhiyun LCFLAGS += -DHAVE_MALLINFO 50*4882a593Smuzhiyun-- 51*4882a593Smuzhiyun2.16.2 52*4882a593Smuzhiyun 53