tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

common/build-style/waf,waf3: explicitly pass libdir

Browse Source 
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.
This commit is contained in:
q66
2019-01-26 19:38:27 +01:00
committed by maxice8
parent 9b8858c73b
commit 82eec0d023
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/build-style/waf.sh
View File

@@ -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() {

2
common/build-style/waf3.sh
View File

@@ -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() {