On Fri, Feb 23, 2024 at 08:56:44PM -0700, Thomas Frohwein wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: t...@cvs.openbsd.org 2024/02/23 20:56:44
>
> Modified files:
> lang/hashlink : Makefile distinfo
> lang/hashlink/patches: patch-Makefile
>
> Log message:
> update hashlink to 'latest' tag from 2 weeks ago; tested with Into the
> Necrovale, Dead Cells, and Northgard.
>
> hashlink has the unfortunate habit of placing tag "latest" without
> further description at times, and in this case this is used by latest
> versions of Into the Necrovale and is required because of a new binding
> that has been introduced.
>
Fails to patch:
>>> Building on localhost under lang/hashlink
BDEPENDS =
[databases/sqlite3;devel/libuv;graphics/jpeg;security/polarssl;audio/libvorbis;devel/sdl2;graphics/png;audio/openal;devel/gmake]
DIST =
[lang/hashlink:HaxeFoundation-hashlink-20df6529c932f7e9ab4e1c528a0321723f2d09ae.tar.gz]
FULLPKGNAME = hashlink-1.14pl0
RDEPENDS =
[security/polarssl;audio/libvorbis;audio/openal;devel/sdl2;graphics/png;databases/sqlite3;devel/libuv;graphics/jpeg]
(Junk lock obtained for localhost at 1708827900.56)
>>> Running depends in lang/hashlink at 1708827900.57
/usr/sbin/pkg_add -aI -Drepair gmake-4.4.1 jpeg-3.0.1p0v0 libuv-1.48.0
libvorbis-1.3.7 mbedtls-2.28.0p0 openal-1.23.1v0 png-1.6.42 sdl2-2.30.0p0
sqlite3-3.44.2
was: /usr/sbin/pkg_add -aI -Drepair gmake-4.4.1 jpeg-3.0.1p0v0 libuv-1.48.0
libvorbis-1.3.7 mbedtls-2.28.0p0 openal-1.23.1v0 png-1.6.42 sdl2-2.30.0p0
sqlite3-3.44.2
/usr/sbin/pkg_add -aI -Drepair gmake-4.4.1 jpeg-3.0.1p0v0 libuv-1.48.0
libvorbis-1.3.7 mbedtls-2.28.0p0 openal-1.23.1v0 png-1.6.42 sdl2-2.30.0p0
sqlite3-3.44.2
>>> Running show-prepare-results in lang/hashlink at 1708827901.55
===> lang/hashlink
===> Building from scratch hashlink-1.14pl0
===> hashlink-1.14pl0 depends on: gmake-* -> gmake-4.4.1
===> hashlink-1.14pl0 depends on: libvorbis-* -> libvorbis-1.3.7
===> hashlink-1.14pl0 depends on: openal-* -> openal-1.23.1v0
===> hashlink-1.14pl0 depends on: sqlite3-* -> sqlite3-3.44.2
===> hashlink-1.14pl0 depends on: libuv-* -> libuv-1.48.0
===> hashlink-1.14pl0 depends on: sdl2-* -> sdl2-2.30.0p0
===> hashlink-1.14pl0 depends on: jpeg-* -> jpeg-3.0.1p0v0
===> hashlink-1.14pl0 depends on: png-* -> png-1.6.42
===> hashlink-1.14pl0 depends on: mbedtls-* -> mbedtls-2.28.0p0
===> Verifying specs: GL SDL2 c m mbedcrypto mbedtls mbedx509 openal png
pthread sqlite3 turbojpeg uv vorbisfile z
===> found GL.19.0 SDL2.0.15 c.98.0 m.10.1 mbedcrypto.5.0 mbedtls.7.0
mbedx509.3.2 openal.5.0 png.18.0 pthread.27.1 sqlite3.37.26 turbojpeg.0.2
uv.4.2 vorbisfile.6.0 z.7.0
gmake-4.4.1
jpeg-3.0.1p0v0
libuv-1.48.0
libvorbis-1.3.7
mbedtls-2.28.0p0
openal-1.23.1v0
png-1.6.42
sdl2-2.30.0p0
sqlite3-3.44.2
(Junk lock released for localhost at 1708827903.35)
distfiles size=4623798
>>> Running build in lang/hashlink at 1708827903.36
===> lang/hashlink
===> Checking files for hashlink-1.14pl0
`/data/distfiles/HaxeFoundation-hashlink-20df6529c932f7e9ab4e1c528a0321723f2d09ae.tar.gz'
is up to date.
>> (SHA256)
>> HaxeFoundation-hashlink-20df6529c932f7e9ab4e1c528a0321723f2d09ae.tar.gz: OK
===> Extracting for hashlink-1.14pl0
rm -rf /tmp/pobj/hashlink-1.14pl0/include/{fmt,turbojpeg}
===> Patching for hashlink-1.14pl0
Can't open libs/uv/uv.c: No such file or directory.
Can't open src/hl.h: No such file or directory.
Can't open src/std/socket.c: No such file or directory.
Can't open src/std/thread.c: No such file or directory.
===> Applying OpenBSD patch patch-Makefile
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|remove -m$(ARCH)
|add versioning to libhl
|{CFLAGS} -> (CFLAGS) to not get picked up by SUBST_CMD
|remove Linux's 32-/64-bit detection
|remove Darwin detection in install target (breaks 'make fake')
|build libhl_module.so and install hl/hl_module.h and hl/opcodes.h
|install headers (and hlc_main.c) in include/hl/
|
|Index: Makefile
|--- Makefile.orig
|+++ Makefile
--------------------------
File to patch:
No file found--skip this patch? [y]
Skipping patch...
Hunk #1 ignored at 1.
Hunk #2 ignored at 39.
Hunk #3 ignored at 75.
Hunk #4 ignored at 142.
Hunk #5 ignored at 160.
Hunk #6 ignored at 180.
Hunk #7 ignored at 283.
7 out of 7 hunks ignored--saving rejects to Oops.rej
done
***> patch-Makefile did not apply cleanly
===> Applying OpenBSD patch patch-libs_mysql_socket_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|fix ifdef's
|
|Index: libs/mysql/socket.c
|--- libs/mysql/socket.c.orig
|+++ libs/mysql/socket.c
--------------------------
File to patch:
No file found--skip this patch? [y]
Skipping patch...
Hunk #1 ignored at 74.
Hunk #2 ignored at 117.
2 out of 2 hunks ignored--saving rejects to Oops.rej
done
***> patch-libs_mysql_socket_c did not apply cleanly
===> Applying OpenBSD patch patch-libs_uv_uv_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|add resolve function from https://github.com/motion-twin
|commit 61be4ae30e52a5ffcfa9212b9b81d4e06225c2ea
|
|Index: libs/uv/uv.c
|--- libs/uv/uv.c.orig
|+++ libs/uv/uv.c
--------------------------
File to patch:
No file found--skip this patch? [y]
Skipping patch...
Hunk #1 ignored at 96.
1 out of 1 hunks ignored--saving rejects to Oops.rej
done
***> patch-libs_uv_uv_c did not apply cleanly
===> Applying OpenBSD patch patch-src_module_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|ignore non-matching function signature
|
|Index: src/module.c
|--- src/module.c.orig
|+++ src/module.c
--------------------------
File to patch:
No file found--skip this patch? [y]
Skipping patch...
Hunk #1 ignored at 570.
1 out of 1 hunks ignored--saving rejects to Oops.rej
done
***> patch-src_module_c did not apply cleanly
===> Applying OpenBSD patch patch-src_std_socket_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|add OpenBSD to ifdef
|
|Index: src/std/socket.c
|--- src/std/socket.c.orig
|+++ src/std/socket.c
--------------------------
File to patch:
No file found--skip this patch? [y]
Skipping patch...
Hunk #1 ignored at 199.
Hunk #2 ignored at 226.
2 out of 2 hunks ignored--saving rejects to Oops.rej
done
***> patch-src_std_socket_c did not apply cleanly
===> Applying OpenBSD patch patch-src_std_string_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|work around when nullptr is passed to hl_ucs2length()
|(can enable printing by uncommenting)
|
|Index: src/std/string.c
|--- src/std/string.c.orig
|+++ src/std/string.c
--------------------------
File to patch:
No file found--skip this patch? [y]
Skipping patch...
Hunk #1 ignored at 20.
Hunk #2 ignored at 78.
2 out of 2 hunks ignored--saving rejects to Oops.rej
done
***> patch-src_std_string_c did not apply cleanly
===> Applying OpenBSD patch patch-src_std_thread_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|enable hl_thread_id for OpenBSD using getthrid(2)
|pthread_setname_np -> pthread_set_name_np
|
|Index: src/std/thread.c
|--- src/std/thread.c.orig
|+++ src/std/thread.c
--------------------------
File to patch:
No file found--skip this patch? [y]
Skipping patch...
Hunk #1 ignored at 73.
Hunk #2 ignored at 810.
Hunk #3 ignored at 948.
3 out of 3 hunks ignored--saving rejects to Oops.rej
done
***> patch-src_std_thread_c did not apply cleanly
===> Failed patches:
patch-Makefile
patch-libs_mysql_socket_c
patch-libs_uv_uv_c
patch-src_module_c
patch-src_std_socket_c
patch-src_std_string_c
patch-src_std_thread_c
*** Error 1 in lang/hashlink (/usr/ports/infrastructure/mk/bsd.port.mk:2929
'/tmp/pobj/hashlink-1.14pl0/.patch_done': @if cd /usr/ports/lang...)
*** Error 2 in lang/hashlink (/usr/ports/infrastructure/mk/bsd.port.mk:2702
'build': @lock=hashlink-1.14pl0; export _LOCKS_HELD=" hashlink-...)
===> Exiting lang/hashlink with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:144 'build': @:
${echo_msg:=echo}; : ${target:=build}; for i in ; do eval...)
>>> Ended at 1708827904.02
max_stuck=0.00/depends=0.97/show-prepare-results=1.82/build=0.67
Error: job failed with 512 on localhost at 1708827904
