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

[libffi] Fix undefined function error #34404

Merged
merged 28 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
721dbcc
Generate Imath.pc
jimwang118 Aug 17, 2023
56fabca
update version
jimwang118 Aug 17, 2023
2ddb224
add dependency imath minizip-ng
jimwang118 Aug 17, 2023
c490686
updata version
jimwang118 Aug 17, 2023
ccdcbcd
Merge branch 'microsoft:master' into master
jimwang118 Aug 18, 2023
56cb575
update
jimwang118 Aug 22, 2023
3a70322
update version
jimwang118 Aug 22, 2023
fe2306e
Merge branch 'microsoft:master' into master
jimwang118 Aug 23, 2023
b595375
Merge branch 'microsoft:master' into master
jimwang118 Aug 24, 2023
98f68eb
Merge branch 'microsoft:master' into master
jimwang118 Aug 25, 2023
060e43f
Merge branch 'microsoft:master' into master
jimwang118 Aug 28, 2023
4673139
Merge branch 'microsoft:master' into master
jimwang118 Aug 29, 2023
1733b88
Merge branch 'microsoft:master' into master
jimwang118 Aug 30, 2023
98e74a3
Merge branch 'microsoft:master' into master
jimwang118 Sep 1, 2023
a7e87db
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Sep 4, 2023
b43be1b
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Sep 11, 2023
70411a8
Merge branch 'microsoft:master' into master
jimwang118 Sep 14, 2023
4ac1510
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Sep 15, 2023
822f13e
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Sep 20, 2023
6acc88a
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Sep 26, 2023
aa30462
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Sep 26, 2023
acbee17
Merge branch 'master' of https://github.com/jimwang118/vcpkg
jimwang118 Sep 26, 2023
72a9438
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Sep 27, 2023
6c652c7
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Oct 8, 2023
fbe0fe3
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Oct 10, 2023
f1eae05
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 Oct 11, 2023
66ce5b3
fix undefind func
jimwang118 Oct 11, 2023
597b6ec
update version
jimwang118 Oct 11, 2023
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
28 changes: 28 additions & 0 deletions ports/libffi/fix_undefind_func.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/include/ffi_common.h b/include/ffi_common.h
index 2bd31b0..c53a794 100644
--- a/include/ffi_common.h
+++ b/include/ffi_common.h
@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN;
static trampoline. */
int ffi_tramp_is_present (void *closure) FFI_HIDDEN;

+/* Return a file descriptor of a temporary zero-sized file in a
+ writable and executable filesystem. */
+int open_temp_exec_file(void) FFI_HIDDEN;
+
/* Extended cif, used in callback from assembly routine */
typedef struct
{
diff --git a/src/tramp.c b/src/tramp.c
index b9d273a..90efb07 100644
--- a/src/tramp.c
+++ b/src/tramp.c
@@ -39,6 +39,8 @@
#ifdef __linux__
#define _GNU_SOURCE 1
#endif
+#include <ffi.h>
+#include <ffi_common.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
1 change: 1 addition & 0 deletions ports/libffi/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_extract_source_archive(
ARCHIVE "${ARCHIVE}"
PATCHES
dll-bindir.diff
fix_undefind_func.patch
)

vcpkg_list(SET options)
Expand Down
2 changes: 1 addition & 1 deletion ports/libffi/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libffi",
"version": "3.4.4",
"port-version": 5,
"port-version": 6,
"description": "Portable, high level programming interface to various calling conventions",
"homepage": "https://github.com/libffi/libffi",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4154,7 +4154,7 @@
},
"libffi": {
"baseline": "3.4.4",
"port-version": 5
"port-version": 6
},
"libfido2": {
"baseline": "1.13.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libffi.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "982248d325407b09d26ad0d929f67fd0b873f984",
"version": "3.4.4",
"port-version": 6
},
{
"git-tree": "db85488447cfda7bcc5e08452d8581ac0295b4c9",
"version": "3.4.4",
Expand Down