From ba2d4166f160c0631423d8a4a80978e8245bc620 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Fri, 13 Oct 2017 13:31:08 +0300 Subject: [PATCH] [platform libs][osx][debug] fix debug build --- klib/src/platform/osx/ApplicationServices.def | 2 ++ klib/src/platform/osx/CFNetwork.def | 2 ++ klib/src/platform/osx/CoreServices.def | 2 +- klib/src/platform/osx/Metal.def | 2 +- klib/src/platform/osx/Security.def | 17 +++++++++++ klib/src/platform/osx/objc.def | 3 +- klib/src/platform/osx/osx.def | 28 ++++++++++++++----- klib/src/platform/osx/posix.def | 8 +++++- 8 files changed, 53 insertions(+), 11 deletions(-) diff --git a/klib/src/platform/osx/ApplicationServices.def b/klib/src/platform/osx/ApplicationServices.def index 16fa9e6a265..c5699978745 100644 --- a/klib/src/platform/osx/ApplicationServices.def +++ b/klib/src/platform/osx/ApplicationServices.def @@ -6,5 +6,7 @@ headers = ApplicationServices/ApplicationServices.h headerFilter = ApplicationServices/** ATS/** ColorSync/** HIServices/** \ LangAnalysis/** PrintCore/** QD/** SpeechSynthesis/** +excludedFunctions = kSpeechSynthesizerInfoManufacturer + compilerOpts = -framework ApplicationServices linkerOpts = -framework ApplicationServices diff --git a/klib/src/platform/osx/CFNetwork.def b/klib/src/platform/osx/CFNetwork.def index ff2c02aa185..5c837bae0af 100644 --- a/klib/src/platform/osx/CFNetwork.def +++ b/klib/src/platform/osx/CFNetwork.def @@ -4,6 +4,8 @@ package = platform.CFNetwork headers = CFNetwork/CFNetwork.h headerFilter = CFNetwork/** +excludedFunctions = kCFHTTPAuthenticationSchemeKerberos kCFHTTPAuthenticationSchemeOAuth1 kCFNetworkProxiesProxyAutoConfigJavaScript kCFProxyAutoConfigurationHTTPResponseKey + compilerOpts = -framework CFNetwork linkerOpts = -framework CFNetwork diff --git a/klib/src/platform/osx/CoreServices.def b/klib/src/platform/osx/CoreServices.def index 5f06b0ff5de..04e87733e36 100644 --- a/klib/src/platform/osx/CoreServices.def +++ b/klib/src/platform/osx/CoreServices.def @@ -5,6 +5,6 @@ headers = CoreServices/CoreServices.h headerFilter = CoreServices/** AE/** CarbonCore/** DictionaryServices/** FSEvents/** LaunchServices/** \ Metadata/** OSServices/** SearchKit/** SharedFileList/** - +excludedFunctions = MDItemCopyAttributeList MDQueryGetSortOptionFlagsForAttribute compilerOpts = -framework CoreServices linkerOpts = -framework CoreServices diff --git a/klib/src/platform/osx/Metal.def b/klib/src/platform/osx/Metal.def index ed101bacec3..4aaf03fff97 100644 --- a/klib/src/platform/osx/Metal.def +++ b/klib/src/platform/osx/Metal.def @@ -4,6 +4,6 @@ package = platform.Metal headers = Metal/Metal.h headerFilter = Metal/** - +excludedFunctions = MTLRenderPipelineErrorDomain compilerOpts = -framework Metal linkerOpts = -framework Metal diff --git a/klib/src/platform/osx/Security.def b/klib/src/platform/osx/Security.def index 4686f5c30c5..19953f96cc7 100644 --- a/klib/src/platform/osx/Security.def +++ b/klib/src/platform/osx/Security.def @@ -4,6 +4,23 @@ package = platform.Security headers = Security/Security.h Security/SecurityFeatures.h Security/SecureTransport.h headerFilter = Security/** +excludedFunctions = CSSMOID_APPLE_EXTENSION_DEVELOPER_AUTHENTICATION CSSMOID_APPLE_EXTENSION_PROVISIONING_PROFILE_SIGNING \ + CSSMOID_APPLE_EXTENSION_SERVER_AUTHENTICATION CSSMOID_APPLE_TP_PCS_ESCROW_SERVICE \ + CSSMOID_APPLE_TP_PROVISIONING_PROFILE_SIGNING CSSMOID_DES_CBC CSSMOID_DomainComponent CSSMOID_InhibitAnyPolicy \ + CSSM_KR_CreateRecoveryEnablementContext CSSM_KR_CreateRecoveryRegistrationContext CSSM_KR_CreateRecoveryRequestContext \ + CSSM_KR_GenerateRecoveryFields CSSM_KR_GetPolicyInfo CSSM_KR_GetRecoveredObject CSSM_KR_PassThrough \ + CSSM_KR_ProcessRecoveryFields CSSM_KR_QueryPolicyInfo CSSM_KR_RecoveryRequest CSSM_KR_RecoveryRequestAbort \ + CSSM_KR_RecoveryRetrieve CSSM_KR_RegistrationRequest CSSM_KR_RegistrationRetrieve CSSM_KR_SetEnterpriseRecoveryPolicy \ + CSSM_SPI_ModuleAttach CSSM_SPI_ModuleDetach CSSM_SPI_ModuleLoad CSSM_SPI_ModuleUnload ModuleManagerAuthenticate \ + SecDecryptTransformGetTypeID SecDigestTransformGetTypeID SecEncryptTransformGetTypeID kSecACLAuthorizationChangeACL \ + kSecACLAuthorizationChangeOwner kSecCertificateUsageDeriveAndSign kSecCertificateUsageSigning \ + kSecCertificateUsageSigningAndEncrypting kSecCodeInfoPlatformIdentifier kSecGuestAttributeArchitecture \ + kSecGuestAttributeSubarchitecture kSecOAEPMGF1DigestAlgorithmAttributeName kSecOAEPMessageLengthAttributeName \ + kSecOIDAPPLE_EXTENSION_AAI_INTERMEDIATE kSecOIDAPPLE_EXTENSION_APPLEID_INTERMEDIATE \ + kSecOIDAPPLE_EXTENSION_INTERMEDIATE_MARKER kSecOIDAPPLE_EXTENSION_ITMS_INTERMEDIATE \ + kSecOIDAPPLE_EXTENSION_WWDR_INTERMEDIATE kSecPolicyAppleiChat oidAnsip384r1 oidAnsip521r1 oidEcPrime192v1 \ + oidEcPrime256v1 oidExtendedKeyUsageTimeStamping oidNameConstraints + compilerOpts = -framework Security linkerOpts = -framework Security diff --git a/klib/src/platform/osx/objc.def b/klib/src/platform/osx/objc.def index 64c288b9b8e..f13b4ab3b1e 100644 --- a/klib/src/platform/osx/objc.def +++ b/klib/src/platform/osx/objc.def @@ -7,8 +7,9 @@ headers = objc/List.h objc/NSObjCRuntime.h objc/NSObject.h objc/Object.h objc/Pr objc/objc-sync.h objc/objc.h objc/runtime.h headerFilter = objc/** - compilerOpts = -D_XOPEN_SOURCE +excludedFunctions = KERNEL_AUDIT_TOKEN KERNEL_SECURITY_TOKEN + linkerOpts = -lobjc --- // objc-auto.h is excluded so far due to interop issues. diff --git a/klib/src/platform/osx/osx.def b/klib/src/platform/osx/osx.def index 5e946739e8b..da06b3297c6 100644 --- a/klib/src/platform/osx/osx.def +++ b/klib/src/platform/osx/osx.def @@ -6,34 +6,48 @@ headers = AppleTextureEncoder.h AssertMacros.h Availability.h AvailabilityIntern TargetConditionals.h __cxxabi_config.h _locale.h _types.h _wctype.h \ aio.h aliasdb.h asl.h bitstring.h bootparams.h bootstrap.h bzlib.h \ cache.h cache_callbacks.h checkint.h com_err.h compression.h copyfile.h \ - cpio.h crt_externs.h ctype.h curses.h cxxabi.h db.h \ + cpio.h crt_externs.h ctype.h cxxabi.h db.h \ disktab.h dns.h dns_sd.h dns_util.h dtrace.h \ emmintrin.h eti.h execinfo.h expat.h \ expat_external.h fmtmsg.h form.h fsproperties.h fstab.h get_compat.h \ gethostuuid.h glob.h gssapi.h histedit.h ifaddrs.h inttypes.h iso646.h \ - krb5.h langinfo.h launch.h lber.h lber_types.h ldap.h ldap_cdefs.h ldap_features.h \ - ldap_schema.h ldap_utf8.h ldif.h libc.h libcharset.h \ + krb5.h langinfo.h launch.h lber.h lber_types.h ldif.h libc.h libcharset.h \ libgen.h libproc.h libunwind.h localcharset.h \ membership.h mmintrin.h monetary.h monitor.h mpool.h \ nameser.h nc_tparm.h ncurses.h ncurses_dll.h ndbm.h nl_types.h \ nlist.h notify.h notify_keys.h ntsid.h \ panel.h pcap-bpf.h pcap-namedb.h pcap.h printerdb.h printf.h \ profile.h ranlib.h readpassphrase.h removefile.h rune.h \ - runetype.h sandbox.h slapi-plugin.h stab.h standards.h strhash.h \ + runetype.h sandbox.h stab.h standards.h strhash.h \ stringlist.h struct.h sysdir.h sysexits.h tar.h term.h \ term_entry.h termcap.h tic.h timeconv.h ttyent.h tzfile.h \ - unctrl.h unwind.h util.h utmpx.h vis.h vproc.h wordexp.h xattr_flags.h \ + unctrl.h unwind.h utmpx.h vis.h vproc.h wordexp.h xattr_flags.h \ xmmintrin.h \ atm/atm_types.h bank/bank_types.h bsm/libbsm.h corpses/task_corpse.h \ hfs/hfs_format.h hfs/hfs_mount.h hfs/hfs_unistr.h \ os/activity.h os/availability.h os/base.h os/lock.h \ os/object.h os/overflow.h os/trace.h \ - sys/acl.h sys/kauth.h + sys/kauth.h headerFilter = ** compilerOpts = -D_XOPEN_SOURCE -linkerOpts = -ldl +excludedFunctions = KERNEL_AUDIT_TOKEN KERNEL_SECURITY_TOKEN vm_map_64 vm_mapped_pages_info vm_region_recurse vm_region xpc_debugger_api_misuse_info \ + _dtrace_debug _dtrace_mangled _nc_progname _nc_trace_xnames _nc_tracebits _nc_tracef _traceattr2 _tracechar _tracedump _tracef \ + _tracemouse _traceattr _tracechtype _tracechtype2 trace DebugStr Debugger SysBreak SysBreakFunc SysBreakStr \ + asl_decode_buffer asl_encode_buffer asl_remove_index au_to_kevent ber_bvreplace ber_decode_oid ber_encode_oid \ + ber_flush2 ber_peek_element ber_skip_data ber_skip_element ber_sockbuf_io_debug ber_sockbuf_io_fd \ + ber_sockbuf_io_readahead ber_sockbuf_io_tcp ber_sockbuf_io_udp ber_strndup ber_strnlen clock_get_res \ + clock_set_res dbm_forder dns_search_list_domain_count dtrace_aggregate_walk_sorted dtrace_print \ + error_manager et_asn1_error_table et_k524_error_table et_kdb5_error_table et_krb5_error_table et_kv5m_error_table \ + et_prof_error_table gss_export_name_object gss_import_name_object initialize_asn1_error_table initialize_k524_error_table \ + initialize_kdb5_error_table initialize_krb5_error_table initialize_kv5m_error_table initialize_prof_error_table \ + krb5_c_keylengths krb5_c_prf krb5_c_prf_length krb5_c_random_to_key krb5_cc_get_flags krb5_get_fallback_host_realm \ + ldif_debug libcharset_set_relocation_prefix locale_charset mach_vm_region_info mach_vm_region_info_64 map_fd \ + nlist os_trace_info_with_payload safe_gets task_wire trace + +linkerOpts = -late -lbsm -lbz2 -lcompression -ledit -lexpat -lform -lkrb5 -llber -lldap -lncurses -lpanel -lpcap -ldtrace +depends = posix --- // menu.h is excluded so far due to interop issues. diff --git a/klib/src/platform/osx/posix.def b/klib/src/platform/osx/posix.def index bfab9a150e9..ef3f5c31063 100644 --- a/klib/src/platform/osx/posix.def +++ b/klib/src/platform/osx/posix.def @@ -13,7 +13,13 @@ headers = alloca.h ar.h assert.h complex.h dirent.h dlfcn.h err.h errno.h fcntl. sys/queue.h sys/select.h sys/shm.h sys/socket.h sys/stat.h \ sys/syslimits.h sys/time.h sys/times.h sys/utsname.h sys/wait.h -compilerOpts = -D_XOPEN_SOURCE +compilerOpts = -D_XOPEN_SOURCE -DSHARED_LIBBIND -D_DARWIN_NO_64_BIT_INODE +# -D_ANSI_SOURCE, sigh, breaks user_addr_t +excludedFunctions = KERNEL_AUDIT_TOKEN KERNEL_SECURITY_TOKEN add_profil \ + addrsel_policy_init \ + in6addr_linklocal_allv2routers \ + pfctlinput regwnexec_l res_send_setqhook res_send_setrhook \ + unwhiteout zopen profil linkerOpts = -ldl -lresolv ---