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

Haxe stack #4178

Merged
merged 5 commits into from
Oct 30, 2024
Merged
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
1 change: 1 addition & 0 deletions common/CI/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ static_libs:
- libnss
- llvm
- llvm-15
- ocaml
- rocm-llvm
- vlc
# These files are allowed as static libraries:
Expand Down
23,195 changes: 11,662 additions & 11,533 deletions packages/h/haxe/abi_symbols

Large diffs are not rendered by default.

20 changes: 17 additions & 3 deletions packages/h/haxe/abi_used_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,9 @@ libc.so.6:dlsym
libc.so.6:dup2
libc.so.6:dup3
libc.so.6:environ
libc.so.6:epoll_create
libc.so.6:epoll_create1
libc.so.6:epoll_ctl
libc.so.6:epoll_pwait
libc.so.6:epoll_wait
libc.so.6:eventfd
libc.so.6:execv
libc.so.6:execve
Expand Down Expand Up @@ -103,6 +101,7 @@ libc.so.6:getenv
libc.so.6:geteuid
libc.so.6:getgid
libc.so.6:getgrgid
libc.so.6:getgrgid_r
libc.so.6:getgrnam
libc.so.6:getgroups
libc.so.6:gethostbyaddr_r
Expand Down Expand Up @@ -153,6 +152,7 @@ libc.so.6:lseek64
libc.so.6:lstat
libc.so.6:lstat64
libc.so.6:malloc
libc.so.6:memchr
libc.so.6:memcmp
libc.so.6:memcpy
libc.so.6:memmove
Expand All @@ -162,6 +162,7 @@ libc.so.6:mkdtemp
libc.so.6:mkfifo
libc.so.6:mkstemp
libc.so.6:mktime
libc.so.6:mmap
libc.so.6:mmap64
libc.so.6:msync
libc.so.6:munmap
Expand All @@ -172,6 +173,7 @@ libc.so.6:open
libc.so.6:open64
libc.so.6:opendir
libc.so.6:pathconf
libc.so.6:perror
libc.so.6:pipe
libc.so.6:pipe2
libc.so.6:poll
Expand All @@ -183,6 +185,7 @@ libc.so.6:posix_spawn_file_actions_init
libc.so.6:posix_spawnp
libc.so.6:prctl
libc.so.6:pread
libc.so.6:preadv
libc.so.6:pthread_attr_destroy
libc.so.6:pthread_attr_init
libc.so.6:pthread_attr_setdetachstate
Expand All @@ -201,6 +204,8 @@ libc.so.6:pthread_condattr_init
libc.so.6:pthread_condattr_setclock
libc.so.6:pthread_create
libc.so.6:pthread_exit
libc.so.6:pthread_getaffinity_np
libc.so.6:pthread_getschedparam
libc.so.6:pthread_getspecific
libc.so.6:pthread_join
libc.so.6:pthread_key_create
Expand All @@ -222,25 +227,31 @@ libc.so.6:pthread_rwlock_trywrlock
libc.so.6:pthread_rwlock_unlock
libc.so.6:pthread_rwlock_wrlock
libc.so.6:pthread_self
libc.so.6:pthread_setaffinity_np
libc.so.6:pthread_setschedparam
libc.so.6:pthread_setspecific
libc.so.6:pthread_sigmask
libc.so.6:putenv
libc.so.6:pwrite
libc.so.6:pwrite64
libc.so.6:pwritev
libc.so.6:read
libc.so.6:readdir
libc.so.6:readdir64
libc.so.6:readlink
libc.so.6:readv
libc.so.6:realloc
libc.so.6:realpath
libc.so.6:recvmmsg
libc.so.6:recvmsg
libc.so.6:rename
libc.so.6:rewind
libc.so.6:rewinddir
libc.so.6:rmdir
libc.so.6:scandir
libc.so.6:sched_get_priority_max
libc.so.6:sched_get_priority_min
libc.so.6:sched_getaffinity
libc.so.6:sched_getcpu
libc.so.6:sched_yield
libc.so.6:secure_getenv
libc.so.6:select
Expand All @@ -251,6 +262,7 @@ libc.so.6:sem_trywait
libc.so.6:sem_wait
libc.so.6:send
libc.so.6:sendfile
libc.so.6:sendmmsg
libc.so.6:sendmsg
libc.so.6:sendto
libc.so.6:setenv
Expand Down Expand Up @@ -285,8 +297,10 @@ libc.so.6:statfs
libc.so.6:stderr
libc.so.6:stdin
libc.so.6:stdout
libc.so.6:stpcpy
libc.so.6:strchr
libc.so.6:strcmp
libc.so.6:strcspn
libc.so.6:strdup
libc.so.6:strerror
libc.so.6:strlen
Expand Down
95 changes: 95 additions & 0 deletions packages/h/haxe/files/update-luv.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
From 35a6a872e780b48b482517619d7b47431bc9f827 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <[email protected]>
Date: Wed, 4 Sep 2024 21:21:10 +0100
Subject: [PATCH] Update to luv 0.5.13

---
haxe.opam | 2 +-
src/macro/eval/evalLuv.ml | 8 ++++----
std/eval/luv/FsEvent.hx | 2 +-
std/eval/luv/Resource.hx | 6 ++++--
4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/haxe.opam b/haxe.opam
index 54bb8e31f..90cd909d4 100644
--- a/haxe.opam
+++ b/haxe.opam
@@ -32,5 +32,5 @@ depends: [
"conf-libpcre2-8"
"conf-zlib"
"conf-neko"
- "luv" {= "0.5.12"}
+ "luv" {>= "0.5.13"}
]

diff --git a/src/macro/eval/evalLuv.ml b/src/macro/eval/evalLuv.ml
index 12099b5f6b9..07aee9a3999 100644
--- a/src/macro/eval/evalLuv.ml
+++ b/src/macro/eval/evalLuv.ml
@@ -1942,7 +1942,7 @@ let fs_event_fields = [
) events
in
encode_obj [
- key_file,vnative_string file;
+ key_file,encode_nullable vnative_string file;
key_events,encode_array vevents;
]
) v4
@@ -2175,7 +2175,7 @@ let env_fields = [
let time_fields = [
"getTimeOfDay", vfun0 (fun() ->
encode_result (fun (t:Time.t) ->
- encode_obj [key_sec,VInt64 t.tv_sec; key_usec,vint32 t.tv_usec]
+ encode_obj [key_sec,VInt64 t.sec; key_usec,vint32 t.usec]
) (Time.gettimeofday())
);
"hrTime", vfun0 (fun() ->
@@ -2292,10 +2292,10 @@ let resource_fields = [
encode_array_a [|vfloat m1; vfloat m5; vfloat m15|];
);
"freeMemory", vfun0 (fun() ->
- VUInt64 (Resource.free_memory())
+ encode_nullable (fun u -> VUInt64 u) (Resource.free_memory())
);
"totalMemory", vfun0 (fun() ->
- VUInt64 (Resource.total_memory())
+ encode_nullable (fun u -> VUInt64 u) (Resource.total_memory())
);
"constrainedMemory", vfun0 (fun() ->
encode_nullable (fun u -> VUInt64 u) (Resource.constrained_memory())
diff --git a/std/eval/luv/FsEvent.hx b/std/eval/luv/FsEvent.hx
index 5571138197f..5df6c3bf151 100644
--- a/std/eval/luv/FsEvent.hx
+++ b/std/eval/luv/FsEvent.hx
@@ -26,7 +26,7 @@ enum abstract FsEventFlag(Int) {
/**
Starts the handle and watches the given path for changes.
**/
- public function start(path:NativeString, ?flags:Array<FsEventFlag>, callback:(result:Result<{file:NativeString,events:Array<FsEventType>}>)->Void):Void;
+ public function start(path:NativeString, ?flags:Array<FsEventFlag>, callback:(result:Result<{file:Null<NativeString>,events:Array<FsEventType>}>)->Void):Void;

/**
Stops the handle.
diff --git a/std/eval/luv/Resource.hx b/std/eval/luv/Resource.hx
index 5457e74f6ea..de70d5d1b78 100644
--- a/std/eval/luv/Resource.hx
+++ b/std/eval/luv/Resource.hx
@@ -40,13 +40,15 @@ extern class Resource {

/**
Evaluates to the amount of free memory, in bytes.
+ Returns `null` when unknown.
**/
- static function freeMemory():UInt64;
+ static function freeMemory():Null<UInt64>;

/**
Evaluates to the total amount of memory, in bytes.
+ Returns `null` when unknown.
**/
- static function totalMemory():UInt64;
+ static function totalMemory():Null<UInt64>;

/**
Gets the amount of memory available to the process (in bytes) based on

12 changes: 9 additions & 3 deletions packages/h/haxe/package.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name : haxe
version : 4.3.3
release : 6
version : 4.3.6
release : 7
source :
- git|https://github.com/HaxeFoundation/haxe : 4.3.3
- git|https://github.com/HaxeFoundation/haxe : 4.3.6
homepage : https://haxe.org/
license :
- GPL-2.0-or-later
Expand All @@ -26,6 +26,9 @@ environment: |
# Turn off stripping per https://github.com/HaxeFoundation/haxe/issues/4735
strip : no
setup : |
# https://github.com/HaxeFoundation/haxe/issues/11575
%patch -p1 -i $pkgfiles/update-luv.patch

echo | cpan # If not it will stop at a yes/no question
(echo o conf make_install_arg DESTDIR=$HOME/.local; echo o conf commit) | cpan

Expand All @@ -39,6 +42,9 @@ setup : |
opam init --disable-sandboxing -a
eval $(opam env)

# https://github.com/HaxeFoundation/haxe/issues/11787
opam pin -n extlib 1.7.9

opam install -y --update-invariant camlp5 dune extlib jbuilder \
luv ocamlfind ppx_tools_versioned \
ptmap sedlex sha xml-light
Expand Down
7 changes: 4 additions & 3 deletions packages/h/haxe/pspec_x86_64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@
<Path fileType="data">/usr/share/haxe/std/haxe/crypto/Sha1.hx</Path>
<Path fileType="data">/usr/share/haxe/std/haxe/crypto/Sha224.hx</Path>
<Path fileType="data">/usr/share/haxe/std/haxe/crypto/Sha256.hx</Path>
<Path fileType="data">/usr/share/haxe/std/haxe/display/Diagnostic.hx</Path>
<Path fileType="data">/usr/share/haxe/std/haxe/display/Display.hx</Path>
<Path fileType="data">/usr/share/haxe/std/haxe/display/FsPath.hx</Path>
<Path fileType="data">/usr/share/haxe/std/haxe/display/JsonModuleTypes.hx</Path>
Expand Down Expand Up @@ -2672,9 +2673,9 @@
</Files>
</Package>
<History>
<Update release="6">
<Date>2024-02-09</Date>
<Version>4.3.3</Version>
<Update release="7">
<Date>2024-10-23</Date>
<Version>4.3.6</Version>
<Comment>Packaging update</Comment>
<Name>Thomas Staudinger</Name>
<Email>[email protected]</Email>
Expand Down
43 changes: 2 additions & 41 deletions packages/n/neko/abi_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -300,58 +300,17 @@ mysql5.ndll:set_conv_funs__4
mysql5.ndll:sha1_final
mysql5.ndll:sha1_init
mysql5.ndll:sha1_update
neko:BYTECODE_SEC
neko:_IO_stdin_used
neko:__bss_start
neko:__data_start
neko:_edata
neko:_end
neko:_start
neko:main
neko:neko_execute_self
neko:neko_has_embedded_module
neko:neko_stats_build
neko:neko_stats_measure
neko:stderr
neko:val_null
neko:val_true
nekoc:_IO_stdin_used
nekoc:__bss_start
nekoc:__data_start
nekoc:_edata
nekoc:_end
nekoc:_start
nekoc:main
nekoc:neko_execute_self
nekoc:program
nekoc:program_len
nekoc:program_pos
nekoc:stderr
nekoc:val_null
nekoml:_IO_stdin_used
nekoml:__bss_start
nekoml:__data_start
nekoml:_edata
nekoml:_end
nekoml:_start
nekoml:main
nekoml:neko_execute_self
nekoml:program
nekoml:program_len
nekoml:program_pos
nekoml:stderr
nekoml:val_null
nekotools:_IO_stdin_used
nekotools:__bss_start
nekotools:__data_start
nekotools:_edata
nekotools:_end
nekotools:_start
nekotools:main
nekotools:neko_execute_self
nekotools:program
nekotools:program_len
nekotools:program_pos
nekotools:stderr
nekotools:val_null
regexp.ndll:__kind_k_regexp
Expand All @@ -361,6 +320,7 @@ regexp.ndll:k_regexp
regexp.ndll:regexp_main
regexp.ndll:regexp_match__4
regexp.ndll:regexp_matched__2
regexp.ndll:regexp_matched_num__1
regexp.ndll:regexp_matched_pos__2
regexp.ndll:regexp_new__1
regexp.ndll:regexp_new_options__2
Expand Down Expand Up @@ -664,6 +624,7 @@ std.ndll:sprintf__2
std.ndll:std_main
std.ndll:string_split__2
std.ndll:sys_command__1
std.ndll:sys_cpu_arch__0
std.ndll:sys_cpu_time__0
std.ndll:sys_create_dir__2
std.ndll:sys_env__0
Expand Down
2 changes: 1 addition & 1 deletion packages/n/neko/abi_used_libs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ libmariadb.so.3
libmbedcrypto.so.7
libmbedtls.so.14
libmbedx509.so.1
libpcre.so.1
libpcre2-8.so.0
libsqlite3.so.0
libz.so.1
15 changes: 11 additions & 4 deletions packages/n/neko/abi_used_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ libapr-1.so.0:apr_table_add
libapr-1.so.0:apr_table_do
libapr-1.so.0:apr_table_get
libapr-1.so.0:apr_table_set
libc.so.6:__ctype_b_loc
libc.so.6:__environ
libc.so.6:__errno_location
libc.so.6:__fdelt_chk
Expand Down Expand Up @@ -151,6 +152,7 @@ libc.so.6:tcsetattr
libc.so.6:time
libc.so.6:times
libc.so.6:unlink
libc.so.6:unsetenv
libc.so.6:uselocale
libc.so.6:waitpid
libc.so.6:write
Expand Down Expand Up @@ -224,6 +226,7 @@ libmbedcrypto.so.7:mbedtls_pk_parse_public_key
libmbedcrypto.so.7:mbedtls_pk_sign
libmbedcrypto.so.7:mbedtls_pk_verify
libmbedcrypto.so.7:mbedtls_strerror
libmbedcrypto.so.7:psa_crypto_init
libmbedtls.so.14:mbedtls_ssl_conf_authmode
libmbedtls.so.14:mbedtls_ssl_conf_ca_chain
libmbedtls.so.14:mbedtls_ssl_conf_own_cert
Expand All @@ -249,10 +252,14 @@ libmbedx509.so.1:mbedtls_x509_crt_parse
libmbedx509.so.1:mbedtls_x509_crt_parse_der
libmbedx509.so.1:mbedtls_x509_crt_parse_file
libmbedx509.so.1:mbedtls_x509_crt_parse_path
libpcre.so.1:pcre_compile
libpcre.so.1:pcre_exec
libpcre.so.1:pcre_free
libpcre.so.1:pcre_fullinfo
libpcre2-8.so.0:pcre2_code_free_8
libpcre2-8.so.0:pcre2_compile_8
libpcre2-8.so.0:pcre2_get_error_message_8
libpcre2-8.so.0:pcre2_get_ovector_pointer_8
libpcre2-8.so.0:pcre2_match_8
libpcre2-8.so.0:pcre2_match_data_create_from_pattern_8
libpcre2-8.so.0:pcre2_match_data_free_8
libpcre2-8.so.0:pcre2_pattern_info_8
libsqlite3.so.0:sqlite3_changes
libsqlite3.so.0:sqlite3_close
libsqlite3.so.0:sqlite3_column_blob
Expand Down
Loading
Loading