aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2024-04-30 11:17:20 -0500
committerBen Kohler <bkohler@gentoo.org>2024-04-30 11:17:20 -0500
commit890c3819be5628b59ad7b2610c9ab49200da8edd (patch)
treeb2fb941b93f0cf4fd28a6769e822521fed4d81d9
parentpatches/zlib: update for 1.3.1 (diff)
downloadgenkernel-890c3819be5628b59ad7b2610c9ab49200da8edd.tar.gz
genkernel-890c3819be5628b59ad7b2610c9ab49200da8edd.tar.bz2
genkernel-890c3819be5628b59ad7b2610c9ab49200da8edd.zip
gkbuilds/bcache-tools: really build new bcache-tools now
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
-rw-r--r--defaults/software.sh2
-rw-r--r--gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild (renamed from gkbuilds/bcache-tools.gkbuild)0
-rw-r--r--gkbuilds/bcache-tools-1.1_p20230217.gkbuild42
3 files changed, 43 insertions, 1 deletions
diff --git a/defaults/software.sh b/defaults/software.sh
index 01c504b..df7decc 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -13,7 +13,7 @@ GKPKG_BCACHE_TOOLS_PN="bcache-tools"
GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
-GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}"
+GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-a5e3753516bd39c431def86c8dfec8a9cea1ddd4}"
GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
GKPKG_BOOST_PN="boost"
diff --git a/gkbuilds/bcache-tools.gkbuild b/gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild
index 556e7f2..556e7f2 100644
--- a/gkbuilds/bcache-tools.gkbuild
+++ b/gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild
diff --git a/gkbuilds/bcache-tools-1.1_p20230217.gkbuild b/gkbuilds/bcache-tools-1.1_p20230217.gkbuild
new file mode 100644
index 0000000..720da66
--- /dev/null
+++ b/gkbuilds/bcache-tools-1.1_p20230217.gkbuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+src_prepare() {
+ default
+
+ tc-export CC
+ sed \
+ -e '/^CFLAGS/s:-O2::' \
+ -e '/^CFLAGS/s:-g::' \
+ -e '/.*INSTALL.*share\/man/d' \
+ -e '/.*INSTALL.*bcache-status/d' \
+ -i Makefile || die
+
+ append-lfs-flags
+}
+
+src_configure() {
+ append-ldflags -static
+}
+
+src_compile() {
+ PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \
+ gkmake V=1
+}
+
+src_install() {
+ mkdir -p "${D}"/usr/sbin "${D}$(get_udevdir)"/rules.d
+ gkmake V=1 UDEVLIBDIR="$(get_udevdir)" DESTDIR="${D}" install
+
+ rm -rf \
+ "${D}"/lib \
+ "${D}"/usr/lib/initcpio \
+ "${D}"/usr/sbin \
+ "${D}"/usr/share
+
+ "${STRIP}" --strip-all "${D}"/usr/lib/udev/bcache-register \
+ || die "Failed to strip '${D}/usr/lib/udev/bcache-register'!"
+
+ "${STRIP}" --strip-all "${D}"/usr/lib/udev/probe-bcache \
+ || die "Failed to strip '${D}/usr/lib/udev/probe-bcache'!"
+}