pyrox.dev / nixpkgs
lol
fork atom

xfsprogs: 3.2.1 -> 3.2.2

William A. Kennington III 02f75f91 f8a4dc80

+48 -46
unified split
+4 -4
pkgs/tools/filesystems/xfsprogs/default.nix
··· 1 1 { stdenv, fetchurl, gettext, libuuid, readline }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "xfsprogs-3.2.1"; 4 + name = "xfsprogs-3.2.2"; 5 5 6 6 src = fetchurl { 7 7 urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") 8 8 [ "cmd_tars" "previous" ]; 9 - sha256 = "0rsp31qrz0wskr70dwzl5ignkac7j98j7m9cy6wl57zy716fmy43"; 9 + sha256 = "1aszsqz7gkqdagads18ybslbfkyxq893rykmsz9lm7f33pi5qlhs"; 10 10 }; 11 11 12 12 prePatch = '' ··· 21 21 ''; 22 22 23 23 patches = [ 24 - # This patch fixes shared libs installation, still not fixed in 3.2.1 25 - ./xfsprogs-3.1.11-sharelibs.patch 24 + # This patch fixes shared libs installation, still not fixed in 3.2.2 25 + ./xfsprogs-3.2.2-sharedlibs.patch 26 26 ]; 27 27 28 28 buildInputs = [ gettext libuuid readline ];
+44 -42
pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch pkgs/tools/filesystems/xfsprogs/xfsprogs-3.2.2-sharedlibs.patch
··· 2 2 that'll copy files directly from the .libs/ subdir which might have rpaths 3 3 that we do not want. 4 4 5 - --- a/libdisk/Makefile 6 - +++ b/libdisk/Makefile 7 - @@ -25,6 +25,7 @@ 5 + --- xfsprogs-3.2.2/include/buildmacros 6 + +++ xfsprogs-3.2.2/include/buildmacros 7 + @@ -70,18 +70,9 @@ 8 + # /usr/lib. 9 + ifeq ($(ENABLE_SHARED),yes) 10 + INSTALL_LTLIB_DEV = \ 11 + - cd $(TOPDIR)/$(LIBNAME)/.libs; \ 12 + - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ 13 + - ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ 14 + - ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ 15 + - ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ 16 + - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ 17 + - if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ 18 + - "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \ 19 + - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ 20 + - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ 21 + - ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ 22 + - fi 23 + + set -e; cd $(TOPDIR)/$(LIBNAME); \ 24 + + $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ 25 + + env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la 26 + else 27 + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) 28 + endif 29 + --- xfsprogs-3.2.2/libdisk/Makefile 30 + +++ xfsprogs-3.2.2/libdisk/Makefile 31 + @@ -31,6 +31,7 @@ 8 32 install: default 9 33 10 34 install-dev: default ··· 12 36 13 37 install-qa: install-dev 14 38 15 - --- a/libhandle/Makefile 16 - +++ b/libhandle/Makefile 39 + --- xfsprogs-3.2.2/libhandle/Makefile 40 + +++ xfsprogs-3.2.2/libhandle/Makefile 17 41 @@ -20,7 +20,6 @@ 18 42 include $(BUILDRULES) 19 43 ··· 22 46 23 47 install-dev: default 24 48 $(INSTALL_LTLIB_DEV) 25 - --- a/libxcmd/Makefile 26 - +++ b/libxcmd/Makefile 27 - @@ -32,6 +32,11 @@ 49 + --- xfsprogs-3.2.2/libxcmd/Makefile 50 + +++ xfsprogs-3.2.2/libxcmd/Makefile 51 + @@ -34,6 +34,11 @@ 28 52 29 53 include $(BUILDRULES) 30 54 31 55 -install install-dev install-qa: default 32 56 +install: default 33 57 + 34 - +install-dev: default 58 + + install-dev: default 35 59 + $(INSTALL_LTLIB_DEV) 36 60 + 37 61 +install-qa: default 38 62 39 - -include .dep 40 - --- a/libxfs/Makefile 41 - +++ b/libxfs/Makefile 42 - @@ -41,5 +41,6 @@ 63 + -include .ltdep 64 + --- xfsprogs-3.2.2/libxfs/Makefile 65 + +++ xfsprogs-3.2.2/libxfs/Makefile 66 + @@ -86,6 +86,7 @@ 43 67 install: default 44 68 45 69 install-dev: default 46 70 + $(INSTALL_LTLIB_DEV) 47 71 48 72 install-qa: default 49 - --- a/libxlog/Makefile 50 - +++ b/libxlog/Makefile 73 + 74 + --- xfsprogs-3.2.2/libxlog/Makefile 75 + +++ xfsprogs-3.2.2/libxlog/Makefile 51 76 @@ -12,6 +12,8 @@ 52 77 53 78 CFILES = xfs_log_recover.c util.c ··· 69 94 + 70 95 +install-qa: default 71 96 72 - -include .dep 73 - --- a/Makefile 74 - +++ b/Makefile 75 - @@ -66,6 +66,8 @@ 97 + -include .ltdep 98 + --- xfsprogs-3.2.2/Makefile 99 + +++ xfsprogs-3.2.2/Makefile 100 + @@ -63,6 +63,8 @@ 76 101 mkfs: libxfs 77 102 quota: libxcmd 78 103 repair: libxfs libxlog ··· 81 106 82 107 ifneq ($(ENABLE_BLKID), yes) 83 108 mkfs: libdisk 84 - --- a/include/buildmacros 85 - +++ b/include/buildmacros 86 - @@ -71,17 +71,9 @@ 87 - # /usr/lib. 88 - ifeq ($(ENABLE_SHARED),yes) 89 - INSTALL_LTLIB_DEV = \ 90 - - cd $(TOPDIR)/$(LIBNAME)/.libs; \ 91 - - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ 92 - - ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ 93 - - ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ 94 - - ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ 95 - - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ 96 - - if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ 97 - - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ 98 - - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ 99 - - ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ 100 - - fi 101 - + set -e; cd $(TOPDIR)/$(LIBNAME); \ 102 - + $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ 103 - + env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la 104 - else 105 - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) 106 - endif