public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [cygport - the Cygwin packaging tool] branch master, updated. 0.33.1-28-gd215559
@ 2020-04-23 20:36 Yaakov Selkowitz
0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2020-04-23 20:36 UTC (permalink / raw)
To: cygwin-apps-cvs
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=d21555913ba3a49ffa56a8b812f658ad4eea3316
commit d21555913ba3a49ffa56a8b812f658ad4eea3316
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu Apr 23 16:34:50 2020 -0400
python3: force hardcoding of python3.y instead of python3
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=6d5fc257a158cd25a6e64b396bbd727604c0b8fa
commit 6d5fc257a158cd25a6e64b396bbd727604c0b8fa
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu Apr 23 16:30:10 2020 -0400
Revert "python3-distutils: force hardcoding of python3.y instead of python3"
This reverts commit b12d739379a840781dd3cc90924ac864ab5264f3.
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=e930305a1354d270b3a7a4c77f2a4fbbdd21f382
commit e930305a1354d270b3a7a4c77f2a4fbbdd21f382
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu Apr 23 16:32:17 2020 -0400
python3: add PYTHON3_PKGVERSION
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=895479d3609d2a21028d7af1ca218e5f3f335ea8
commit 895479d3609d2a21028d7af1ca218e5f3f335ea8
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Tue Apr 14 18:15:44 2020 -0400
perl: add CPAN_SUBDIR
Diff:
---
cygclass/perl.cygclass | 7 ++++++-
cygclass/python3-distutils.cygclass | 4 ++--
cygclass/python3.cygclass | 10 ++++++++--
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/cygclass/perl.cygclass b/cygclass/perl.cygclass
index 54cd97b..c226432 100644
--- a/cygclass/perl.cygclass
+++ b/cygclass/perl.cygclass
@@ -139,6 +139,11 @@ esac
# before inherit()ing perl.cygclass to have any effect. If set, the package
# HOMEPAGE and SRC_URI are set to their usual locations on CPAN.
#****
+#****v* perl.cygclass/CPAN_SUBDIR
+# DESCRIPTION
+# An optional directory component in the CPAN URL. Some packages have an
+# additional subdirectory component, which can be specified with this variable.
+#****
#****v* perl.cygclass/CPAN_VERSION
# DESCRIPTION
# The published version of the Perl module on CPAN. It is sometimes
@@ -190,7 +195,7 @@ HOMEPAGE="https://metacpan.org/release/${ORIG_PN}"
#****
cpan_author_ftp=${CPAN_AUTHOR^^}
cpan_author_ver=${CPAN_VERSION:-${VERSION}}
-SRC_URI="mirror://cpan/authors/id/${cpan_author_ftp:0:1}/${cpan_author_ftp:0:2}/${cpan_author_ftp}/${ORIG_PN}-${cpan_author_ver}.${CPAN_TARBALL_SUFFIX:-tar.gz}"
+SRC_URI="mirror://cpan/authors/id/${cpan_author_ftp:0:1}/${cpan_author_ftp:0:2}/${cpan_author_ftp}${CPAN_SUBDIR+/}${CPAN_SUBDIR}/${ORIG_PN}-${cpan_author_ver}.${CPAN_TARBALL_SUFFIX:-tar.gz}"
SRC_DIR="${ORIG_PN}-${cpan_author_ver}"
unset cpan_author_ftp cpan_author_ver
diff --git a/cygclass/python3-distutils.cygclass b/cygclass/python3-distutils.cygclass
index 77adc03..63852b9 100644
--- a/cygclass/python3-distutils.cygclass
+++ b/cygclass/python3-distutils.cygclass
@@ -51,7 +51,7 @@ python3_distutils_compile() {
error "No Python Distutils module detected"
fi
- $(readlink -f ${PYTHON3}) setup.py build "${@}" || error "setup.py build failed"
+ ${PYTHON3} setup.py build "${@}" || error "setup.py build failed"
}
#****I* python3-distutils.cygclass/python3_distutils_install
@@ -67,7 +67,7 @@ python3_distutils_install() {
error "No Python Distutils module detected"
fi
- $(readlink -f ${PYTHON3}) setup.py "${@}" install --no-compile --root=${D} || error "setup.py install failed"
+ ${PYTHON3} setup.py "${@}" install --no-compile --root=${D} || error "setup.py install failed"
}
#****o* python3-distutils.cygclass/src_compile (python3-distutils)
diff --git a/cygclass/python3.cygclass b/cygclass/python3.cygclass
index 817f0b2..7131e42 100644
--- a/cygclass/python3.cygclass
+++ b/cygclass/python3.cygclass
@@ -56,13 +56,13 @@ check_prog_req python3
# DESCRIPTION
# Absolute path to the Python3 interpreter.
#****
-PYTHON3=/usr/bin/python3
+PYTHON3=$(readlink -f /usr/bin/python3 | sed -e 's/\.exe$//')
#****d* python3.cygclass/PYTHON3_CONFIG
# DESCRIPTION
# Absolute path to the Python3 config script.
#****
-PYTHON3_CONFIG=/usr/bin/python3-config
+PYTHON3_CONFIG=$(readlink -f /usr/bin/python3-config)
#****d* python3.cygclass/PYTHON3_VERSION
# DESCRIPTION
@@ -70,6 +70,12 @@ PYTHON3_CONFIG=/usr/bin/python3-config
#****
PYTHON3_VERSION=$(${PYTHON3} -c 'from distutils.sysconfig import * ; print(get_python_version());')
+#****d* python3.cygclass/PYTHON3_PKGVERSION
+# DESCRIPTION
+# The $major$minor version (without a dot) for use in package names.
+#****
+PYTHON3_PKGVERSION=${PYTHON3_VERSION/.}
+
#****d* python3.cygclass/PYTHON3_ABIFLAGS
# DESCRIPTION
# The ABI flags of the current Python3 interpreter, as used in the names of
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-04-23 20:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-23 20:36 [cygport - the Cygwin packaging tool] branch master, updated. 0.33.1-28-gd215559 Yaakov Selkowitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).