Skip to content

Commit

Permalink
move wasi hotfix to correct place
Browse files Browse the repository at this point in the history
  • Loading branch information
pmp-p committed Dec 19, 2024
1 parent 7e4e896 commit d721d13
Show file tree
Hide file tree
Showing 5 changed files with 298 additions and 15 deletions.
4 changes: 2 additions & 2 deletions cibuild.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

set -x;
set -e;
#set -x;
#set -e;

# data transfer zone this is == (wire query size + result size ) + 2
# expressed in EMSDK MB
Expand Down
20 changes: 11 additions & 9 deletions cibuild/sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,6 @@ then
exit 0
fi

# wasi sdk 24

if [ -f extra/native/sdk-fix.tar ]
then
pushd ${SDKROOT}/wasisdk/upstream
tar xf ${WORKSPACE}/extra/native/sdk-fix.tar
popd
fi


# emsdk

Expand All @@ -34,6 +25,17 @@ else
curl -sL --retry 5 https://github.com/pygame-web/python-wasi-sdk/releases/download/$WASI_SDK_VERSION/$WASI_SDK_ARCHIVE | tar xvP --use-compress-program=lz4 | pv -p -l -s 23000 >/dev/null
fi


# wasi sdk 24 hotfix

if [ -f extra/native/sdk-fix.tar ]
then
pushd ${SDKROOT}/wasisdk/upstream
tar xf ${WORKSPACE}/extra/native/sdk-fix.tar
popd
fi


pushd /tmp/sdk

#if false
Expand Down
2 changes: 1 addition & 1 deletion patches/exports/pglite
Original file line number Diff line number Diff line change
Expand Up @@ -6497,11 +6497,11 @@ _xmlUCSIsYijingHexagramSymbols
_xmlXPathBooleanFunction
_xmlXPathCastNodeToString
_xmlXPathCeilingFunction
_xmlXPathCompile
_xmlXPathCompiledEval
_xmlXPathConcatFunction
_xmlXPathContainsFunction
_xmlXPathCountFunction
_xmlXPathCtxtCompile
_xmlXPathFalseFunction
_xmlXPathFloorFunction
_xmlXPathFreeCompExpr
Expand Down
6 changes: 3 additions & 3 deletions patches/imports/pgcore
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ _CreateExecutorState
_ResourceOwnerCreate
_CreateExprContext
_GetCurrentSubTransactionId
_SPI_plan_get_plan_sources
_SPI_plan_get_cached_plan
_ReleaseCachedPlan
_SPI_execute_plan_extended
_SPI_result_code_string
_GetErrorContextStack
Expand Down Expand Up @@ -170,9 +171,8 @@ _SPI_rollback
_err_generic_string
_SPI_prepare_extended
_SPI_keepplan
_SPI_plan_get_cached_plan
_SPI_plan_get_plan_sources
_CachedPlanAllowsSimpleValidityCheck
_ReleaseCachedPlan
_EnsurePortalSnapshotExists
_CachedPlanIsSimplyValid
_ExecInitExprWithParams
Expand Down
281 changes: 281 additions & 0 deletions patches/imports/plpgsql
Original file line number Diff line number Diff line change
@@ -1,2 +1,283 @@
_SearchSysCache1
_errstart_cold
_errmsg_internal
_errfinish
_puts
_hash_search
_ItemPointerEquals
_errstart
_SysCacheGetAttrNotNull
_text_to_cstring
_pstrdup
_MemoryContextAllocZero
_memset
_AllocSetContextCreateInternal
_format_procedure
_MemoryContextSetIdentifier
_MemoryContextAlloc
_get_func_arg_info
_palloc
_pg_snprintf
_errcode
_format_type_be
_errmsg
_palloc0
_CreateTemplateTupleDesc
_TupleDescInitEntry
_TupleDescInitEntryCollation
_repalloc
_get_fn_expr_rettype
_errhint
_type_is_rowtype
_ReleaseSysCache
_pfree
_memcpy
_function_parse_error_transpose
_set_errcontext_domain
_errcontext_msg
_list_make1_impl
_lappend
_NameListToString
_errdetail
_parser_errposition
_bms_add_member
_MemoryContextAllocZeroAligned
_makeString
_list_make2_impl
_strcmp
_list_make3_impl
_makeTypeName
_LookupTypeName
_get_base_element_type
_lookup_type_cache
_RelnameGetRelid
_makeRangeVar
_RangeVarGetRelidExtended
_SearchSysCacheAttName
_get_rel_type_id
_makeTypeNameFromNameList
_strlen
_strspn
_hash_create
_resolve_polymorphic_argtypes
_get_call_expr_argtype
_expand_array
_SPI_freetuptable
_MemoryContextReset
_TransferExpandedObject
_ProcessInterrupts
_CreateTupleDescCopy
_SPI_datumTransfer
_get_call_result_type
_domain_check
_FreeExprContext
_makeParamList
_detoast_external_attr
_datumCopy
_DeleteExpandedObject
_DatumGetEOHP
_expanded_record_set_tuple
_MemoryContextSetParent
_deconstruct_expanded_record
_pg_detoast_datum
_make_expanded_record_from_typeid
_lookup_rowtype_tupdesc
_DecrTupleDescRefCount
_expanded_record_fetch_tupdesc
_make_expanded_record_from_tupdesc
_heap_deform_tuple
_convert_tuples_by_position
_expanded_record_get_tuple
_execute_attr_map_tuple
_SPI_returntuple
_EOH_get_flat_size
_SPI_palloc
_EOH_flatten_into
_FreeCachedExpression
_get_typcollation
_coerce_to_target_type
_GetCachedExpression
_ExecInitExpr
_make_expanded_record_from_exprecord
_expanded_record_set_field_internal
_SPI_register_trigger_data
_SPI_copytuple
_expanded_record_lookup_field
_FreeExecutorState
_ResourceOwnerReleaseAllPlanCacheRefs
_invoke_vi
___wasm_setjmp_test
_setTempRet0
_getTempRet0
_invoke_viiiiii
_invoke_viii
_invoke_viiii
_invoke_iiiiii
_invoke_iii
_invoke_ii
___wasm_setjmp
_get_typlenbyval
_datumTransfer
_invoke_iiii
_invoke_v
_invoke_i
_ReThrowError
_unpack_sql_state
_cstring_to_text
_invoke_viiiii
_MemoryContextGetParent
_emscripten_longjmp
_CreateExecutorState
_ResourceOwnerCreate
_CreateExprContext
_GetCurrentSubTransactionId
_SPI_plan_get_cached_plan
_ReleaseCachedPlan
_SPI_execute_plan_extended
_SPI_result_code_string
_GetErrorContextStack
_Int64GetDatum
_SPI_cursor_close
_SPI_cursor_find
_SPI_cursor_open_with_paramlist
_get_element_type
_pg_detoast_datum_copy
_array_create_iterator
_array_iterate
_MakeExpandedObjectReadOnlyInternal
_tuplestore_putvalues
_tuplestore_puttuple
_tuplestore_tuple_count
_CreateDestReceiver
_SetTuplestoreDestReceiverParams
_getTypeOutputInfo
_OidOutputFunctionCall
_MemoryContextStrdup
_SPI_execute_extended
_initStringInfo
_appendStringInfoChar
_appendStringInfoString
_errdetail_internal
_SPI_scroll_cursor_fetch
_SPI_scroll_cursor_move
_SPI_commit_and_chain
_SPI_commit
_SPI_rollback_and_chain
_SPI_rollback
_err_generic_string
_SPI_prepare_extended
_SPI_keepplan
_SPI_plan_get_plan_sources
_CachedPlanAllowsSimpleValidityCheck
_EnsurePortalSnapshotExists
_CachedPlanIsSimplyValid
_ExecInitExprWithParams
_CommandCounterIncrement
_GetTransactionSnapshot
_PushActiveSnapshot
_PopActiveSnapshot
_errmsg_plural
_SPI_getbinval
_exprType
_exprTypmod
_contain_mutable_functions
_bms_is_member
_get_typsubscript
_SPI_execute_plan_with_paramlist
_PinPortal
_SPI_cursor_fetch
_UnpinPortal
_DirectFunctionCall1Coll
_get_namespace_name
_construct_md_array
_GetCommandTagName
_BlessTupleDesc
_expanded_record_fetch_field
_HeapTupleHeaderGetDatum
_heap_form_tuple
_tuplestore_begin_heap
_bms_next_member
_appendStringInfo
_appendStringInfoStringQuoted
_SPI_cursor_parse_open
_ExprEvalPushStep
_expanded_record_set_fields
_typenameTypeIdAndMod
_strcpy
_SPI_freeplan
_MemoryContextDelete
_pg_printf
_fflush
_get_collation_oid
_memmove
_list_free
_typeStringToTypeName
_raw_parser
_quote_identifier
_appendStringInfoSpaces
_scanner_isspace
_geterrposition
_getinternalerrposition
_internalerrposition
_errposition
_pg_bindtextdomain
_DefineCustomEnumVariable
_DefineCustomBoolVariable
_DefineCustomStringVariable
_MarkGUCPrefixReserved
_RegisterXactCallback
_RegisterSubXactCallback
_find_rendezvous_variable
_pg_strcasecmp
_SplitIdentifierString
___errno_location
_pre_format_elog_string
_format_elog_string
_guc_malloc
_invoke_vii
_invoke_iiiiiii
_SPI_finish
_CheckFunctionValidatorAccess
_get_typtype
_SPI_connect
_ScanKeywordLookup
_core_yylex
_appendBinaryStringInfo
_pg_mbstrlen_with_len
_internalerrquery
_strchr
_scanner_init
_scanner_finish
___stack_pointer
___memory_base
___table_base
_error_context_stack
_TopMemoryContext
_CurrentMemoryContext
_check_function_bodies
_InterruptPending
_CurrentResourceOwner
_plpgsql_parser_setup
___THREW__
___threwValue
_BeginInternalSubTransaction
_PG_exception_stack
_ReleaseCurrentSubTransaction
_CopyErrorData
_FlushErrorState
_RollbackAndReleaseCurrentSubTransaction
_MemoryContextDeleteChildren
_MyProc
_TopTransactionContext
_TopTransactionResourceOwner
_SPI_processed
_SPI_tuptable
_SPI_result
_namein
_work_mem
_stdout
_GUC_check_errdetail_string
_SPI_connect_ext
_plpgsql_compile
_ResourceOwnerDelete
_pg_re_throw

0 comments on commit d721d13

Please sign in to comment.