commit: 7fdc2b2b1f8e029d38bc89c9b8ee894a02bdefdc
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 20:41:52 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 6 20:41:52 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7fdc2b2b
Bump xfsprogs to v5.2.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gkbuilds/xfsprogs.gkbuild | 1 -
.../5.1.0/xfsprogs-4.15.0-sharedlibs.patch | 105 ---------------------
.../xfsprogs-4.9.0-underlinking.patch | 0
3 files changed, 106 deletions(-)
diff --git a/gkbuilds/xfsprogs.gkbuild b/gkbuilds/xfsprogs.gkbuild
index 4456738..b16379f 100644
--- a/gkbuilds/xfsprogs.gkbuild
+++ b/gkbuilds/xfsprogs.gkbuild
@@ -15,7 +15,6 @@ src_configure() {
unset PLATFORM # if set in user env, this breaks configure
local myconf=(
- --disable-lto #655638
--enable-blkid
--disable-libicu
--disable-gettext
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
deleted file mode 100644
index a8911ce..0000000
--- a/patches/xfsprogs/5.1.0/xfsprogs-4.15.0-sharedlibs.patch
+++ /dev/null
@@ -1,105 +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
-@@ -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
-+#libxfs: libfrog
-+#libfrog-install-dev: libxfs-install-dev
-+#libxlog: libxfs
-+#libxlog-install-dev: libxfs-install-dev
-
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
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
similarity index 100%
rename from patches/xfsprogs/5.1.0/xfsprogs-4.9.0-underlinking.patch
rename to patches/xfsprogs/5.2.1/xfsprogs-4.9.0-underlinking.patch
