From 82eec0d0231ab5de83b7de45b8898963fca05c9b Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 26 Jan 2019 19:38:27 +0100 Subject: [PATCH] common/build-style/waf,waf3: explicitly pass libdir Waf has a utility function ('lib64' in waflib/Utils.py) which either returns an empty string or '64' depending on if either of the paths '/usr/lib64' or '/usr/local/lib64' exist. Then, the build system itself decides its default LIBDIR to be either /usr/lib or /usr/lib64 depending on the result of that function, except when libdir is passed explicitly. We don't allow lib64 in our packages. We do have the /usr/lib64 path as that is a symlink. Therefore, do not ever allow waf to configure the path that way. --- common/build-style/waf.sh | 2 +- common/build-style/waf3.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/build-style/waf.sh b/common/build-style/waf.sh index 01e7643bd9..88e908247a 100644 --- a/common/build-style/waf.sh +++ b/common/build-style/waf.sh @@ -4,7 +4,7 @@ do_configure() { : ${configure_script:=waf} - PYTHON=/usr/bin/python2 python2 ${configure_script} configure --prefix=/usr ${configure_args} + PYTHON=/usr/bin/python2 python2 ${configure_script} configure --prefix=/usr --libdir=/usr/lib ${configure_args} } do_build() { diff --git a/common/build-style/waf3.sh b/common/build-style/waf3.sh index cbae2922f3..c38bbc8c20 100644 --- a/common/build-style/waf3.sh +++ b/common/build-style/waf3.sh @@ -4,7 +4,7 @@ do_configure() { : ${configure_script:=waf} - PYTHON=/usr/bin/python3 python3 ${configure_script} configure --prefix=/usr ${configure_args} + PYTHON=/usr/bin/python3 python3 ${configure_script} configure --prefix=/usr --libdir=/usr/lib ${configure_args} } do_build() {