diff --git a/lang/pharo/Makefile b/lang/pharo/Makefile index 0db13f8622341..a44d8250e5833 100644 --- a/lang/pharo/Makefile +++ b/lang/pharo/Makefile @@ -1,7 +1,6 @@ PORTNAME= pharo -DISTVERSION= 10.0.9 -DISTVERSIONSUFFIX= de76067 -PORTREVISION= 3 +DISTVERSION= 10.3.1 +DISTVERSIONSUFFIX= cab16b39 CATEGORIES= lang MASTER_SITES= http://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/ DISTNAME= PharoVM-${DISTVERSION}-${DISTVERSIONSUFFIX}-Linux-x86_64-c-src @@ -13,6 +12,7 @@ WWW= http://www.pharo.org/ LICENSE= MIT LIB_DEPENDS= libffi.so:devel/libffi \ + libepoll-shim.so:devel/libepoll-shim \ libgit2.so:devel/libgit2 \ libcairo.so:graphics/cairo \ libfreetype.so:print/freetype2 \ diff --git a/lang/pharo/distinfo b/lang/pharo/distinfo index 14e34b18d7af7..143ffee093fd8 100644 --- a/lang/pharo/distinfo +++ b/lang/pharo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1700701195 -SHA256 (PharoVM-10.0.9-de76067-Linux-x86_64-c-src.tar.gz) = e797b3b00be38fbd158ffba732d175307fe9928421529e1f5b96a9e553f018bf -SIZE (PharoVM-10.0.9-de76067-Linux-x86_64-c-src.tar.gz) = 3875300 +TIMESTAMP = 1731849984 +SHA256 (PharoVM-10.3.1-cab16b39-Linux-x86_64-c-src.tar.gz) = 7ea6ca571cf30634eb6ca9b2e17d3f2bb2bab396dbdafcae5b53f027ab363b5a +SIZE (PharoVM-10.3.1-cab16b39-Linux-x86_64-c-src.tar.gz) = 4146246 diff --git a/lang/pharo/files/patch-CMakeLists.txt b/lang/pharo/files/patch-CMakeLists.txt new file mode 100644 index 0000000000000..3195f99814e82 --- /dev/null +++ b/lang/pharo/files/patch-CMakeLists.txt @@ -0,0 +1,19 @@ +--- CMakeLists.txt.orig 2024-10-27 15:47:01.856844000 +0800 ++++ CMakeLists.txt 2024-10-27 16:21:30.499092000 +0800 +@@ -519,6 +519,7 @@ + ${PHARO_CURRENT_GENERATED}/vm/include + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/include/semaphores ++ /usr/local/include/libepoll-shim + ) + add_platform_headers() + +@@ -549,7 +550,7 @@ + ) + endif() + +-target_link_libraries(${VM_EXECUTABLE_NAME} ${VM_LIBRARY_NAME}) ++target_link_libraries(${VM_EXECUTABLE_NAME} ${VM_LIBRARY_NAME} /usr/local/lib/libepoll-shim.so) + + add_required_libs_per_platform() + diff --git a/lang/pharo/files/patch-packaging_linux_bin_launch.sh.in b/lang/pharo/files/patch-packaging_linux_bin_launch.sh.in index 0a2ff8e1e85ec..3570345acedce 100644 --- a/lang/pharo/files/patch-packaging_linux_bin_launch.sh.in +++ b/lang/pharo/files/patch-packaging_linux_bin_launch.sh.in @@ -1,18 +1,28 @@ ---- packaging/linux/bin/launch.sh.in.orig 2023-11-23 00:48:34 UTC -+++ packaging/linux/bin/launch.sh.in -@@ -27,13 +27,13 @@ fi +--- packaging/linux/bin/launch.sh.in.orig 2024-10-27 21:33:11.104610000 +0800 ++++ packaging/linux/bin/launch.sh.in 2024-10-27 21:34:38.820987000 +0800 +@@ -27,13 +27,13 @@ # and so it should take precedence over /lib libc. This is done by setting # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM. #Try extracting Libc -LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" -+LIBC_SO="`ldd "$BIN/@VM_EXECUTABLE_NAME@" | grep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" ++LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | grep -F /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'` #If empty try extracting Musl if [ "$PLATFORMLIBDIR" = "" ]; then { - LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | /bin/fgrep libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" -+ LIBC_SO="`ldd "$BIN/@VM_EXECUTABLE_NAME@" | grep libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" ++ LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | grep -F libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/ld-musl.*'` } fi +@@ -59,7 +59,7 @@ + # in the same directory as the VM. We must include at least /lib and /usr/lib + # if libraries there-in are to be found. These directories are not implicit. + case $PLATFORMLIBDIR in +-/lib|/usr/lib) SVMLLP=/lib:/usr/lib;; +-*) SVMLLP="$PLATFORMLIBDIR:/lib:/usr$PLATFORMLIBDIR:/usr/lib" ++/lib|/usr/lib) SVMLLP=/lib:/usr/lib:/usr/local/lib/pharo10;; ++*) SVMLLP="$PLATFORMLIBDIR:/lib:/usr$PLATFORMLIBDIR:/usr/lib:/usr/local/lib/pharo10" + esac + LD_LIBRARY_PATH="$PLUGINS:$SVMLLP:${LD_LIBRARY_PATH}" exec $GDB "$BIN/@VM_EXECUTABLE_NAME@" "$@" diff --git a/lang/pharo/pkg-plist b/lang/pharo/pkg-plist index 056860634b743..ea55e88ffbe79 100644 --- a/lang/pharo/pkg-plist +++ b/lang/pharo/pkg-plist @@ -17,4 +17,5 @@ lib/pharo10/libSurfacePlugin.so lib/pharo10/libTestLibrary.so lib/pharo10/libUUIDPlugin.so lib/pharo10/libUnixOSProcessPlugin.so +lib/pharo10/libtty.so libexec/pharo10/pharo