Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lang/pharo: update to 10.3.1 #320

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lang/pharo/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions lang/pharo/distinfo
Original file line number Diff line number Diff line change
@@ -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
19 changes: 19 additions & 0 deletions lang/pharo/files/patch-CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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()

20 changes: 15 additions & 5 deletions lang/pharo/files/patch-packaging_linux_bin_launch.sh.in
Original file line number Diff line number Diff line change
@@ -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@" "$@"
1 change: 1 addition & 0 deletions lang/pharo/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -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