Browse Source

Remove library version from waf libdir

master
mid-kid 8 years ago
parent
commit
e960714c3b
  1. 6
      satellites/waf.sat

6
satellites/waf.sat

@ -15,8 +15,8 @@ compile_waf -b "python3 ./$name-light" -- --make-waf
sed -i -e '/^#==>$/,/^#<==$/d' "$name" sed -i -e '/^#==>$/,/^#<==$/d' "$name"
# Strip revision from the libdir name # Strip revision from the libdir name
sed -i -e '/dirname =/s/%s-%s-%s/%s-%s/' \ sed -i -e '/dirname =/s/%s-%s-%s/%s/' \
-e '/dirname =/s/, REVISION//' "$name" -e '/dirname =/s/, VERSION, REVISION//' "$name"
# Change the logic of checking dirs to find waflib to only check one dir, the dir where we installed it. # Change the logic of checking dirs to find waflib to only check one dir, the dir where we installed it.
sed -i -e "s/INSTALL,'\/usr','\/usr\/local','\/opt'/'$(safe_sed "/$dir_prefix")',/" \ sed -i -e "s/INSTALL,'\/usr','\/usr\/local','\/opt'/'$(safe_sed "/$dir_prefix")',/" \
@ -29,7 +29,7 @@ sed -i -e '1s/python/python3/' "$name"
install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name" install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
# Install library # Install library
wafdir="$dir_install/$dir_prefix/$dir_libdir/${name}3-$version" wafdir="$dir_install/$dir_prefix/$dir_libdir/${name}3"
install -d "$wafdir" install -d "$wafdir"
unzip -od "$wafdir" zip/waflib.zip unzip -od "$wafdir" zip/waflib.zip
python3 -OOm compileall "$wafdir" python3 -OOm compileall "$wafdir"

Loading…
Cancel
Save