public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfsprogs: 4.2.0 -> 4.5.0

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-08-08 16:45:56 +03:00
parent 34086084fc
commit f80508df5f
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch → pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch
View File

@ -1,5 +1,5 @@
--- xfsprogs-4.2.0/include/buildmacros --- xfsprogs-4.3.0/include/buildmacros
+++ xfsprogs-4.2.0/include/buildmacros +++ xfsprogs-4.3.0/include/buildmacros
@@ -70,18 +70,9 @@ @@ -70,18 +70,9 @@
# /usr/lib. # /usr/lib.
ifeq ($(ENABLE_SHARED),yes) ifeq ($(ENABLE_SHARED),yes)
@ -22,8 +22,8 @@
else else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
endif endif
--- xfsprogs-4.2.0/libxcmd/Makefile --- xfsprogs-4.3.0/libxcmd/Makefile
+++ xfsprogs-4.2.0/libxcmd/Makefile +++ xfsprogs-4.3.0/libxcmd/Makefile
@@ -34,6 +34,9 @@ @@ -34,6 +34,9 @@
include $(BUILDRULES) include $(BUILDRULES)
@ -35,8 +35,8 @@
+ $(INSTALL_LTLIB_DEV) + $(INSTALL_LTLIB_DEV)
-include .ltdep -include .ltdep
--- xfsprogs-4.2.0/libxfs/Makefile --- xfsprogs-4.3.0/libxfs/Makefile
+++ xfsprogs-4.2.0/libxfs/Makefile +++ xfsprogs-4.3.0/libxfs/Makefile
@@ -138,6 +138,7 @@ @@ -138,6 +138,7 @@
install-dev: install install-dev: install
@ -45,8 +45,8 @@
# We need to install the headers before building the dependencies. If we # We need to install the headers before building the dependencies. If we
# include the .ltdep file, the makefile decides that it needs to build the # include the .ltdep file, the makefile decides that it needs to build the
--- xfsprogs-4.2.0/libxlog/Makefile --- xfsprogs-4.3.0/libxlog/Makefile
+++ xfsprogs-4.2.0/libxlog/Makefile +++ xfsprogs-4.3.0/libxlog/Makefile
@@ -12,6 +12,8 @@ @@ -12,6 +12,8 @@
CFILES = xfs_log_recover.c util.c CFILES = xfs_log_recover.c util.c
@ -67,19 +67,8 @@
+ $(INSTALL_LTLIB_DEV) + $(INSTALL_LTLIB_DEV)
-include .ltdep -include .ltdep
--- xfsprogs-4.2.0/Makefile --- xfsprogs-4.3.0/quota/Makefile
+++ xfsprogs-4.2.0/Makefile +++ xfsprogs-4.3.0/quota/Makefile
@@ -81,6 +81,8 @@
io: libxcmd libhandle
quota: libxcmd
repair: libxlog
+libxlog: libxfs
+libxlog-install-dev: libxfs-install-dev
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") @@ -16,7 +16,6 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
LLDLIBS = $(LIBXCMD) LLDLIBS = $(LIBXCMD)
@ -88,8 +77,8 @@
ifeq ($(ENABLE_READLINE),yes) ifeq ($(ENABLE_READLINE),yes)
LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP) LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
--- xfsprogs-4.2.0/mdrestore/Makefile --- xfsprogs-4.3.0/mdrestore/Makefile
+++ xfsprogs-4.2.0/mdrestore/Makefile +++ xfsprogs-4.3.0/mdrestore/Makefile
@@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c @@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c
LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID)

6
pkgs/tools/filesystems/xfsprogs/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, gettext, libuuid, readline }: { stdenv, fetchurl, gettext, libuuid, readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xfsprogs-4.2.0"; name = "xfsprogs-4.5.0";
src = fetchurl { src = fetchurl {
urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz")
[ "cmd_tars" "previous" ]; [ "cmd_tars" "previous" ];
sha256 = "0q2j1rrh37kqyihaq5lc31xdi36lgg9asidaad0fada61ynv3six"; sha256 = "1y49rwvbbvqdq2a1x7p5i05bcfyv6xhmrfwafl6vvvw494qyp6z4";
}; };
prePatch = '' prePatch = ''
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
# This patch fixes shared libs installation, still not fixed in 4.2.0 # This patch fixes shared libs installation, still not fixed in 4.2.0
./4.2.0-sharedlibs.patch ./4.3.0-sharedlibs.patch
]; ];
buildInputs = [ gettext libuuid readline ]; buildInputs = [ gettext libuuid readline ];