jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-style: change all build-styles to use /usr/libNN

Browse source
This commit is contained in:
q66 2020-12-22 22:06:08 +01:00
parent 31692b7618
commit 87d28506e1
5 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/build-style/cmake.sh
View file

@ -58,12 +58,7 @@ _EOF
fi fi
cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr" cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
cmake_args+=" -DCMAKE_BUILD_TYPE=Release" cmake_args+=" -DCMAKE_BUILD_TYPE=Release"
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib32"
else
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib"
fi
if [[ $build_helper = *"qemu"* ]]; then if [[ $build_helper = *"qemu"* ]]; then
echo "SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static)" \ echo "SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static)" \

2
common/build-style/meson.sh
View file

@ -94,7 +94,7 @@ do_configure() {
${meson_cmd} \ ${meson_cmd} \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib \ --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
--libexecdir=/usr/libexec \ --libexecdir=/usr/libexec \
--bindir=/usr/bin \ --bindir=/usr/bin \
--sbindir=/usr/bin \ --sbindir=/usr/bin \

3
common/build-style/waf.sh
View file

@ -4,7 +4,8 @@
do_configure() { do_configure() {
: ${configure_script:=waf} : ${configure_script:=waf}
PYTHON=/usr/bin/python2 python2 ${configure_script} configure --prefix=/usr --libdir=/usr/lib ${configure_args} PYTHON=/usr/bin/python2 python2 ${configure_script} configure \
--prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} ${configure_args}
} }
do_build() { do_build() {

3
common/build-style/waf3.sh
View file

@ -12,7 +12,8 @@ do_configure() {
fi fi
PYTHON=/usr/bin/python3 python3 ${configure_script} configure \ PYTHON=/usr/bin/python3 python3 ${configure_script} configure \
--prefix=/usr --libdir=/usr/lib ${configure_args} ${cross_args} --prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
${configure_args} ${cross_args}
} }
do_build() { do_build() {

9
common/environment/configure/gnu-configure-args.sh
View file

@ -10,11 +10,10 @@ export configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bind
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET" export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then # Always use wordsize-specific libdir even though the real path is lib
# on x86 use /usr/lib32 as libdir, but just as fake directory, # This is to make sure 32-bit and 64-bit libs can coexist when looking
# because /usr/lib32 is a symlink to /usr/lib in void. # up things (the opposite-libdir is always symlinked as libNN)
export configure_args+=" --libdir=/usr/lib32" export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
fi
_AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache