pyrox.dev / nixpkgs
lol
fork atom

xfsprogs: 3.2.2 -> 4.2.0

William A. Kennington III 5293bc13 a1db1119

+87 -116
unified split
+80
pkgs/tools/filesystems/xfsprogs/4.2.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) 6 + INSTALL_LTLIB_DEV = \ 7 + - cd $(TOPDIR)/$(LIBNAME)/.libs; \ 8 + - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ 9 + - ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ 10 + - ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ 11 + - ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ 12 + - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ 13 + - if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ 14 + - "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \ 15 + - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ 16 + - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ 17 + - ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ 18 + - fi 19 + + set -e; cd $(TOPDIR)/$(LIBNAME); \ 20 + + $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ 21 + + env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la 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) 30 + 31 + -install install-dev: default 32 + +install: default 33 + + 34 + +install-dev: default 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 43 + $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR) 44 + + $(INSTALL_LTLIB_DEV) 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 53 + 54 + +LTLIBS = $(LIBUUID) $(LIBXFS) 55 + + 56 + # don't want to link xfs_repair with a debug libxlog. 57 + DEBUG = -DNDEBUG 58 + 59 + @@ -19,6 +21,9 @@ 60 + 61 + include $(BUILDRULES) 62 + 63 + -install install-dev: default 64 + +install: default 65 + + 66 + +install-dev: default 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)
+7 -8
pkgs/tools/filesystems/xfsprogs/default.nix
··· 1 { stdenv, fetchurl, gettext, libuuid, readline }: 2 3 stdenv.mkDerivation rec { 4 - name = "xfsprogs-3.2.2"; 5 6 src = fetchurl { 7 urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") 8 [ "cmd_tars" "previous" ]; 9 - sha256 = "1aszsqz7gkqdagads18ybslbfkyxq893rykmsz9lm7f33pi5qlhs"; 10 }; 11 12 prePatch = '' 13 - sed -i s,/bin/bash,`type -P bash`,g install-sh 14 - sed -i s,ldconfig,`type -P ldconfig`,g configure m4/libtool.m4 15 16 # Fixes from gentoo 3.2.1 ebuild 17 sed -i "/^PKG_DOC_DIR/s:@pkg_name@:${name}:" include/builddefs.in 18 - sed -i '1iLLDFLAGS = -static' {estimate,fsr}/Makefile 19 - sed -i "/LLDFLAGS/s:-static::" $(find -name Makefile) 20 sed -i '/LIB_SUBDIRS/s:libdisk::' Makefile 21 ''; 22 23 patches = [ 24 - # This patch fixes shared libs installation, still not fixed in 3.2.2 25 - ./xfsprogs-3.2.2-sharedlibs.patch 26 ]; 27 28 buildInputs = [ gettext libuuid readline ];
··· 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 = '' 13 + sed -i "s,/bin/bash,$(type -P bash),g" install-sh 14 + sed -i "s,ldconfig,$(type -P ldconfig),g" configure m4/libtool.m4 15 16 # Fixes from gentoo 3.2.1 ebuild 17 sed -i "/^PKG_DOC_DIR/s:@pkg_name@:${name}:" include/builddefs.in 18 + sed -i "/LLDFLAGS.*libtool-libs/d" $(find -name Makefile) 19 sed -i '/LIB_SUBDIRS/s:libdisk::' Makefile 20 ''; 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 ];
-108
pkgs/tools/filesystems/xfsprogs/xfsprogs-3.2.2-sharedlibs.patch
··· 1 - use libtool to do all installing. do not use the manual file install as 2 - that'll copy files directly from the .libs/ subdir which might have rpaths 3 - that we do not want. 4 - 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 @@ 32 - install: default 33 - 34 - install-dev: default 35 - + $(INSTALL_LTLIB_DEV) 36 - 37 - install-qa: install-dev 38 - 39 - --- xfsprogs-3.2.2/libhandle/Makefile 40 - +++ xfsprogs-3.2.2/libhandle/Makefile 41 - @@ -20,7 +20,6 @@ 42 - include $(BUILDRULES) 43 - 44 - install: default 45 - - $(INSTALL_LTLIB) 46 - 47 - install-dev: default 48 - $(INSTALL_LTLIB_DEV) 49 - --- xfsprogs-3.2.2/libxcmd/Makefile 50 - +++ xfsprogs-3.2.2/libxcmd/Makefile 51 - @@ -34,6 +34,11 @@ 52 - 53 - include $(BUILDRULES) 54 - 55 - -install install-dev install-qa: default 56 - +install: default 57 - + 58 - + install-dev: default 59 - + $(INSTALL_LTLIB_DEV) 60 - + 61 - +install-qa: default 62 - 63 - -include .ltdep 64 - --- xfsprogs-3.2.2/libxfs/Makefile 65 - +++ xfsprogs-3.2.2/libxfs/Makefile 66 - @@ -86,6 +86,7 @@ 67 - install: default 68 - 69 - install-dev: default 70 - + $(INSTALL_LTLIB_DEV) 71 - 72 - install-qa: default 73 - 74 - --- xfsprogs-3.2.2/libxlog/Makefile 75 - +++ xfsprogs-3.2.2/libxlog/Makefile 76 - @@ -12,6 +12,8 @@ 77 - 78 - CFILES = xfs_log_recover.c util.c 79 - 80 - +LTLIBS = $(LIBUUID) $(LIBXFS) 81 - + 82 - # don't want to link xfs_repair with a debug libxlog. 83 - DEBUG = -DNDEBUG 84 - 85 - @@ -19,6 +21,11 @@ 86 - 87 - include $(BUILDRULES) 88 - 89 - -install install-dev install-qa: default 90 - +install: default 91 - + 92 - +install-dev: default 93 - + $(INSTALL_LTLIB_DEV) 94 - + 95 - +install-qa: default 96 - 97 - -include .ltdep 98 - --- xfsprogs-3.2.2/Makefile 99 - +++ xfsprogs-3.2.2/Makefile 100 - @@ -63,6 +63,8 @@ 101 - mkfs: libxfs 102 - quota: libxcmd 103 - repair: libxfs libxlog 104 - +libxlog: libxfs 105 - +libxlog-install-dev: libxfs-install-dev 106 - 107 - ifneq ($(ENABLE_BLKID), yes) 108 - mkfs: libdisk
···