diff options
Diffstat (limited to 'source/d/cmake')
| -rwxr-xr-x | source/d/cmake/cmake.SlackBuild | 5 | ||||
| -rw-r--r-- | source/d/cmake/cmake.doxygen-1.8.15.diff | 16 |
2 files changed, 20 insertions, 1 deletions
diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild index b20759875..9036e4cf1 100755 --- a/source/d/cmake/cmake.SlackBuild +++ b/source/d/cmake/cmake.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cmake VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -67,6 +67,9 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 +# Work around breakage with doxygen-1.8.15: +zcat $CWD/cmake.doxygen-1.8.15.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/d/cmake/cmake.doxygen-1.8.15.diff b/source/d/cmake/cmake.doxygen-1.8.15.diff new file mode 100644 index 000000000..ed73290a5 --- /dev/null +++ b/source/d/cmake/cmake.doxygen-1.8.15.diff @@ -0,0 +1,16 @@ +--- ./Modules/FindDoxygen.cmake.orig 2018-12-13 05:57:40.000000000 -0600 ++++ ./Modules/FindDoxygen.cmake 2018-12-31 13:45:34.300895249 -0600 +@@ -708,8 +708,11 @@ + if(_line MATCHES "([A-Z][A-Z0-9_]+)( *=)(.*)") + set(_key "${CMAKE_MATCH_1}") + set(_eql "${CMAKE_MATCH_2}") +- string(REPLACE ";" "\\\n" _value "${CMAKE_MATCH_3}") +- list(APPEND _Doxygen_tpl_params "${_key}${_eql}${_value}") ++ #string(REPLACE ";" "\\\n" _value "${CMAKE_MATCH_3}") ++ #list(APPEND _Doxygen_tpl_params "${_key}${_eql}${_value}") ++ string(REPLACE "\\" "\\\\" _value1 "${CMAKE_MATCH_3}") ++ string(REPLACE ";" "\\\n" _value2 "${_value1}") ++ list(APPEND _Doxygen_tpl_params "${_key}${_eql}${_value2}") + endif() + endforeach() + |