[Vm-dev] [OpenSmalltalk/opensmalltalk-vm] 5a7ee7: Merge commit '21b488e00c991284c8e81835f377107dafd7...
GitHub
noreply at github.com
Mon Dec 5 19:59:56 UTC 2016
Branch: refs/heads/Cog
Home: https://github.com/OpenSmalltalk/opensmalltalk-vm
Commit: 5a7ee7b5b24fbdb58e74a122e7d23c52ed4262ad
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5a7ee7b5b24fbdb58e74a122e7d23c52ed4262ad
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M build.linux32ARMv6/newspeak.cog.spur/plugins.ext
M build.linux32ARMv6/newspeak.stack.spur/plugins.ext
M build.linux32x86/newspeak.cog.spur/plugins.ext
M build.linux32x86/newspeak.sista.spur/plugins.ext
M build.linux32x86/newspeak.stack.spur/plugins.ext
M build.linux32x86/nsnac.cog.spur/plugins.ext
M build.linux64x64/newspeak.cog.spur/plugins.ext
M build.linux64x64/newspeak.sista.spur/plugins.ext
M build.linux64x64/newspeak.stack.spur/plugins.ext
M build.linux64x64/nsnac.cog.spur/plugins.ext
Log Message:
-----------
Merge commit '21b488e00c991284c8e81835f377107dafd77233'
# Conflicts:
# opensmalltalk-vm/build.linux32ARMv6/newspeak.cog.spur/plugins.ext
# opensmalltalk-vm/build.linux32ARMv6/newspeak.stack.spur/plugins.ext
# opensmalltalk-vm/build.linux32x86/newspeak.cog.spur/plugins.ext
# opensmalltalk-vm/build.linux32x86/newspeak.sista.spur/plugins.ext
# opensmalltalk-vm/build.linux32x86/newspeak.stack.spur/plugins.ext
# opensmalltalk-vm/build.linux32x86/nsnac.cog.spur/plugins.ext
# opensmalltalk-vm/build.linux64x64/newspeak.cog.spur/plugins.ext
# opensmalltalk-vm/build.linux64x64/newspeak.sista.spur/plugins.ext
# opensmalltalk-vm/build.linux64x64/newspeak.stack.spur/plugins.ext
# opensmalltalk-vm/build.linux64x64/nsnac.cog.spur/plugins.ext
Commit: 6c9cbfb2023af6841957d12f12e602191d9cfd80
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6c9cbfb2023af6841957d12f12e602191d9cfd80
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths:
M build.win32x86/common/Makefile.plugin
M build.win32x86/pharo.cog.spur/Makefile
Log Message:
-----------
adding STACK_ALIGN_BYTES=16, ALLOCA_LIES_SO_USE_GETSP=0 flags to win32 builds.
ensuriung plugins also uses COGDEFS variable
Commit: ef56de7559606c116ee92076b75569ff8c332aa0
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ef56de7559606c116ee92076b75569ff8c332aa0
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths:
M platforms/Cross/vm/sqCogStackAlignment.h
Log Message:
-----------
Merge commit '386330591639b3056ae67586530f7a6d9dcea87d'
Commit: 9097bc29aaabc679aae92cad3a59969ecd34f864
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9097bc29aaabc679aae92cad3a59969ecd34f864
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths:
M build.macos32x86/third-party/libgit2/Makefile.lib
Log Message:
-----------
mac: add support for openssl in libgit2
Commit: 9bc2954529e3d8dc23466a0f3291f1ecb76653fb
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9bc2954529e3d8dc23466a0f3291f1ecb76653fb
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths:
A third-party/cairo.spec
A third-party/example.spec
A third-party/freetype2.spec
A third-party/libgit2.spec
A third-party/libpng.spec
A third-party/libsdl2.spec
A third-party/libssh2.spec
A third-party/openssl.spec
A third-party/pixman.spec
A third-party/pkgconfig.spec
Log Message:
-----------
add third-party specs (version definitons)
Commit: 2e1d08e47ebbca614c35547f31ecc127ff5b8381
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2e1d08e47ebbca614c35547f31ecc127ff5b8381
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths:
M build.macos32x86/third-party/cairo/Makefile.lib
M build.macos32x86/third-party/freetype2/Makefile.lib
M build.macos32x86/third-party/libgit2/Makefile.lib
M build.macos32x86/third-party/libpng/Makefile.lib
M build.macos32x86/third-party/libsdl2/Makefile.lib
M build.macos32x86/third-party/libssh2/Makefile.lib
M build.macos32x86/third-party/openssl/Makefile.lib
M build.macos32x86/third-party/pixman/Makefile.lib
M build.macos32x86/third-party/pkgconfig/Makefile.lib
Log Message:
-----------
mac32 third-party using specs
Commit: 7fc17861cef9a4015aec02262b242d03002707c1
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7fc17861cef9a4015aec02262b242d03002707c1
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths:
M build.macos32x86/third-party/cairo/Makefile.lib
M build.macos32x86/third-party/freetype2/Makefile.lib
M build.macos32x86/third-party/libgit2/Makefile.lib
M build.macos32x86/third-party/libpng/Makefile.lib
M build.macos32x86/third-party/libsdl2/Makefile.lib
M build.macos32x86/third-party/libssh2/Makefile.lib
M build.macos32x86/third-party/openssl/Makefile.lib
M build.macos32x86/third-party/pixman/Makefile.lib
M build.macos32x86/third-party/pkgconfig/Makefile.lib
Log Message:
-----------
added condition to avoid warnings
Commit: acd5916f729703162e0aef4cb12ccc2cce114876
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/acd5916f729703162e0aef4cb12ccc2cce114876
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths:
M build.macos64x64/common/Makefile.app
M build.macos64x64/common/Makefile.lib.extra
M build.macos64x64/common/Makefile.vm
M build.macos64x64/pharo.cog.spur/Makefile
M build.macos64x64/pharo.cog.spur/plugins.int
M build.macos64x64/third-party/cairo/Makefile.lib
M build.macos64x64/third-party/freetype2/Makefile.lib
M build.macos64x64/third-party/libgit2/Makefile.lib
M build.macos64x64/third-party/libpng/Makefile.lib
M build.macos64x64/third-party/libsdl2/Makefile.lib
M build.macos64x64/third-party/libssh2/Makefile.lib
M build.macos64x64/third-party/openssl/Makefile.lib
M build.macos64x64/third-party/pixman/Makefile.lib
M build.macos64x64/third-party/pkgconfig/Makefile.lib
Log Message:
-----------
using spec versions for third-party libraries on mac 64bits
Commit: de333792d954672182f6fafdb020ffd06cbc7ad5
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/de333792d954672182f6fafdb020ffd06cbc7ad5
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths:
M build.linux32x86/third-party/libgit2/Makefile.lib
M build.linux32x86/third-party/libsdl2/Makefile.lib
M build.linux32x86/third-party/libssh2/Makefile.lib
M build.linux32x86/third-party/pkgconfig/Makefile.lib
M third-party/libgit2.spec
M third-party/libsdl2.spec
M third-party/libssh2.spec
Log Message:
-----------
linux32 third-party using specs
Commit: 6bad1379de7ff64bc5f9fdcba5e5e592a27457ab
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6bad1379de7ff64bc5f9fdcba5e5e592a27457ab
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths:
M build.linux32ARMv6/third-party/libgit2/Makefile.lib
M build.linux32ARMv6/third-party/libsdl2/Makefile.lib
M build.linux32ARMv6/third-party/libssh2/Makefile.lib
Log Message:
-----------
linux32 ARMv6 third-party using specs
Commit: 057b42b018f5818c04e888747b7c752c5510193f
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/057b42b018f5818c04e888747b7c752c5510193f
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths:
M build.linux64x64/third-party/libgit2/Makefile.lib
M build.linux64x64/third-party/libsdl2/Makefile.lib
M build.linux64x64/third-party/libssh2/Makefile.lib
Log Message:
-----------
linux64 third-party using specs
Commit: c6a0317a13811049e8fb98908fee0fcc5845ff66
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c6a0317a13811049e8fb98908fee0fcc5845ff66
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths:
M build.win32x86/third-party/cairo/Makefile.lib
M build.win32x86/third-party/freetype2/Makefile.lib
M build.win32x86/third-party/libgit2/Makefile.lib
M build.win32x86/third-party/libpng/Makefile.lib
M build.win32x86/third-party/libsdl2/Makefile.lib
M build.win32x86/third-party/libssh2/Makefile.lib
M build.win32x86/third-party/openssl/Makefile.lib
M build.win32x86/third-party/pixman/Makefile.lib
M build.win32x86/third-party/pkgconfig/Makefile.lib
M build.win32x86/third-party/zlib/Makefile.lib
M third-party/cairo.spec
M third-party/freetype2.spec
M third-party/libgit2.spec
M third-party/libpng.spec
M third-party/libsdl2.spec
M third-party/libssh2.spec
M third-party/openssl.spec
M third-party/pixman.spec
M third-party/pkgconfig.spec
A third-party/zlib.spec
Log Message:
-----------
win32 third-party using specs
Commit: a3510c70b37730044f2a1f9b5a8c265749918c67
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a3510c70b37730044f2a1f9b5a8c265749918c67
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths:
M .travis_test.sh
M tests/smalltalkCI.sh
Log Message:
-----------
Merge commit 'bccc47a7622661b4e6218ac5ac924b8f0f9804ed'
Commit: 43fd03a93c5760e3a3f5ace9476c8fb41c208328
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/43fd03a93c5760e3a3f5ace9476c8fb41c208328
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths:
M third-party/pkgconfig.spec
Log Message:
-----------
using pkgconfig 0.23 because 0.29 is not working for mac (it looks glibc >= 2.6 and mac has 2.0)
Commit: 91cd9cb8e77f0775d176cc268bb43768e116457b
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/91cd9cb8e77f0775d176cc268bb43768e116457b
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths:
M build.win32x86/third-party/pkgconfig/Makefile.lib
A third-party/pkgconfig.spec.win
Log Message:
-----------
split spec for Windows because macOS and Windows have incompatible pkgconfig versions.
Commit: afffa800d2362d0f952188b7dfa7979f140bf183
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/afffa800d2362d0f952188b7dfa7979f140bf183
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths:
M third-party/libpng.spec
Log Message:
-----------
using libpng 1.2.49
Commit: e3bc947d19a2f157cb8122396e293f5c2ba62a8f
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e3bc947d19a2f157cb8122396e293f5c2ba62a8f
Author: Esteban Lorenzano <estebanlm at gmail.com>
Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths:
M build.linux32ARMv6/third-party/libgit2/Makefile.lib
M build.linux32ARMv6/third-party/libsdl2/Makefile.lib
M build.linux32ARMv6/third-party/libssh2/Makefile.lib
M build.linux32x86/third-party/libgit2/Makefile.lib
M build.linux32x86/third-party/libsdl2/Makefile.lib
M build.linux32x86/third-party/libssh2/Makefile.lib
M build.linux32x86/third-party/pkgconfig/Makefile.lib
M build.linux64x64/third-party/libgit2/Makefile.lib
M build.linux64x64/third-party/libsdl2/Makefile.lib
M build.linux64x64/third-party/libssh2/Makefile.lib
M build.macos32x86/third-party/cairo/Makefile.lib
M build.macos32x86/third-party/freetype2/Makefile.lib
M build.macos32x86/third-party/libgit2/Makefile.lib
M build.macos32x86/third-party/libpng/Makefile.lib
M build.macos32x86/third-party/libsdl2/Makefile.lib
M build.macos32x86/third-party/libssh2/Makefile.lib
M build.macos32x86/third-party/openssl/Makefile.lib
M build.macos32x86/third-party/pixman/Makefile.lib
M build.macos32x86/third-party/pkgconfig/Makefile.lib
M build.macos64x64/common/Makefile.app
M build.macos64x64/common/Makefile.lib.extra
M build.macos64x64/common/Makefile.vm
M build.macos64x64/pharo.cog.spur/Makefile
M build.macos64x64/pharo.cog.spur/plugins.int
M build.macos64x64/third-party/cairo/Makefile.lib
M build.macos64x64/third-party/freetype2/Makefile.lib
M build.macos64x64/third-party/libgit2/Makefile.lib
M build.macos64x64/third-party/libpng/Makefile.lib
M build.macos64x64/third-party/libsdl2/Makefile.lib
M build.macos64x64/third-party/libssh2/Makefile.lib
M build.macos64x64/third-party/openssl/Makefile.lib
M build.macos64x64/third-party/pixman/Makefile.lib
M build.macos64x64/third-party/pkgconfig/Makefile.lib
M build.win32x86/common/Makefile.plugin
M build.win32x86/pharo.cog.spur/Makefile
M build.win32x86/third-party/cairo/Makefile.lib
M build.win32x86/third-party/freetype2/Makefile.lib
M build.win32x86/third-party/libgit2/Makefile.lib
M build.win32x86/third-party/libpng/Makefile.lib
M build.win32x86/third-party/libsdl2/Makefile.lib
M build.win32x86/third-party/libssh2/Makefile.lib
M build.win32x86/third-party/openssl/Makefile.lib
M build.win32x86/third-party/pixman/Makefile.lib
M build.win32x86/third-party/pkgconfig/Makefile.lib
M build.win32x86/third-party/zlib/Makefile.lib
A third-party/cairo.spec
A third-party/example.spec
A third-party/freetype2.spec
A third-party/libgit2.spec
A third-party/libpng.spec
A third-party/libsdl2.spec
A third-party/libssh2.spec
A third-party/openssl.spec
A third-party/pixman.spec
A third-party/pkgconfig.spec
A third-party/pkgconfig.spec.win
A third-party/zlib.spec
Log Message:
-----------
Merge pull request #105 from estebanlm/Cog
fix PharoVM-win32 build + enhancements
Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/bccc47a76226...e3bc947d19a2
More information about the Vm-dev
mailing list