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

xfsprogs: 3.2.1 -> 3.2.2

Browse Source
This commit is contained in:
William A. Kennington III 2014-12-16 15:22:53 -08:00
parent f8a4dc80b8
commit 02f75f91f1
2 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

86
pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch → pkgs/tools/filesystems/xfsprogs/xfsprogs-3.2.2-sharedlibs.patch
View File

@ -2,9 +2,33 @@ use libtool to do all installing. do not use the manual file install as
that'll copy files directly from the .libs/ subdir which might have rpaths
that we do not want.
--- a/libdisk/Makefile
+++ b/libdisk/Makefile
@@ -25,6 +25,7 @@
--- xfsprogs-3.2.2/include/buildmacros
+++ xfsprogs-3.2.2/include/buildmacros
@@ -70,18 +70,9 @@
# /usr/lib.
ifeq ($(ENABLE_SHARED),yes)
INSTALL_LTLIB_DEV = \
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
- fi
+ set -e; cd $(TOPDIR)/$(LIBNAME); \
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
endif
--- xfsprogs-3.2.2/libdisk/Makefile
+++ xfsprogs-3.2.2/libdisk/Makefile
@@ -31,6 +31,7 @@
install: default
install-dev: default
@ -12,8 +36,8 @@ that we do not want.
install-qa: install-dev
--- a/libhandle/Makefile
+++ b/libhandle/Makefile
--- xfsprogs-3.2.2/libhandle/Makefile
+++ xfsprogs-3.2.2/libhandle/Makefile
@@ -20,7 +20,6 @@
include $(BUILDRULES)
@ -22,32 +46,33 @@ that we do not want.
install-dev: default
$(INSTALL_LTLIB_DEV)
--- a/libxcmd/Makefile
+++ b/libxcmd/Makefile
@@ -32,6 +32,11 @@
--- xfsprogs-3.2.2/libxcmd/Makefile
+++ xfsprogs-3.2.2/libxcmd/Makefile
@@ -34,6 +34,11 @@
include $(BUILDRULES)
-install install-dev install-qa: default
+install: default
+
+install-dev: default
+ install-dev: default
+ $(INSTALL_LTLIB_DEV)
+
+install-qa: default
-include .dep
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -41,5 +41,6 @@
-include .ltdep
--- xfsprogs-3.2.2/libxfs/Makefile
+++ xfsprogs-3.2.2/libxfs/Makefile
@@ -86,6 +86,7 @@
install: default
install-dev: default
+ $(INSTALL_LTLIB_DEV)
install-qa: default
--- a/libxlog/Makefile
+++ b/libxlog/Makefile
--- xfsprogs-3.2.2/libxlog/Makefile
+++ xfsprogs-3.2.2/libxlog/Makefile
@@ -12,6 +12,8 @@
CFILES = xfs_log_recover.c util.c
@ -69,10 +94,10 @@ that we do not want.
+
+install-qa: default
-include .dep
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,8 @@
-include .ltdep
--- xfsprogs-3.2.2/Makefile
+++ xfsprogs-3.2.2/Makefile
@@ -63,6 +63,8 @@
mkfs: libxfs
quota: libxcmd
repair: libxfs libxlog
@ -81,26 +106,3 @@ that we do not want.
ifneq ($(ENABLE_BLKID), yes)
mkfs: libdisk
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -71,17 +71,9 @@
# /usr/lib.
ifeq ($(ENABLE_SHARED),yes)
INSTALL_LTLIB_DEV = \
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
- fi
+ set -e; cd $(TOPDIR)/$(LIBNAME); \
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
endif