diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-09-19 18:21:05 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-09-19 18:21:05 -0700 |
| commit | 2c40aca91dcdd17f4f084ede2d3e4326a22582bd (patch) | |
| tree | ab2c63185e4d55cca8e5bd77926a7777e1e988cc /pkgs/tools | |
| parent | 0001e4819e26046accfb49059a6624679643ebb1 (diff) | |
| download | nixlib-2c40aca91dcdd17f4f084ede2d3e4326a22582bd.tar nixlib-2c40aca91dcdd17f4f084ede2d3e4326a22582bd.tar.gz nixlib-2c40aca91dcdd17f4f084ede2d3e4326a22582bd.tar.bz2 nixlib-2c40aca91dcdd17f4f084ede2d3e4326a22582bd.tar.lz nixlib-2c40aca91dcdd17f4f084ede2d3e4326a22582bd.tar.xz nixlib-2c40aca91dcdd17f4f084ede2d3e4326a22582bd.tar.zst nixlib-2c40aca91dcdd17f4f084ede2d3e4326a22582bd.zip | |
xfsprogs: Add missing patch
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch b/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch new file mode 100644 index 000000000000..38599bd651fa --- /dev/null +++ b/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch @@ -0,0 +1,106 @@ +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 @@ + install: default + + install-dev: default ++ $(INSTALL_LTLIB_DEV) + + install-qa: install-dev + +--- a/libhandle/Makefile ++++ b/libhandle/Makefile +@@ -20,7 +20,6 @@ + include $(BUILDRULES) + + install: default +- $(INSTALL_LTLIB) + + install-dev: default + $(INSTALL_LTLIB_DEV) +--- a/libxcmd/Makefile ++++ b/libxcmd/Makefile +@@ -32,6 +32,11 @@ + + include $(BUILDRULES) + +-install install-dev install-qa: default ++install: default ++ ++install-dev: default ++ $(INSTALL_LTLIB_DEV) ++ ++install-qa: default + + -include .dep +--- a/libxfs/Makefile ++++ b/libxfs/Makefile +@@ -41,5 +41,6 @@ + install: default + + install-dev: default ++ $(INSTALL_LTLIB_DEV) + + install-qa: default +--- a/libxlog/Makefile ++++ b/libxlog/Makefile +@@ -12,6 +12,8 @@ + + CFILES = xfs_log_recover.c util.c + ++LTLIBS = $(LIBUUID) $(LIBXFS) ++ + # don't want to link xfs_repair with a debug libxlog. + DEBUG = -DNDEBUG + +@@ -19,6 +21,11 @@ + + include $(BUILDRULES) + +-install install-dev install-qa: default ++install: default ++ ++install-dev: default ++ $(INSTALL_LTLIB_DEV) ++ ++install-qa: default + + -include .dep +--- a/Makefile ++++ b/Makefile +@@ -66,6 +66,8 @@ + mkfs: libxfs + quota: libxcmd + repair: libxfs libxlog ++libxlog: libxfs ++libxlog-install-dev: libxfs-install-dev + + 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 |