pyrox.dev / nixpkgs
lol
fork atom

xfsprogs: 4.2.0 -> 4.5.0

Tuomas Tynkkynen f80508df 34086084

+15 -26
unified split
+12 -23
pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch
··· 1 - --- xfsprogs-4.2.0/include/buildmacros 2 - +++ xfsprogs-4.2.0/include/buildmacros 3 @@ -70,18 +70,9 @@ 4 # /usr/lib. 5 ifeq ($(ENABLE_SHARED),yes) ··· 22 else 23 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) 24 endif 25 - --- xfsprogs-4.2.0/libxcmd/Makefile 26 - +++ xfsprogs-4.2.0/libxcmd/Makefile 27 @@ -34,6 +34,9 @@ 28 29 include $(BUILDRULES) ··· 35 + $(INSTALL_LTLIB_DEV) 36 37 -include .ltdep 38 - --- xfsprogs-4.2.0/libxfs/Makefile 39 - +++ xfsprogs-4.2.0/libxfs/Makefile 40 @@ -138,6 +138,7 @@ 41 42 install-dev: install ··· 45 46 # We need to install the headers before building the dependencies. If we 47 # include the .ltdep file, the makefile decides that it needs to build the 48 - --- xfsprogs-4.2.0/libxlog/Makefile 49 - +++ xfsprogs-4.2.0/libxlog/Makefile 50 @@ -12,6 +12,8 @@ 51 52 CFILES = xfs_log_recover.c util.c ··· 67 + $(INSTALL_LTLIB_DEV) 68 69 -include .ltdep 70 - --- xfsprogs-4.2.0/Makefile 71 - +++ xfsprogs-4.2.0/Makefile 72 - @@ -81,6 +81,8 @@ 73 - io: libxcmd libhandle 74 - quota: libxcmd 75 - repair: libxlog 76 - +libxlog: libxfs 77 - +libxlog-install-dev: libxfs-install-dev 78 - 79 - 80 - ifeq ($(HAVE_BUILDDEFS), yes) 81 - --- xfsprogs-4.2.0/quota/Makefile 82 - +++ xfsprogs-4.2.0/quota/Makefile 83 @@ -16,7 +16,6 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g") 84 85 LLDLIBS = $(LIBXCMD) ··· 88 89 ifeq ($(ENABLE_READLINE),yes) 90 LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP) 91 - --- xfsprogs-4.2.0/mdrestore/Makefile 92 - +++ xfsprogs-4.2.0/mdrestore/Makefile 93 @@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c 94 95 LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID)
··· 1 + --- xfsprogs-4.3.0/include/buildmacros 2 + +++ xfsprogs-4.3.0/include/buildmacros 3 @@ -70,18 +70,9 @@ 4 # /usr/lib. 5 ifeq ($(ENABLE_SHARED),yes) ··· 22 else 23 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) 24 endif 25 + --- xfsprogs-4.3.0/libxcmd/Makefile 26 + +++ xfsprogs-4.3.0/libxcmd/Makefile 27 @@ -34,6 +34,9 @@ 28 29 include $(BUILDRULES) ··· 35 + $(INSTALL_LTLIB_DEV) 36 37 -include .ltdep 38 + --- xfsprogs-4.3.0/libxfs/Makefile 39 + +++ xfsprogs-4.3.0/libxfs/Makefile 40 @@ -138,6 +138,7 @@ 41 42 install-dev: install ··· 45 46 # We need to install the headers before building the dependencies. If we 47 # include the .ltdep file, the makefile decides that it needs to build the 48 + --- xfsprogs-4.3.0/libxlog/Makefile 49 + +++ xfsprogs-4.3.0/libxlog/Makefile 50 @@ -12,6 +12,8 @@ 51 52 CFILES = xfs_log_recover.c util.c ··· 67 + $(INSTALL_LTLIB_DEV) 68 69 -include .ltdep 70 + --- xfsprogs-4.3.0/quota/Makefile 71 + +++ xfsprogs-4.3.0/quota/Makefile 72 @@ -16,7 +16,6 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g") 73 74 LLDLIBS = $(LIBXCMD) ··· 77 78 ifeq ($(ENABLE_READLINE),yes) 79 LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP) 80 + --- xfsprogs-4.3.0/mdrestore/Makefile 81 + +++ xfsprogs-4.3.0/mdrestore/Makefile 82 @@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c 83 84 LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID)
+3 -3
pkgs/tools/filesystems/xfsprogs/default.nix
··· 1 { stdenv, fetchurl, gettext, libuuid, readline }: 2 3 stdenv.mkDerivation rec { 4 - name = "xfsprogs-4.2.0"; 5 6 src = fetchurl { 7 urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") 8 [ "cmd_tars" "previous" ]; 9 - sha256 = "0q2j1rrh37kqyihaq5lc31xdi36lgg9asidaad0fada61ynv3six"; 10 }; 11 12 prePatch = '' ··· 21 22 patches = [ 23 # This patch fixes shared libs installation, still not fixed in 4.2.0 24 - ./4.2.0-sharedlibs.patch 25 ]; 26 27 buildInputs = [ gettext libuuid readline ];
··· 1 { stdenv, fetchurl, gettext, libuuid, readline }: 2 3 stdenv.mkDerivation rec { 4 + name = "xfsprogs-4.5.0"; 5 6 src = fetchurl { 7 urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") 8 [ "cmd_tars" "previous" ]; 9 + sha256 = "1y49rwvbbvqdq2a1x7p5i05bcfyv6xhmrfwafl6vvvw494qyp6z4"; 10 }; 11 12 prePatch = '' ··· 21 22 patches = [ 23 # This patch fixes shared libs installation, still not fixed in 4.2.0 24 + ./4.3.0-sharedlibs.patch 25 ]; 26 27 buildInputs = [ gettext libuuid readline ];