RepositoryExternal.mk | 5 +++++ solenv/bin/mkdocs.sh | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit 2ed18399f034982a5d7f2ed46144a4b66987baef Author: Michael Stahl <[email protected]> AuthorDate: Thu Aug 30 15:27:55 2018 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Aug 30 15:32:12 2018 +0200 solenv: fix markdown issues in mkdocs.sh - Fedora 28 has python3-markdown2 package containing /usr/bin/markdown2-3 - the "alias" doesn't work at all because it's not exported to the sub-shell in $(markdown) so use variable instead Change-Id: Icf2af1e66750269e0660f3897a91734cadf5d978 diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 99579f71340a..e83e749bde27 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -101,7 +101,7 @@ function check_cmd { echo "$error_msg" >&2 exit 1 fi - alias "${cmds_needed%% *}"=$cmd + export "${cmds_needed%% *}"=$cmd } function setup { @@ -120,7 +120,7 @@ function setup { # binaries that we need check_cmd doxygen "You need doxygen for doc generation" check_cmd dot "You need the graphviz tools to create the nice inheritance graphs" -check_cmd "markdown markdown2" "You need either markdown or markdown2 in order to convert README.md into html" +check_cmd "markdown markdown2 markdown2-3" "You need either markdown or markdown2 in order to convert README.md into html" # suck setup setup "SOLARINC" @@ -253,7 +253,7 @@ for module_name in *; do if [ ${cur_file: -3} == ".md" ]; then # This is a markdown file. - text="$(markdown $cur_file | proc_text_markdown)" + text="$(${markdown} $cur_file | proc_text_markdown)" echo $text >> "$BASE_OUTPUT/${module_name}.html" else proc_text < $cur_file >> "$BASE_OUTPUT/${module_name}.html" commit 13a05eec7377c013d9c13deeee6473a9e863c897 Author: Michael Stahl <[email protected]> AuthorDate: Mon Aug 20 19:07:40 2018 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Aug 30 15:32:12 2018 +0200 RepositoryExternal: mariadb needs iconv on MacOS Change-Id: I78928baab2ea3accfdd7db62240e39e486c2f52c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6852ff356a9e..cec79cc105e8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -257,6 +257,11 @@ $(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),\ mariadb-connector-c \ ) +ifeq ($(OS),MACOSX) +$(call gb_LinkTarget_add_libs,$(1),\ + -liconv \ +) +endif endef define gb_ExternalProject__use_mariadb-connector-c _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
