Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=d6579b091c412771a6882a45c943906034de4ed2
commit d6579b091c412771a6882a45c943906034de4ed2 Author: crazy <cr...@frugalware.org> Date: Sun Jan 28 19:43:21 2018 +0100 xfsprogs-4.14.0-2-x86_64 * rebuild with tc * rename copy_file_range() since conflicts with the glibc one now diff --git a/source/base/xfsprogs/FrugalBuild b/source/base/xfsprogs/FrugalBuild index 79eccf1..f8989de 100644 --- a/source/base/xfsprogs/FrugalBuild +++ b/source/base/xfsprogs/FrugalBuild @@ -3,17 +3,19 @@ pkgname=xfsprogs pkgver=4.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="XFS filesystem-specific static libraries and headers." url="http://xfs.org"; -depends=('glibc>=2.25-5' 'libuuid>=2.29.2-3') -makedepends=('xfsprogs-attr>=2.4.47-6' 'e2fsprogs>=1.43.3-2' 'util-linux>=2.28.2-2') +depends=('glibc>=2.26.9000-3' 'libuuid>=2.31.1-3' 'readline>=7.0-2') +makedepends=('xfsprogs-attr>=2.4.47-6' 'e2fsprogs>=1.43.3-2' 'util-linux>=2.31.1-3') groups=('base') archs=('x86_64') replaces=('xfsprogs-base') up2date="Flasttar https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/"; -source=(https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${pkgname}-${pkgver}.tar.xz) -sha1sums=('6bea27217709b3825f48e15f8b32a27606976909') +source=(https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${pkgname}-${pkgver}.tar.xz \ + rename-copy_file_range.patch) +sha1sums=('6bea27217709b3825f48e15f8b32a27606976909' \ + 'b89cffbf17488aea25a6fc321c7b99e58a1b1eb5') build() { unset MAKEFLAGS @@ -31,10 +33,12 @@ build() { --libdir=/lib \ --includedir=/usr/include \ --datadir=/usr/share \ - --enable-shared=yes || Fdie + --enable-shared=yes \ + --enable-readline=yes \ + --enable-blkid=yes || Fdie - Fexec make -j1 || Fdie - Fexec make -j1 DIST_ROOT=$Fdestdir install install-dev || Fdie + Fexec make V=1 -j1 || Fdie + Fexec make V=1 -j1 DIST_ROOT=$Fdestdir install install-dev || Fdie ## FIXME ## this is strange .. we cannot build without static off ## so lets TMP fix here.. diff --git a/source/base/xfsprogs/rename-copy_file_range.patch b/source/base/xfsprogs/rename-copy_file_range.patch new file mode 100644 index 0000000..6439331 --- /dev/null +++ b/source/base/xfsprogs/rename-copy_file_range.patch @@ -0,0 +1,21 @@ +diff -Naur xfsprogs-4.14.0/io/copy_file_range.c xfsprogs-4.14.0-p/io/copy_file_range.c +--- xfsprogs-4.14.0/io/copy_file_range.c 2017-11-20 01:14:14.000000000 +0100 ++++ xfsprogs-4.14.0-p/io/copy_file_range.c 2018-01-28 19:35:51.268118456 +0100 +@@ -43,7 +43,7 @@ + } + + static loff_t +-copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len) ++copy_file_range_xfs(int fd, loff_t *src, loff_t *dst, size_t len) + { + loff_t ret; + +@@ -130,7 +130,7 @@ + copy_dst_truncate(); + } + +- ret = copy_file_range(fd, &src, &dst, len); ++ ret = copy_file_range_xfs(fd, &src, &dst, len); + close(fd); + return ret; + } diff --git a/source/base/xfsprogs/xfsprogs-4.7.0-sharedlibs.patch b/source/base/xfsprogs/xfsprogs-4.7.0-sharedlibs.patch deleted file mode 100644 index 422b6e5..0000000 --- a/source/base/xfsprogs/xfsprogs-4.7.0-sharedlibs.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -Naur xfsprogs-4.7.0/include/buildmacros xfsprogs-4.7.0-p/include/buildmacros ---- xfsprogs-4.7.0/include/buildmacros 2016-02-29 00:39:26.000000000 +0100 -+++ xfsprogs-4.7.0-p/include/buildmacros 2016-08-06 01:05:11.412205778 +0200 -@@ -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 -diff -Naur xfsprogs-4.7.0/libxcmd/Makefile xfsprogs-4.7.0-p/libxcmd/Makefile ---- xfsprogs-4.7.0/libxcmd/Makefile 2016-07-22 00:20:50.000000000 +0200 -+++ xfsprogs-4.7.0-p/libxcmd/Makefile 2016-08-06 01:05:11.412205778 +0200 -@@ -34,6 +34,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep -diff -Naur xfsprogs-4.7.0/libxfs/Makefile xfsprogs-4.7.0-p/libxfs/Makefile ---- xfsprogs-4.7.0/libxfs/Makefile 2016-07-22 00:20:33.000000000 +0200 -+++ xfsprogs-4.7.0-p/libxfs/Makefile 2016-08-06 01:05:26.209205467 +0200 -@@ -138,6 +138,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 -diff -Naur xfsprogs-4.7.0/libxlog/Makefile xfsprogs-4.7.0-p/libxlog/Makefile ---- xfsprogs-4.7.0/libxlog/Makefile 2016-02-29 00:39:26.000000000 +0100 -+++ xfsprogs-4.7.0-p/libxlog/Makefile 2016-08-06 01:05:11.412205778 +0200 -@@ -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,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep -diff -Naur xfsprogs-4.7.0/Makefile xfsprogs-4.7.0-p/Makefile ---- xfsprogs-4.7.0/Makefile 2016-07-22 00:20:50.000000000 +0200 -+++ xfsprogs-4.7.0-p/Makefile 2016-08-06 01:05:11.413205778 +0200 -@@ -82,8 +82,11 @@ - quota: libxcmd - repair: libxlog libxcmd - copy: libxlog -+libxlog: libxfs - mkfs: libxcmd - -+libxlog-install-dev: libxfs-install-dev -+ - ifeq ($(HAVE_BUILDDEFS), yes) - include $(BUILDRULES) - else _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
