Skip to content

Commit

Permalink
Recover fix for building third-party libs in lowcode flavors on 32-bi…
Browse files Browse the repository at this point in the history
…t Linux
  • Loading branch information
marceltaeumel committed Aug 24, 2021
1 parent c179bcf commit 252a015
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
Expand Up @@ -28,14 +28,14 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/${lib}/mvm clean
# ../../../third-party/mvm ${lib} clean
# done
esac
test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/${lib}/mvm
../../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
Expand All @@ -49,6 +49,6 @@ rm -rf ../../../../products/$INSTALLDIR
# but older linux readlinks lack the -f flag
make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/${lib}/mvm install `find ../../../../products/$INSTALLDIR -name "5.0*"`
../../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
6 changes: 3 additions & 3 deletions building/linux32x86/pharo.cog.spur.lowcode/build/mvm
Expand Up @@ -27,15 +27,15 @@ n|no|N|NO) echo "ok but this isn't safe!!";;
*)
test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/${lib}/mvm clean
# ../../../third-party/mvm ${lib} clean
# done
esac

test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/${lib}/mvm
../../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure \
Expand All @@ -50,6 +50,6 @@ rm -rf ../../../../products/$INSTALLDIR
# but older linux readlinks lack the -f flag
make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/${lib}/mvm install `find ../../../../products/$INSTALLDIR -name "5.0*"`
../../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
Expand Up @@ -27,14 +27,14 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/${lib}/mvm clean
# ../../../third-party/mvm ${lib} clean
# done
esac
test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/${lib}/mvm
../../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
Expand All @@ -48,6 +48,6 @@ rm -rf ../../../../products/$INSTALLDIR
# but older linux readlinks lack the -f flag
make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/${lib}/mvm install `find ../../../../products/$INSTALLDIR -name "5.0*"`
../../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
6 changes: 3 additions & 3 deletions building/linux32x86/pharo.stack.spur.lowcode/build/mvm
Expand Up @@ -27,15 +27,15 @@ n|no|N|NO) echo "ok but this isn't safe!!";;
*)
test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/${lib}/mvm clean
# ../../../third-party/mvm ${lib} clean
# done
esac

test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/${lib}/mvm
../../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure \
Expand All @@ -50,6 +50,6 @@ rm -rf ../../../../products/$INSTALLDIR
# but older linux readlinks lack the -f flag
make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/${lib}/mvm install `find ../../../../products/$INSTALLDIR -name "5.0*"`
../../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"

0 comments on commit 252a015

Please sign in to comment.