From 8aa39887b1a394ffc190cfe778ec7743e1ef3b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 22 Jan 2020 22:00:58 +0100 Subject: [PATCH] drbd-utils: fix cross build --- srcpkgs/drbd-utils/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/drbd-utils/template b/srcpkgs/drbd-utils/template index c9b5fc2785..652d01a42f 100644 --- a/srcpkgs/drbd-utils/template +++ b/srcpkgs/drbd-utils/template @@ -3,6 +3,7 @@ pkgname=drbd-utils version=9.11.0 revision=1 build_style=gnu-configure +build_helper="qemu" configure_args=" --sbindir=/usr/bin \ --prefix=/usr \ @@ -41,11 +42,10 @@ pre_configure() { find -name "*.c" -exec sed -i "{}" -e 's#sys/poll\.h#poll.h#g' \; find -name Makefile.in -exec sed -i "{}" -e 's#$(DESTDIR)/lib#$(DESTDIR)/usr/lib#g' \; if [ -n "$CROSS_BUILD" ]; then - # Replace drbdsetup{,-83,84} with the /usr/bin or /usr/libexec counterparts - find -name Makefile.in -exec sed -i "{}" \ - -e 's#^\(\s\)../../user/v83/drbdsetup-83#\1/usr/libexec/drbdsetup-83#' \ - -e 's#^\(\s\)../../user/v84/drbdsetup-84#\1/usr/libexec/drbdsetup-84#' \ - -e 's#^\(\s\)../../user/v9/drbdsetup#\1/usr/bin/drbdsetup#' \ + # Replace drbdsetup{,-84,9} with the /usr/bin or /usr/libexec counterparts + find -name "Makefile*" -exec sed -i "{}" \ + -e 's#^\(\s\)$(TOPDIR)/user/v84/drbdsetup-84#\1/usr/libexec/drbdsetup-84#' \ + -e 's#^\(\s\)$(TOPDIR)/user/v9/drbdsetup#\1/usr/bin/drbdsetup#' \ \; fi }