Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c78c584c4de7cc39c1511b80717f8bfb9a68660c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Paul Vinogradov <vin.public AT gmail.com>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c78c584c4de7cc39c1511b80717f8bfb9a68660c)
  • Date: Thu, 25 Jul 2013 12:25:36 -0400

But we don't have /usr/bin/python3, we have /usr/bin/python3.3 instead.

В Thu, 25 Jul 2013 07:20:01 -0500
Treeve Jelbert <scm AT sourcemage.org> пишет:

> GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
>
> libs/libxml2/BUILD | 7 +++++++
> libs/libxml2/HISTORY | 4 ++++
> libs/libxml2/PRE_SUB_DEPENDS | 2 +-
> libs/libxml2/SUB_DEPENDS | 2 +-
> 4 files changed, 13 insertions(+), 2 deletions(-)
>
> New commits:
> commit c78c584c4de7cc39c1511b80717f8bfb9a68660c
> Author: Treeve Jelbert <treeve AT sourcemage.org>
> Commit: Treeve Jelbert <treeve AT sourcemage.org>
>
> libxml2 - fix build with python3
>
> diff --git a/libs/libxml2/BUILD b/libs/libxml2/BUILD
> new file mode 100755
> index 0000000..10eb6b8
> --- /dev/null
> +++ b/libs/libxml2/BUILD
> @@ -0,0 +1,7 @@
> +if is_depends_enabled $SPELL python3;then
> + export PYTHON=/usr/bin/python3
> +fi &&
> +if is_depends_enabled $SPELL python;then
> + export PYTHON=/usr/bin/python2.7
> +fi &&
> +default_build
> diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
> index 4be3e77..d0a1e12 100644
> --- a/libs/libxml2/HISTORY
> +++ b/libs/libxml2/HISTORY
> @@ -1,3 +1,7 @@
> +2013-07-25 Treeve Jelbert <treeve AT sourcemage.org>
> + * SUB_DEPENDS, PRE_SUB_DEPENDS: adjust to python3
> + * BUILD: added, fix detection of python3
> +
> 2013-05-30 Vlad Glagolev <stealth AT sourcemage.org>
> * DETAILS: updated spell to 2.9.1; SECURITY_PATCH++ (CVE-2013-1969)
> * DEPENDS: switched to PYTHON (python3 is supported now)
> diff --git a/libs/libxml2/PRE_SUB_DEPENDS b/libs/libxml2/PRE_SUB_DEPENDS
> index 96a291e..f7fa8d7 100755
> --- a/libs/libxml2/PRE_SUB_DEPENDS
> +++ b/libs/libxml2/PRE_SUB_DEPENDS
> @@ -1,5 +1,5 @@
> case $THIS_SUB_DEPENDS in
> - PYTHON) is_depends_enabled $SPELL python;;
> + PYTHON) is_depends_enabled $SPELL python || is_depends_enabled $SPELL
> python3;; *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
> $THIS_SUB_DEPENDS${DEFAULT_COLOR}" && return 1;;
> esac
> diff --git a/libs/libxml2/SUB_DEPENDS b/libs/libxml2/SUB_DEPENDS
> index 30e1634..a8511d1 100755
> --- a/libs/libxml2/SUB_DEPENDS
> +++ b/libs/libxml2/SUB_DEPENDS
> @@ -1,6 +1,6 @@
> case $THIS_SUB_DEPENDS in
> PYTHON) message "python bindings requested, forcing them" &&
> - depends python "--with-python";;
> + depends PYTHON "--with-python";;
> *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
> $THIS_SUB_DEPENDS${DEFAULT_COLOR}" && return 1;;
> esac
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit


--
Sincerely yours Paul Vinogradov

Attachment: signature.asc
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page