From 66aa43f9d35e90c2be8a226d57f30caa7a31f20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 23 Feb 2021 20:05:17 +0700 Subject: [PATCH 1/2] common/gnu-configure-args: set exec_prefix to ${prefix} autotools will pass its configure_args to subdir if required, if we don't init exec_prefix, it will pass --libdir=NONE/lib{32,64} to subdir configure. --- common/environment/configure/gnu-configure-args.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh index dafbf5dc110..c3ab67a7855 100644 --- a/common/environment/configure/gnu-configure-args.sh +++ b/common/environment/configure/gnu-configure-args.sh @@ -18,6 +18,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET" # This is to make sure 32-bit and 64-bit libs can coexist when looking # up things (the opposite-libdir is always symlinked as libNN) export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}" +export configure_args+=" --exec-prefix=\${prefix}" _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache From f62d18623abc89c390bf6cc806a78c9afcbc241a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 23 Feb 2021 20:15:14 +0700 Subject: [PATCH 2/2] openmpi: hostmakedepends+=pkg-config --- srcpkgs/openmpi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index f8ef1ef0779..6fbf3611328 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -4,7 +4,7 @@ version=4.1.0 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr" -hostmakedepends="gcc-fortran libgomp-devel perl" +hostmakedepends="gcc-fortran libgomp-devel perl pkg-config" makedepends="libgfortran-devel libgomp-devel libhwloc-devel zlib-devel" conf_files=" /etc/openmpi-default-hostfile