diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-fs/xfsprogs/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'sys-fs/xfsprogs/files')
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch | 114 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch | 30 |
2 files changed, 0 insertions, 144 deletions
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch deleted file mode 100644 index 1080e4400944..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- xfsprogs-4.15.0/include/buildmacros -+++ xfsprogs-4.15.0/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-4.15.0/libfrog/Makefile -+++ xfsprogs-4.15.0/libfrog/Makefile -@@ -5,6 +5,8 @@ - TOPDIR = .. - include $(TOPDIR)/include/builddefs - -+LTLIBS = $(LIBXFS) $(LIBBLKID) -+ - LTLIBRARY = libfrog.la - LT_CURRENT = 0 - LT_REVISION = 0 -@@ -34,6 +36,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep ---- xfsprogs-4.15.0/libhandle/Makefile -+++ xfsprogs-4.15.0/libhandle/Makefile -@@ -24,7 +24,6 @@ - include $(BUILDRULES) - - install: default -- $(INSTALL_LTLIB) - - install-dev: default - $(INSTALL_LTLIB_DEV) ---- xfsprogs-4.15.0/libxcmd/Makefile -+++ xfsprogs-4.15.0/libxcmd/Makefile -@@ -12,6 +12,8 @@ - - CFILES = command.c input.c help.c quit.c - -+LTLIBS = $(LIBXFS) $(LIBBLKID) -+ - ifeq ($(ENABLE_READLINE),yes) - LCFLAGS += -DENABLE_READLINE - LTLIBS += $(LIBREADLINE) $(LIBTERMCAP) -@@ -26,6 +28,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep ---- xfsprogs-4.15.0/libxfs/Makefile -+++ xfsprogs-4.15.0/libxfs/Makefile -@@ -151,6 +151,7 @@ - - install-dev: install - $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR) -+ $(INSTALL_LTLIB_DEV) - - # 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 ---- xfsprogs-4.15.0/libxlog/Makefile -+++ xfsprogs-4.15.0/libxlog/Makefile -@@ -19,6 +19,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep ---- xfsprogs-4.15.0/Makefile -+++ xfsprogs-4.15.0/Makefile -@@ -92,6 +92,10 @@ - mkfs: libxcmd - spaceman: libxcmd - scrub: libhandle libxcmd -+libfrog: libxfs -+libfrog-install-dev: libxfs-install-dev -+libxlog: libxfs -+libxlog-install-dev: libxfs-install-dev - - ifeq ($(HAVE_BUILDDEFS), yes) - include $(BUILDRULES) diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch deleted file mode 100644 index e6904a53bc2a..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch +++ /dev/null @@ -1,30 +0,0 @@ - libxfs/Makefile | 2 +- - libxlog/Makefile | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libxfs/Makefile b/libxfs/Makefile -index 6499731..00447c4 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c - - FCFLAGS = -I. - --LTLIBS = $(LIBPTHREAD) $(LIBRT) -+LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID) - - # don't try linking xfs_repair with a debug libxfs. - DEBUG = -DNDEBUG -diff --git a/libxlog/Makefile b/libxlog/Makefile -index 3417eed..fda1343 100644 ---- a/libxlog/Makefile -+++ b/libxlog/Makefile -@@ -12,6 +12,8 @@ LT_AGE = 0 - - CFILES = xfs_log_recover.c util.c - -+LTLIBS = $(LIBUUID) -+ - # don't want to link xfs_repair with a debug libxlog. - DEBUG = -DNDEBUG - |