diff options
| author | Ian Delaney <idella4@gentoo.org> | 2015-12-24 16:30:15 +0800 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2015-12-24 16:31:24 +0800 |
| commit | 98b51f2c00d5f8b675f111e97e759e8eeea6125e (patch) | |
| tree | b87a9367d03c5e98613c20b0fd107f8b9be43268 /dev-lang/python | |
| parent | 3bf393ce26cc918d2da1dd69c842ba54a53c7067 (diff) | |
| parent | 6202dcf8e261f73a44bb94ba103555c3407bcbec (diff) | |
| download | gentoo-98b51f2c00d5f8b675f111e97e759e8eeea6125e.tar.gz gentoo-98b51f2c00d5f8b675f111e97e759e8eeea6125e.tar.bz2 gentoo-98b51f2c00d5f8b675f111e97e759e8eeea6125e.zip | |
Merge remote-tracking branch 'remotes/Coacher/fwknop-2.6.8-bump'
Pull request: https://github.com/gentoo/gentoo/pull/520
Diffstat (limited to 'dev-lang/python')
| -rw-r--r-- | dev-lang/python/python-3.3.5-r7.ebuild (renamed from dev-lang/python/python-3.3.5-r6.ebuild) | 9 | ||||
| -rw-r--r-- | dev-lang/python/python-3.4.3-r7.ebuild (renamed from dev-lang/python/python-3.4.3-r6.ebuild) | 9 | ||||
| -rw-r--r-- | dev-lang/python/python-3.5.1-r2.ebuild (renamed from dev-lang/python/python-3.5.1-r1.ebuild) | 9 |
3 files changed, 21 insertions, 6 deletions
diff --git a/dev-lang/python/python-3.3.5-r6.ebuild b/dev-lang/python/python-3.3.5-r7.ebuild index a85ba3c29109..877112f5541c 100644 --- a/dev-lang/python/python-3.3.5-r6.ebuild +++ b/dev-lang/python/python-3.3.5-r7.ebuild @@ -318,8 +318,13 @@ src_install() { ln -s "python${pymajor}" \ "${D}${PYTHON_SCRIPTDIR}/python" || die # python-config and pythonX-config - ln -s "../../../bin/${abiver}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die ln -s "python${pymajor}-config" \ "${D}${PYTHON_SCRIPTDIR}/python-config" || die # 2to3, pydoc, pyvenv diff --git a/dev-lang/python/python-3.4.3-r6.ebuild b/dev-lang/python/python-3.4.3-r7.ebuild index 98549fa3b728..f599fd900e5a 100644 --- a/dev-lang/python/python-3.4.3-r6.ebuild +++ b/dev-lang/python/python-3.4.3-r7.ebuild @@ -301,8 +301,13 @@ src_install() { ln -s "python${pymajor}" \ "${D}${PYTHON_SCRIPTDIR}/python" || die # python-config and pythonX-config - ln -s "../../../bin/${abiver}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die ln -s "python${pymajor}-config" \ "${D}${PYTHON_SCRIPTDIR}/python-config" || die # 2to3, pydoc, pyvenv diff --git a/dev-lang/python/python-3.5.1-r1.ebuild b/dev-lang/python/python-3.5.1-r2.ebuild index ef7c58e30a94..bf753fab3174 100644 --- a/dev-lang/python/python-3.5.1-r1.ebuild +++ b/dev-lang/python/python-3.5.1-r2.ebuild @@ -304,8 +304,13 @@ src_install() { ln -s "python${pymajor}" \ "${D}${PYTHON_SCRIPTDIR}/python" || die # python-config and pythonX-config - ln -s "../../../bin/${abiver}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die ln -s "python${pymajor}-config" \ "${D}${PYTHON_SCRIPTDIR}/python-config" || die # 2to3, pydoc, pyvenv |