| 1 |
commit: 7fdc2b2b1f8e029d38bc89c9b8ee894a02bdefdc |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 6 20:41:52 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 6 20:41:52 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7fdc2b2b |
| 7 |
|
| 8 |
Bump xfsprogs to v5.2.1 |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
gkbuilds/xfsprogs.gkbuild | 1 - |
| 13 |
.../5.1.0/xfsprogs-4.15.0-sharedlibs.patch | 105 --------------------- |
| 14 |
.../xfsprogs-4.9.0-underlinking.patch | 0 |
| 15 |
3 files changed, 106 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gkbuilds/xfsprogs.gkbuild b/gkbuilds/xfsprogs.gkbuild |
| 18 |
index 4456738..b16379f 100644 |
| 19 |
--- a/gkbuilds/xfsprogs.gkbuild |
| 20 |
+++ b/gkbuilds/xfsprogs.gkbuild |
| 21 |
@@ -15,7 +15,6 @@ src_configure() { |
| 22 |
unset PLATFORM # if set in user env, this breaks configure |
| 23 |
|
| 24 |
local myconf=( |
| 25 |
- --disable-lto #655638 |
| 26 |
--enable-blkid |
| 27 |
--disable-libicu |
| 28 |
--disable-gettext |
| 29 |
|
| 30 |
diff --git a/patches/xfsprogs/5.1.0/xfsprogs-4.15.0-sharedlibs.patch b/patches/xfsprogs/5.1.0/xfsprogs-4.15.0-sharedlibs.patch |
| 31 |
deleted file mode 100644 |
| 32 |
index a8911ce..0000000 |
| 33 |
--- a/patches/xfsprogs/5.1.0/xfsprogs-4.15.0-sharedlibs.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,105 +0,0 @@ |
| 36 |
---- xfsprogs-4.15.0/include/buildmacros |
| 37 |
-+++ xfsprogs-4.15.0/include/buildmacros |
| 38 |
-@@ -70,18 +70,9 @@ |
| 39 |
- # /usr/lib. |
| 40 |
- ifeq ($(ENABLE_SHARED),yes) |
| 41 |
- INSTALL_LTLIB_DEV = \ |
| 42 |
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \ |
| 43 |
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
| 44 |
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ |
| 45 |
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ |
| 46 |
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ |
| 47 |
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ |
| 48 |
-- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ |
| 49 |
-- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \ |
| 50 |
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ |
| 51 |
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ |
| 52 |
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ |
| 53 |
-- fi |
| 54 |
-+ set -e; cd $(TOPDIR)/$(LIBNAME); \ |
| 55 |
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
| 56 |
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la |
| 57 |
- else |
| 58 |
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) |
| 59 |
- endif |
| 60 |
---- xfsprogs-4.15.0/libfrog/Makefile |
| 61 |
-+++ xfsprogs-4.15.0/libfrog/Makefile |
| 62 |
-@@ -34,6 +36,9 @@ |
| 63 |
- |
| 64 |
- include $(BUILDRULES) |
| 65 |
- |
| 66 |
--install install-dev: default |
| 67 |
-+install: default |
| 68 |
-+ |
| 69 |
-+install-dev: default |
| 70 |
-+ $(INSTALL_LTLIB_DEV) |
| 71 |
- |
| 72 |
- -include .ltdep |
| 73 |
---- xfsprogs-4.15.0/libhandle/Makefile |
| 74 |
-+++ xfsprogs-4.15.0/libhandle/Makefile |
| 75 |
-@@ -24,7 +24,6 @@ |
| 76 |
- include $(BUILDRULES) |
| 77 |
- |
| 78 |
- install: default |
| 79 |
-- $(INSTALL_LTLIB) |
| 80 |
- |
| 81 |
- install-dev: default |
| 82 |
- $(INSTALL_LTLIB_DEV) |
| 83 |
---- xfsprogs-4.15.0/libxcmd/Makefile |
| 84 |
-+++ xfsprogs-4.15.0/libxcmd/Makefile |
| 85 |
-@@ -12,6 +12,8 @@ |
| 86 |
- |
| 87 |
- CFILES = command.c input.c help.c quit.c |
| 88 |
- |
| 89 |
-+LTLIBS = $(LIBXFS) $(LIBBLKID) |
| 90 |
-+ |
| 91 |
- ifeq ($(ENABLE_READLINE),yes) |
| 92 |
- LCFLAGS += -DENABLE_READLINE |
| 93 |
- LTLIBS += $(LIBREADLINE) $(LIBTERMCAP) |
| 94 |
-@@ -26,6 +28,9 @@ |
| 95 |
- |
| 96 |
- include $(BUILDRULES) |
| 97 |
- |
| 98 |
--install install-dev: default |
| 99 |
-+install: default |
| 100 |
-+ |
| 101 |
-+install-dev: default |
| 102 |
-+ $(INSTALL_LTLIB_DEV) |
| 103 |
- |
| 104 |
- -include .ltdep |
| 105 |
---- xfsprogs-4.15.0/libxfs/Makefile |
| 106 |
-+++ xfsprogs-4.15.0/libxfs/Makefile |
| 107 |
-@@ -151,6 +151,7 @@ |
| 108 |
- |
| 109 |
- install-dev: install |
| 110 |
- $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR) |
| 111 |
-+ $(INSTALL_LTLIB_DEV) |
| 112 |
- |
| 113 |
- # We need to install the headers before building the dependencies. If we |
| 114 |
- # include the .ltdep file, the makefile decides that it needs to build the |
| 115 |
---- xfsprogs-4.15.0/libxlog/Makefile |
| 116 |
-+++ xfsprogs-4.15.0/libxlog/Makefile |
| 117 |
-@@ -19,6 +19,9 @@ |
| 118 |
- |
| 119 |
- include $(BUILDRULES) |
| 120 |
- |
| 121 |
--install install-dev: default |
| 122 |
-+install: default |
| 123 |
-+ |
| 124 |
-+install-dev: default |
| 125 |
-+ $(INSTALL_LTLIB_DEV) |
| 126 |
- |
| 127 |
- -include .ltdep |
| 128 |
---- xfsprogs-4.15.0/Makefile |
| 129 |
-+++ xfsprogs-4.15.0/Makefile |
| 130 |
-@@ -92,6 +92,10 @@ |
| 131 |
- mkfs: libxcmd |
| 132 |
- spaceman: libxcmd |
| 133 |
- scrub: libhandle libxcmd |
| 134 |
-+#libxfs: libfrog |
| 135 |
-+#libfrog-install-dev: libxfs-install-dev |
| 136 |
-+#libxlog: libxfs |
| 137 |
-+#libxlog-install-dev: libxfs-install-dev |
| 138 |
- |
| 139 |
- ifeq ($(HAVE_BUILDDEFS), yes) |
| 140 |
- include $(BUILDRULES) |
| 141 |
|
| 142 |
diff --git a/patches/xfsprogs/5.1.0/xfsprogs-4.9.0-underlinking.patch b/patches/xfsprogs/5.2.1/xfsprogs-4.9.0-underlinking.patch |
| 143 |
similarity index 100% |
| 144 |
rename from patches/xfsprogs/5.1.0/xfsprogs-4.9.0-underlinking.patch |
| 145 |
rename to patches/xfsprogs/5.2.1/xfsprogs-4.9.0-underlinking.patch |
Archives