diff options
author | Alastair Tse <liquidx@gentoo.org> | 2004-09-24 10:47:44 +0000 |
---|---|---|
committer | Alastair Tse <liquidx@gentoo.org> | 2004-09-24 10:47:44 +0000 |
commit | fb7c8bac4914d95c958c43f58920078ef88d2e68 (patch) | |
tree | e96774ef82235e2ddb1d59140b377ec01caf5cdf /dev-lang | |
parent | Fixed typo in metadata.xml. (diff) | |
download | historical-fb7c8bac4914d95c958c43f58920078ef88d2e68.tar.gz historical-fb7c8bac4914d95c958c43f58920078ef88d2e68.tar.bz2 historical-fb7c8bac4914d95c958c43f58920078ef88d2e68.zip |
adding workaround for -fstack-protector-all (#50309)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/python/ChangeLog | 7 | ||||
-rw-r--r-- | dev-lang/python/Manifest | 56 | ||||
-rw-r--r-- | dev-lang/python/files/digest-python-2.2.2 | 1 | ||||
-rw-r--r-- | dev-lang/python/files/digest-python-2.3.4_rc1 | 1 | ||||
-rw-r--r-- | dev-lang/python/python-2.2.2.ebuild | 99 | ||||
-rw-r--r-- | dev-lang/python/python-2.3.3-r1.ebuild | 8 | ||||
-rw-r--r-- | dev-lang/python/python-2.3.3.ebuild | 8 | ||||
-rw-r--r-- | dev-lang/python/python-2.3.4.ebuild | 8 | ||||
-rw-r--r-- | dev-lang/python/python-2.3.4_rc1.ebuild | 185 |
9 files changed, 48 insertions, 325 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 440f0b44c6fc..117d76d04049 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/python # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.111 2004/09/06 19:39:31 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.112 2004/09/24 10:47:43 liquidx Exp $ + + 24 Sep 2004; Alastair Tse <liquidx@gentoo.org> -python-2.2.2.ebuild, + python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild, + -python-2.3.4_rc1.ebuild: + adding workaround for -fstack-protector-all (#50309) 06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild, python-2.3.4_rc1.ebuild: diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index b038907d0642..0e1adbd75ce4 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,45 +1,31 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 de506496abcc7a243ccd9c5806eb3bc8 python-2.3.4_rc1.ebuild 6014 -MD5 2354391325f4c03b4ecc1aacc67e0da2 ChangeLog 19207 -MD5 82fdbafce9dfea46b1681cf9b0b7c03d python-2.3.3-r1.ebuild 6839 -MD5 6dd864fb6beb993ede8802350e83602c python-2.2.3-r5.ebuild 4309 -MD5 0499eca9ccd343cf1c183ce21902e286 python-2.1.3-r1.ebuild 2324 +MD5 56119248d5d95b2f8bccf3e47b9ed40e ChangeLog 19430 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221 -MD5 844fd99a80005ef1b2f768271998eb77 python-2.2.2.ebuild 3006 -MD5 9b94e10fe6c1b3061b48f79d27a38221 python-2.3.3.ebuild 5392 -MD5 77c77e6071dd822ac53a7964ef1e7e2f python-2.3.4.ebuild 6555 +MD5 0499eca9ccd343cf1c183ce21902e286 python-2.1.3-r1.ebuild 2324 +MD5 6dd864fb6beb993ede8802350e83602c python-2.2.3-r5.ebuild 4309 +MD5 f8f0af23d95eede816954b5269f57ef7 python-2.3.3-r1.ebuild 7015 +MD5 add5816d1a35b2e9311e5b9f6d2e2f90 python-2.3.3.ebuild 5568 +MD5 2f2592f8f0669fc1152b624e8503916b python-2.3.4.ebuild 6731 +MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235 +MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62 MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3 66 -MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015 +MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3-r1 66 +MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4 66 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152 -MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 -MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62 +MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997 +MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220 +MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212 MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767 MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732 +MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607 MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614 -MD5 69dfdde8a2e880656ba066253dee80ee files/python-updater 8087 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178 +MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015 MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478 +MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454 +MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285 +MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779 +MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178 +MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178 MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178 -MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779 -MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285 -MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997 -MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212 -MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4 66 -MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220 -MD5 3dcb08fe99cfbfb0394dc84dfbc93b11 files/digest-python-2.3.4_rc1 68 -MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235 -MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3-r1 66 -MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607 -MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.4 (GNU/Linux) - -iD8DBQFBPLxKLLFUmVNQ7rkRAr3zAJ9vj5r6FIXxx6agtUEgmQDJedUR6wCgyERz -Pj+/9QqiDRPzFhA//rLdo4s= -=u7ZO ------END PGP SIGNATURE----- +MD5 69dfdde8a2e880656ba066253dee80ee files/python-updater 8087 diff --git a/dev-lang/python/files/digest-python-2.2.2 b/dev-lang/python/files/digest-python-2.2.2 deleted file mode 100644 index 39bd384a93cf..000000000000 --- a/dev-lang/python/files/digest-python-2.2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 1c1067396e5aa0299978486eb5bd1a5c Python-2.2.2.tgz 6669400 diff --git a/dev-lang/python/files/digest-python-2.3.4_rc1 b/dev-lang/python/files/digest-python-2.3.4_rc1 deleted file mode 100644 index 2bf5741846ca..000000000000 --- a/dev-lang/python/files/digest-python-2.3.4_rc1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b5a8fe66136104409ad1d68d33c21628 Python-2.3.4c1.tar.bz2 7193312 diff --git a/dev-lang/python/python-2.2.2.ebuild b/dev-lang/python/python-2.2.2.ebuild deleted file mode 100644 index 6471399ffd2b..000000000000 --- a/dev-lang/python/python-2.2.2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.2.ebuild,v 1.16 2004/07/14 13:46:04 agriffis Exp $ - -IUSE="berkdb bootstrap build readline tcltk" - -PYVER_MAJOR="`echo ${PV} | cut -d '.' -f 1`" -PYVER_MINOR="`echo ${PV} | cut -d '.' -f 2`" -PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" -S="${WORKDIR}/Python-${PV}" -DESCRIPTION="A really great language" -SRC_URI="http://www.python.org/ftp/python/${PV}/Python-${PV}.tgz" - -HOMEPAGE="http://www.python.org" -LICENSE="PSF-2.2" -KEYWORDS="x86 ppc sparc alpha mips hppa" - -DEPEND="virtual/libc >=sys-libs/zlib-1.1.3 - readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 ) - berkdb? ( >=sys-libs/db-3 ) - tcltk? ( >=dev-lang/tk-8.0 ) - || ( dev-libs/expat - ( !build? ( dev-libs/expat ) ) - ( !bootstrap? ( dev-libs/expat ) ) - )" -# This is a hairy one. Basically depend on dev-libs/expat -# if "build" or "bootstrap" not in USE. - -RDEPEND="${DEPEND} dev-python/python-fchksum" - -# The dev-python/python-fchksum RDEPEND is needed to that this python provides -# the functionality expected from previous pythons. - -PROVIDE="virtual/python" - -SLOT="2.2" - -inherit flag-o-matic - -src_compile() { - filter-flags -malign-double - - [ "${ARCH}" = "hppa" ] && append-flags -fPIC - - if [ "${ARCH}" = "alpha" ]; then - CFLAGS="${CFLAGS} -fPIC" - CXXFLAGS="${CXXFLAGS} -fPIC" - fi - export OPT="${CFLAGS}" - - # adjust makefile to install pydoc into ${D} correctly - t="${S}/Makefile.pre.in" - cp ${t} ${t}.orig || die - sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' ${t}.orig > ${t} - - local myopts - #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap - then - myopts="--with-cxx=no" - fi - - econf --with-fpectl \ - --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man \ - ${myopts} || die - emake || die "Parallel make failed" -} - -src_install() { - dodir /usr - make install prefix=${D}/usr || die - rm -f ${D}/usr/bin/python - dosym python${PYVER_MAJOR} /usr/bin/python - dosym python${PYVER_MAJOR}.${PYVER_MINOR} /usr/bin/python${PYVER_MAJOR} - dodoc README - - # install our own custom python-config - exeinto /usr/bin - newexe ${FILESDIR}/python-config-${PV} python-config - - # seems like the build do not install Makefile.pre.in anymore - # it probably shouldn't - use DistUtils, people! - insinto /usr/lib/python${PYVER}/config - doins ${S}/Makefile.pre.in - - # While we're working on the config stuff... Let's fix the OPT var - # so that it doesn't have any opts listed in it. Prevents the problem - # with compiling things with conflicting opts later. - dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile - - # If USE tcltk lets install idle - # Need to script the python version in the path - if use tcltk; then - dodir /usr/lib/python${PYVER}/tools - mv "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/" - dosym /usr/lib/python${PYVER}/tools/idle/idle.py /usr/bin/idle.py - fi -} diff --git a/dev-lang/python/python-2.3.3-r1.ebuild b/dev-lang/python/python-2.3.3-r1.ebuild index c4638e1ec2ae..3b39da7d21cb 100644 --- a/dev-lang/python/python-2.3.3-r1.ebuild +++ b/dev-lang/python/python-2.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3-r1.ebuild,v 1.21 2004/09/06 19:39:31 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3-r1.ebuild,v 1.22 2004/09/24 10:47:44 liquidx Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -93,6 +93,12 @@ src_compile() { [ "${ARCH}" = "alpha" ] && append-flags -fPIC [ "${ARCH}" = "amd64" ] && append-flags -fPIC + # http://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flag -O3; then + is-flag -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + export OPT="${CFLAGS}" local myconf diff --git a/dev-lang/python/python-2.3.3.ebuild b/dev-lang/python/python-2.3.3.ebuild index ede533b0fc35..23f68584bfc1 100644 --- a/dev-lang/python/python-2.3.3.ebuild +++ b/dev-lang/python/python-2.3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3.ebuild,v 1.29 2004/09/06 19:39:31 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3.ebuild,v 1.30 2004/09/24 10:47:44 liquidx Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -88,6 +88,12 @@ src_compile() { [ "${ARCH}" = "alpha" ] && append-flags -fPIC [ "${ARCH}" = "amd64" ] && append-flags -fPIC + # http://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flag -O3; then + is-flag -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + export OPT="${CFLAGS}" local myconf diff --git a/dev-lang/python/python-2.3.4.ebuild b/dev-lang/python/python-2.3.4.ebuild index a505be14c6a9..2392476cd7bd 100644 --- a/dev-lang/python/python-2.3.4.ebuild +++ b/dev-lang/python/python-2.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4.ebuild,v 1.11 2004/09/06 19:39:31 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4.ebuild,v 1.12 2004/09/24 10:47:44 liquidx Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -91,6 +91,12 @@ src_compile() { [ "${ARCH}" = "alpha" ] && append-flags -fPIC [ "${ARCH}" = "amd64" ] && append-flags -fPIC + # http://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flag -O3; then + is-flag -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + export OPT="${CFLAGS}" local myconf diff --git a/dev-lang/python/python-2.3.4_rc1.ebuild b/dev-lang/python/python-2.3.4_rc1.ebuild deleted file mode 100644 index 08a296e191b1..000000000000 --- a/dev-lang/python/python-2.3.4_rc1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4_rc1.ebuild,v 1.10 2004/09/06 19:39:31 ciaranm Exp $ - -# NOTE about python-portage interactions : -# - Do not add a pkg_setup() check for a certain version of portage -# in dev-lang/python. It _WILL_ stop people installing from -# Gentoo 1.4 images. - -inherit eutils flag-o-matic python - -MY_PV=${PV/_rc/c} -PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`" -PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`" -PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" - -S="${WORKDIR}/Python-${MY_PV}" -DESCRIPTION="A really great language" -SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${MY_PV}.tar.bz2" -HOMEPAGE="http://www.python.org" - -IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X" -LICENSE="PSF-2.2" -SLOT="2.3" - -KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips" - -DEPEND="virtual/libc - >=sys-libs/zlib-1.1.3 - !build? ( - X? ( tcltk? ( >=dev-lang/tk-8.0 ) ) - ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) - berkdb? ( >=sys-libs/db-3.1 ) - gdbm? ( sys-libs/gdbm ) - ssl? ( dev-libs/openssl ) - doc? ( =dev-python/python-docs-${PV}* ) - dev-libs/expat - )" - -RDEPEND="${DEPEND} dev-python/python-fchksum" - -# The dev-python/python-fchksum RDEPEND is needed to that this python provides -# the functionality expected from previous pythons. - -PROVIDE="virtual/python" - -src_unpack() { - unpack ${A} - cd ${S} - # adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03) - # prepends /usr/lib/portage/pym to sys.path - liquidx (12 Apr 04) - epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path_take_2.patch - # adds support for PYTHON_DONTCOMPILE shell environment to - # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) - epatch ${FILESDIR}/${PN}-2.3-gentoo_py_dontcompile.patch - epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch - epatch ${FILESDIR}/${PN}-2.3-mimetypes_apache.patch - epatch ${FILESDIR}/${PN}-2.3-db4.2.patch - # fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04) - [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure -} - -src_configure() { - # disable extraneous modules with extra dependencies - if use build; then - export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter" - export PYTHON_DISABLE_SSL=1 - else - use gdbm \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm" - use berkdb \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb" - use readline \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline" - ( use !X || use !tcltk ) \ - && PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter" - use ncurses \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel" - use ssl \ - || export PYTHON_DISABLE_SSL=1 - export PYTHON_DISABLE_MODULES - echo $PYTHON_DISABLE_MODULES - fi -} - -src_compile() { - filter-flags -malign-double - - [ "${ARCH}" = "hppa" ] && append-flags -fPIC - [ "${ARCH}" = "alpha" ] && append-flags -fPIC - [ "${ARCH}" = "amd64" ] && append-flags -fPIC - - export OPT="${CFLAGS}" - - local myconf - #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap; then - myconf="--with-cxx=no" - fi - - # super-secret switch. don't use this unless you know what you're - # doing. enabling UCS2 support will break your existing python - # modules - use ucs2 \ - && myconf="${myconf} --enable-unicode=ucs2" \ - || myconf="${myconf} --enable-unicode=ucs4" - - src_configure - - econf --with-fpectl \ - --enable-shared \ - `use_enable ipv6` \ - --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man \ - --with-threads \ - --with-cxx=no \ - ${myconf} || die - emake || die "Parallel make failed" -} - -src_install() { - dodir /usr - src_configure - make DESTDIR="${D}" altinstall || die - - # install our own custom python-config - exeinto /usr/bin - newexe ${FILESDIR}/python-config-${PYVER} python-config - - # The stuff below this line extends from 2.1, and should be deprecated - # in 2.3, or possibly can wait till 2.4 - - # seems like the build do not install Makefile.pre.in anymore - # it probably shouldn't - use DistUtils, people! - insinto /usr/lib/python${PYVER}/config - doins ${S}/Makefile.pre.in - - # While we're working on the config stuff... Let's fix the OPT var - # so that it doesn't have any opts listed in it. Prevents the problem - # with compiling things with conflicting opts later. - dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile - - # install python-updater in /usr/sbin - dosbin ${FILESDIR}/python-updater -} - -pkg_postrm() { - python_makesym - python_mod_cleanup /usr/lib/python2.3 -} - -pkg_postinst() { - local myroot - myroot=$(echo $ROOT | sed 's:/$::') - - - python_makesym - python_mod_optimize - python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER} - - # workaround possible python-upgrade-breaks-portage situation - if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then - if [ -f ${myroot}/usr/lib/python2.2/site-packages/portage.py ]; then - einfo "Working around possible python-portage upgrade breakage" - mkdir -p ${myroot}/usr/lib/portage/pym - cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym - python_mod_optimize ${myroot}/usr/lib/portage/pym - fi - fi - - echo - ewarn - ewarn "If you have just upgraded from python-2.2.x you will need to run:" - ewarn - ewarn "/usr/sbin/python-updater" - ewarn - ewarn "This will automatically rebuild all the python dependent modules" - ewarn "to run with python-2.3." - ewarn - ewarn "Python 2.2 is still installed and can be accessed via /usr/bin/python2.2." - ewarn "Portage-2.0.49-r8 and below will continue to use python-2.2.x, so" - ewarn "think twice about uninstalling it, otherwise your system will break." - ewarn - ebeep 5 -} |