summary refs log tree commit diff
path: root/pkgs/tools/filesystems/xfsprogs
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-11-19 23:40:55 +0200
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-11-20 00:17:23 +0200
commit24480efffc7d1f333f6bee1923a3a9adfda4b27b (patch)
tree875eeed320407132b650186adab143a3d24def33 /pkgs/tools/filesystems/xfsprogs
parent7ae05edcdd14f6ace83ead9bf0d114e97c89a83a (diff)
downloadnixlib-24480efffc7d1f333f6bee1923a3a9adfda4b27b.tar
nixlib-24480efffc7d1f333f6bee1923a3a9adfda4b27b.tar.gz
nixlib-24480efffc7d1f333f6bee1923a3a9adfda4b27b.tar.bz2
nixlib-24480efffc7d1f333f6bee1923a3a9adfda4b27b.tar.lz
nixlib-24480efffc7d1f333f6bee1923a3a9adfda4b27b.tar.xz
nixlib-24480efffc7d1f333f6bee1923a3a9adfda4b27b.tar.zst
nixlib-24480efffc7d1f333f6bee1923a3a9adfda4b27b.zip
xfsprogs: Extend patch to make xfs_mdrestore and xfs_quota work
Previously these tools were failing to start with:

xfs_mdrestore: error while loading shared libraries: libxfs.so.0: \
        cannot open shared object file: No such file or directory
xfs_quota: error while loading shared libraries: libxcmd.so.0: \
        cannot open shared object file: No such file or directory

Extend the 4.2.0-sharedlibs.patch to make those programs work as well.
Diffstat (limited to 'pkgs/tools/filesystems/xfsprogs')
-rw-r--r--pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch b/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch
index 86eb6f818690..c74b75b7e43f 100644
--- a/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch
+++ b/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch
@@ -78,3 +78,23 @@
  
  
  ifeq ($(HAVE_BUILDDEFS), yes)
+--- xfsprogs-4.2.0/quota/Makefile
++++ xfsprogs-4.2.0/quota/Makefile
+@@ -16,7 +16,6 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
+ 
+ LLDLIBS = $(LIBXCMD)
+ LTDEPENDENCIES = $(LIBXCMD)
+-LLDFLAGS = -static
+ 
+ ifeq ($(ENABLE_READLINE),yes)
+ LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
+--- xfsprogs-4.2.0/mdrestore/Makefile
++++ xfsprogs-4.2.0/mdrestore/Makefile
+@@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c
+ 
+ LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID)
+ LTDEPENDENCIES = $(LIBXFS)
+-LLDFLAGS = -static
+ 
+ default: depend $(LTCOMMAND)
+