Ticket #53438: patch-python.3.diff

File patch-python.3.diff, 1.6 KB (added by RJVB (René Bertin), 4 years ago)

patch that restores building with cctools v895 (on OS X 10.9)

  • lib-src/lv2/build

    diff --git a/lib-src/lv2/build b/lib-src/lv2/build
    index 3ef13a0..5cd7506 100755
    a b function waf 
    1616   pkg=$1
    1717   pushd >/dev/null ${pkg}
    1818   shift
    19    $(which python python2 | tail -1) waf --prefix="." --include="." $@ build || exit 1
     19   @@PYTHON@@ waf --prefix="." --include="." $@ build || exit 1
    2020   popd >/dev/null
    2121
    2222   . .buildvars
    2323
    2424   if [ -e ${pkg}/build/*.a ]
    2525   then
    26       mkdir -p obj
    27       pushd obj
     26      mkdir -p obj.${pkg}
     27      pushd obj.${pkg}
    2828      ar vx ../${pkg}/build/*.a
    29       ar vq ../liblv2.a *
    3029      popd
    31       rm -rf obj
    3230   fi
    3331}
    3432
    3533[ -e liblv2.a ] && exit 0
    3634
    37 waf lv2    --no-plugins
    38 waf serd   --static --no-shared --no-utils
    39 waf sord   --static --no-shared --no-utils
    40 waf sratom --static --no-shared
    41 waf lilv   --static --no-shared --no-utils
    42 waf suil   --static --no-shared --no-qt
     35waf lv2    -vvv --no-plugins
     36waf serd   -vvv --static --no-shared --no-utils
     37waf sord   -vvv --static --no-shared --no-utils
     38waf sratom -vvv --static --no-shared
     39waf lilv   -vvv --static --no-shared --no-utils
     40waf suil   -vvv --static --no-shared --no-qt
     41
     42# now create liblv2.a in a single call
     43libtool -static -o liblv2.a obj.serd/*.o obj.sord/*.o obj.sratom/*.o obj.lilv/*.o obj.suil/*.o
     44ar -sv liblv2.a
    4345
    4446exit 0
  • lib-src/lv2/configure

    a b function waf 
    3131      fi
    3232   done
    3333
    34    $(which python python2 | tail -1) waf --prefix="." --include="." $@ configure || exit 1
     34   @@PYTHON@@ waf --prefix="." --include="." $@ configure || exit 1
    3535   popd >/dev/null
    3636
    3737   if [ "${pkg}" == "lv2" ]