* Re: [gentoo-dev] dev-lang/python-2.0-r5
@ 2001-10-30 22:59 99% ` Tod M. Neidt
0 siblings, 0 replies; 1+ results
From: Tod M. Neidt @ 2001-10-30 22:59 UTC (permalink / raw
To: gentoo-dev mailing list
[-- Attachment #1: Type: text/plain, Size: 1121 bytes --]
Hi!
Please find a patch that makes the python-2.0-r5.ebuild independent of
the tcl-tk version, i.e. no hard coded version number. This is done by
grep-ing the tcl and tk header files.
Also, is their a reason that tcl-tk-8.4 is masked. I have been using
8.4 with python-2.0 for well over 6 months. I also rebuilt python-2.0
with the patch mentioned above with tcl-tk-8.4 already merged.
/usr/bin/idle.py pops right up.
Comments welcome
tod
On Mon, 2001-10-29 at 01:42, Joe Bormolini wrote:
> dev-lang/python-2.0-r5.ebuild
> Line 48: s:#[[:blank:]]*-ltk8.0 -ltcl8.0:-ltk8.4 -ltcl8.4:
>
> the ebuild actually depends on >=dev-lang/tcl-tk-8.0 if tcltk is in USE yet a note above says the dep is =dev-lang/tcl-tk
>
> tcl-tk-8.4 is in package.mask listed as being incompatible with python, but the python ebuild tries to compile with -ltk8.4 and -ltcl8.4 no matter what version of tcl-tk is installed. Something needs to be fixed here :p
>
> --lordjoe
>
> _______________________________________________
> gentoo-dev mailing list
> gentoo-dev@cvs.gentoo.org
> http://cvs.gentoo.org/mailman/listinfo/gentoo-dev
>
[-- Attachment #2: python-2.0-r5-tcl-tk.patch --]
[-- Type: text/plain, Size: 1104 bytes --]
--- /usr/portage/dev-lang/python/python-2.0-r5.ebuild Sat Oct 20 16:08:33 2001
+++ ./python-2.0-r5.ebuild Tue Oct 30 23:38:41 2001
@@ -41,11 +41,23 @@
#Need to automate tk and tcl version determination
if [ "`use tcltk`" ]
then
+
+#Determine tcl version by greping tcl.h
+#Probably don't need same for tk, but play it safe
+ local tcl_version
+ local tk_version
+
+ tcl_version=$(grep TCL_VERSION /usr/include/tcl.h | \
+ sed -e 's/.*\([0-9]\.[0-9]\).*/\1/')
+
+ tk_version=$(grep TK_VERSION /usr/include/tk.h | \
+ sed -e 's/.*\([0-9]\.[0-9]\).*/\1/')
+
sed -e 's:# _tkinter:_tkinter:' \
-e 's:#[[:blank:]]*-I/usr/local/include:-I/usr/include:' \
-e 's:#[[:blank:]]*-I/usr/X11R6/include:-I/usr/X11R6/include:' \
-e 's:#[[:blank:]]*-L/usr/local/lib:-L/usr/lib:' \
- -e 's:#[[:blank:]]*-ltk8.0 -ltcl8.0:-ltk8.4 -ltcl8.4:' \
+ -e 's:#[[:blank:]]*-ltk8.0 -ltcl8.0:-ltk'${tk_version}' -ltcl'${tcl_version}':' \
-e 's:#[[:blank:]]*-L/usr/X11R6/lib:-L/usr/X11R6/lib:' \
-e 's:#[[:blank:]]-lX11:-lX11:' \
Setup.in > Setup.new
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2001-10-28 18:42 [gentoo-dev] dev-lang/python-2.0-r5 Joe Bormolini
2001-10-30 22:59 99% ` Tod M. Neidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox