Print this page
Remove Python 2.6

Split Close
Expand all
Collapse all
          --- old/build/libxml2/build.sh
          +++ new/build/libxml2/build.sh
↓ open down ↓ 27 lines elided ↑ open up ↑
  28   28  . ../../lib/functions.sh
  29   29  
  30   30  PROG=libxml2        # App name
  31   31  VER=2.9.4           # App version
  32   32  PKG=library/libxml2 # Package name (without prefix)
  33   33  SUMMARY="$PROG - XML C parser and toolkit"
  34   34  DESC="$SUMMARY"
  35   35  
  36   36  DEPENDS_IPS="compress/xz system/library/gcc-5-runtime library/zlib"
  37   37  BUILD_DEPENDS_IPS="$DEPENDS_IPS developer/sunstudio12.1"
       38 +# Keep python tied to the version we're supporting, to aid future changes.
       39 +CONFIGURE_OPTS="--with-python=/usr/bin/python2.7"
  38   40  
  39   41  fix_python_install() {
  40      -    logcmd mkdir -p $DESTDIR/usr/lib/python2.6/vendor-packages
  41      -    logcmd mv $DESTDIR/usr/lib/python2.6/site-packages/* $DESTDIR/usr/lib/python2.6/vendor-packages/ || logerr "failed relocating python install"
  42      -    logcmd rm -f $DESTDIR/usr/lib/python2.6/vendor-packages/64/drv_libxml2.py
  43      -    logcmd rm -rf $DESTDIR/usr/lib/python2.6/site-packages || logerr "failed removing bad python install"
       42 +    logcmd mkdir -p $DESTDIR/usr/lib/python2.7/vendor-packages
       43 +    logcmd mv $DESTDIR/usr/lib/python2.7/site-packages/* $DESTDIR/usr/lib/python2.7/vendor-packages/ || logerr "failed relocating python install"
       44 +    logcmd rm -f $DESTDIR/usr/lib/python2.7/vendor-packages/64/drv_libxml2.py
       45 +    logcmd rm -rf $DESTDIR/usr/lib/python2.7/site-packages || logerr "failed removing bad python install"
  44   46      logcmd rm -rf $DESTDIR/usr/include/amd64 || logerr "failed removing bad includes install"
  45   47  }
  46   48  
  47   49  install_license(){
  48   50      logcmd cp $TMPDIR/$BUILDDIR/COPYING $DESTDIR/license
  49   51  }
  50   52  
  51   53  make_prog64() {
  52   54      logcmd perl -pi -e 's#(\$CC.*\$compiler_flags)#$1 -nostdlib#g;' libtool ||
  53   55          logerr "libtool patch failed"
↓ open down ↓ 10 lines elided ↑ open up ↑
  64   66      logmsg "--- make install"
  65   67      logcmd perl -pi -e 's#(\/site-packages)#$1\/64#g;' python/.libs/libxml2mod.la ||
  66   68          logerr "libtool libxml2mod.la patch failed"
  67   69      logcmd perl -pi -e 's#(\/site-packages)#$1\/64#g;' python/libxml2mod.la ||
  68   70          logerr "libtool libxml2mod.la patch failed"
  69   71  
  70   72      logcmd perl -pi -e 's#(\/site-packages)#$1\/64#g;' python/.libs/libxml2mod.lai ||
  71   73          logerr "libtool libxml2mod.la patch failed"
  72   74  
  73   75      logcmd $MAKE DESTDIR=${DESTDIR} \
  74      -        PYTHON_SITE_PACKAGES=/usr/lib/python2.6/site-packages/64 \
       76 +        PYTHON_SITE_PACKAGES=/usr/lib/python2.7/site-packages/64 \
  75   77          install || \
  76   78          logerr "--- Make install failed"
  77   79  }
  78   80  
  79   81  # Relocate the libs to /lib, to match upstream
  80   82  move_libs() {
  81   83      logcmd mkdir -p $DESTDIR/lib/amd64
  82   84      logcmd mv $DESTDIR/usr/lib/lib* $DESTDIR/lib || \
  83   85          logerr "failed to move libs (32-bit)"
  84   86      logcmd mv $DESTDIR/usr/lib/amd64/lib* $DESTDIR/lib/amd64 || \
↓ open down ↓ 25 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX