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

build-style/cmake: replace sed monstrosity with ${wrksrc}/${build_wrksrc}

Browse source
This commit is contained in:
John 2021-01-29 16:47:02 +01:00
parent 38c0942636
commit 446425847d
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,8 +65,7 @@ _EOF
export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}" export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590 # Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \ CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \ cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}
-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
# Replace -isystem with -I for Qt4 and Qt5 packages # Replace -isystem with -I for Qt4 and Qt5 packages
find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \; find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;