Re: [xml] Patch: fix for python installation

[Frédéric Crozat <fcrozat mandrakesoft com>]

Le mer 14/08/2002 à 16:12, Daniel Veillard a écrit :
> On Mon, Jul 08, 2002 at 10:37:22AM +0200, Frederic Crozat wrote:
> > Hi,
> >
> > the attached patch fixes python installation for x86-64 (ie new AMD
> > 64bits processor), since libdir = $(prefix)/lib64 for this architecture
> > instead of $prefix/lib as for other architectures (don't ask me more on
> > this subject, I'm only forwarding the patch, I'm not the x86-64
> > specialist :))
>
>   Okay I have applied the patch and commited it in CVS, should be in
> next release !

Thanks..

Our x86-64 specialist updated the patch but didn't send it :((

The following patch should be applied to have a fully working build :

--- libxml2-2.4.23/python/Makefile.am.python-libdir     2002-04-15
13:16:54.000000000 -0400
+++ libxml2-2.4.23/python/Makefile.am   2002-07-16 05:49:37.000000000
-0400
@@ -30,7 +30,7 @@ mylibs = \
 
 all: libxml2.py libxml2mod.la
 
-pythondir = $(prefix)/lib/python${PYTHON_VERSION}/site-packages
+pythondir = $(libdir)/python${PYTHON_VERSION}/site-packages
 python_LTLIBRARIES = libxml2mod.la
 
 libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c

And here is a similar patch for libxslt :

--- libxslt-1.0.19/python/Makefile.am.python-libdir     2002-04-15
14:04:11.000000000 -0400
+++ libxslt-1.0.19/python/Makefile.am   2002-07-16 05:57:50.000000000
-0400
@@ -32,7 +32,7 @@ mylibs = \
 
 all: libxslt.py libxsltmod.la
 
-pythondir = $(prefix)/lib/python${PYTHON_VERSION}/site-packages
+pythondir = $(libdir)/python${PYTHON_VERSION}/site-packages
 python_LTLIBRARIES = libxsltmod.la
 
 libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c
--- libxslt-1.0.19/configure.in.python-libdir   2002-07-06
16:02:24.000000000 -0400
+++ libxslt-1.0.19/configure.in 2002-07-16 05:57:17.000000000 -0400
@@ -169,16 +169,20 @@ except: print 0"`
            if test -r $prefix/include/python$PYTHON_VERSION/Python.h
            then
               
PYTHON_INCLUDES='$(prefix)/include/python$(PYTHON_VERSION)'
-              
PYTHON_SITE_PACKAGES='$(prefix)/lib/python$(PYTHON_VERSION)/site-packages'
+              
PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
            else
                if test -r /usr/include/python$PYTHON_VERSION/Python.h
                then
                    PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
-                  
PYTHON_SITE_PACKAGES='$(prefix)/lib/python$(PYTHON_VERSION)/site-packages'
+                  
PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
                else
                    echo could not find python$PYTHON_VERSION/Python.h
                fi
            fi
+               if ! test -d "$PYTHON_SITE_PACKAGES"
+               then
+                       PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils
import sysconfig; print sysconfig.get_python_lib()"`
+               fi
        fi
     fi
 fi


-- 
Frédéric Crozat
MandrakeSoft