diff options
| -rw-r--r-- | user/f2fs-tools/0001-mkfs-link-using-libf2fs.la.patch | 14 | ||||
| -rw-r--r-- | user/f2fs-tools/APKBUILD | 15 | ||||
| -rw-r--r-- | user/f2fs-tools/slibtoolize.patch | 10 |
3 files changed, 36 insertions, 3 deletions
diff --git a/user/f2fs-tools/0001-mkfs-link-using-libf2fs.la.patch b/user/f2fs-tools/0001-mkfs-link-using-libf2fs.la.patch new file mode 100644 index 000000000..b63ea3d72 --- /dev/null +++ b/user/f2fs-tools/0001-mkfs-link-using-libf2fs.la.patch @@ -0,0 +1,14 @@ +diff '--color=auto' -Nurd f2fs-tools-1.14.0/mkfs/Makefile.am f2fs-tools-1.14.0.new/mkfs/Makefile.am +--- f2fs-tools-1.14.0/mkfs/Makefile.am 2020-08-24 14:55:54.000000000 -0700 ++++ f2fs-tools-1.14.0.new/mkfs/Makefile.am 2025-06-16 13:48:36.277041551 -0700 +@@ -11,8 +11,8 @@ + lib_LTLIBRARIES = libf2fs_format.la + libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c + libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD +-libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} ${libuuid_LIBS} -L$(top_builddir)/lib -lf2fs \ +- -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) ++libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} ${libuuid_LIBS} -L$(top_builddir)/lib \ ++ $(top_builddir)/lib/libf2fs.la -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) + + install-exec-hook: + if test -n "$(root_libdir)" -a "$(libdir)" != "$(root_libdir)" -a \ diff --git a/user/f2fs-tools/APKBUILD b/user/f2fs-tools/APKBUILD index 59246c22e..efbcb3deb 100644 --- a/user/f2fs-tools/APKBUILD +++ b/user/f2fs-tools/APKBUILD @@ -9,9 +9,13 @@ arch="all" options="!check" # No test suite. license="GPL-2.0+ OR LGPL-2.1+" depends="" -makedepends="automake autoconf bsd-compat-headers libtool util-linux-dev linux-headers" +makedepends="automake autoconf bsd-compat-headers slibtool util-linux-dev linux-headers" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" -source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$pkgname-$pkgver.tar.gz" +source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$pkgname-$pkgver.tar.gz + slibtoolize.patch + 0001-mkfs-link-using-libf2fs.la.patch" +# XXX use version from https://bugs.gentoo.org/show_bug.cgi?id=929070 +# when updating #secfixes: # 1.14.0-r0: @@ -23,6 +27,9 @@ source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snap prepare() { default_prepare + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" ./autogen.sh } @@ -39,4 +46,6 @@ package() { install -D -m644 mkfs/f2fs_format_utils.h "$pkgdir"/usr/include/ } -sha512sums="951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d f2fs-tools-1.14.0.tar.gz" +sha512sums="951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d f2fs-tools-1.14.0.tar.gz +267a45f9226e0a76df433ffa8777173f9eedd4fa3562534ad50e2cb972970acad5ea1b2d4914cb256dd91b4290afcd047a60a4e4e3f474d50f1ef8e7e0500481 slibtoolize.patch +899e122046e36bb5ee5b1ece9bce4cfcc905cbdf959050afe66f6f517e786296e5fae9dc05708765445e595d811f2d1d36af40152ee2623974e03feae8c5a759 0001-mkfs-link-using-libf2fs.la.patch" diff --git a/user/f2fs-tools/slibtoolize.patch b/user/f2fs-tools/slibtoolize.patch new file mode 100644 index 000000000..806f2a451 --- /dev/null +++ b/user/f2fs-tools/slibtoolize.patch @@ -0,0 +1,10 @@ +diff '--color=auto' -Nurd f2fs-tools-1.14.0/autogen.sh f2fs-tools-1.14.0.new/autogen.sh +--- f2fs-tools-1.14.0/autogen.sh 2020-08-24 14:55:54.000000000 -0700 ++++ f2fs-tools-1.14.0.new/autogen.sh 2025-06-16 13:34:52.090015289 -0700 +@@ -3,5 +3,5 @@ + aclocal && \ + autoheader && \ + autoconf && \ +-libtoolize && \ ++slibtoolize && \ + automake -a -c |