Skip to content

Fix typo in append of shared_libs #1

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: meson2hermetic
Choose a base branch
from
Open

Fix typo in append of shared_libs #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df229f2
mesonbuild: add meson2hermetic
bphunguyen Feb 6, 2025
2996a88
mesonbuild: core changes to integrate meson2hermetic
bphunguyen Feb 24, 2025
4c6b40e
autogenerated code for viewing
gsingh408 Oct 9, 2025
793fba2
Fix typo in append of shared_libs
cerisier Oct 20, 2025
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
3 changes: 3 additions & 0 deletions mesonbuild/backend/backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,9 @@ def get_backend_from_name(backend: str, build: T.Optional[build.Build] = None, i
if backend == 'ninja':
from . import ninjabackend
return ninjabackend.NinjaBackend(build, interpreter)
elif backend == 'hermetic':
from . import hermeticbackend
return hermeticbackend.HermeticBackend(build, interpreter)
elif backend == 'vs':
from . import vs2010backend
return vs2010backend.autodetect_vs_version(build, interpreter)
Expand Down
16 changes: 16 additions & 0 deletions mesonbuild/backend/hermeticbackend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright 2025 The Meson development team

import typing as T

from . import backends
from mesonbuild import build, interpreter

class HermeticBackend(backends.Backend):
name = 'hermetic'

def __init__(self, build: build.Build, interpreter: interpreter.Interpreter):
super().__init__(build, interpreter)

def generate(self, capture: bool = False, vslite_ctx: T.Optional[T.Dict] = None) -> None:
pass
2 changes: 1 addition & 1 deletion mesonbuild/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ArgparseKWs(TypedDict, total=False):
# Can't bind this near the class method it seems, sadly.
_T = T.TypeVar('_T')

backendlist = ['ninja', 'vs', 'vs2010', 'vs2012', 'vs2013', 'vs2015', 'vs2017', 'vs2019', 'vs2022', 'xcode', 'none']
backendlist = ['ninja', 'hermetic', 'vs', 'vs2010', 'vs2012', 'vs2013', 'vs2015', 'vs2017', 'vs2019', 'vs2022', 'xcode', 'none']
genvslitelist = ['vs2022']
buildtypelist = ['plain', 'debug', 'debugoptimized', 'release', 'minsize', 'custom']

Expand Down
290 changes: 290 additions & 0 deletions output-dir/Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,290 @@
/*
* Copyright (C) 2024 Android Open Source Project
* SPDX-License-Identifier: Apache-2.0
*/

package {
// See: http://go/android-license-faq
default_applicable_licenses: ["external_mesa3d_license"],
}

cc_defaults {
name: "_trial_msvc",
cflags: [
"-Werror=pointer-arith",
"-Werror=vla",
"-Werror=gnu-empty-initializer",
],
}

cc_defaults {
name: "mesa_c_project_args",
cflags: [
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
"-D__STDC_LIMIT_MACROS",
"-DPACKAGE_VERSION="25.3.0-devel"",
"-DPACKAGE_BUGREPORT="https://gitlab.freedesktop.org/mesa/mesa/-/issues"",
"-DHAVE_OPENGL=0",
"-DHAVE_OPENGL_ES_1=1",
"-DHAVE_OPENGL_ES_2=1",
"-DMESA_SYSTEM_HAS_KMS_DRM=1",
"-DVIDEO_CODEC_VC1DEC=0",
"-DVIDEO_CODEC_H264DEC=0",
"-DVIDEO_CODEC_H264ENC=0",
"-DVIDEO_CODEC_H265DEC=0",
"-DVIDEO_CODEC_H265ENC=0",
"-DVIDEO_CODEC_AV1DEC=1",
"-DVIDEO_CODEC_AV1ENC=1",
"-DVIDEO_CODEC_VP9DEC=1",
"-DHAVE_ANDROID_PLATFORM",
"-DUSE_LIBGLVND=0",
"-DGLAPI_EXPORT_PROTO_ENTRY_POINTS=1",
"-DANDROID_API_LEVEL=34",
"-DANDROID_STRICT",
"-DETIME=ETIMEDOUT",
"-DMESA_DEBUG=0",
"-DENABLE_SHADER_CACHE",
"-DHAVE___BUILTIN_BSWAP32",
"-DHAVE___BUILTIN_BSWAP64",
"-DHAVE___BUILTIN_CLZ",
"-DHAVE___BUILTIN_CLZLL",
"-DHAVE___BUILTIN_CTZ",
"-DHAVE___BUILTIN_EXPECT",
"-DHAVE___BUILTIN_FFS",
"-DHAVE___BUILTIN_FFSLL",
"-DHAVE___BUILTIN_POPCOUNT",
"-DHAVE___BUILTIN_POPCOUNTLL",
"-DHAVE___BUILTIN_UNREACHABLE",
"-DHAVE___BUILTIN_TYPES_COMPATIBLE_P",
"-DHAVE___BUILTIN_ADD_OVERFLOW",
"-DHAVE___BUILTIN_ADD_OVERFLOW_P",
"-DHAVE___BUILTIN_SUB_OVERFLOW_P",
"-DHAVE_FUNC_ATTRIBUTE_CONST",
"-DHAVE_FUNC_ATTRIBUTE_FLATTEN",
"-DHAVE_FUNC_ATTRIBUTE_MALLOC",
"-DHAVE_FUNC_ATTRIBUTE_PURE",
"-DHAVE_FUNC_ATTRIBUTE_UNUSED",
"-DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT",
"-DHAVE_FUNC_ATTRIBUTE_WEAK",
"-DHAVE_FUNC_ATTRIBUTE_FORMAT",
"-DHAVE_FUNC_ATTRIBUTE_PACKED",
"-DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL",
"-DHAVE_FUNC_ATTRIBUTE_ALIAS",
"-DHAVE_FUNC_ATTRIBUTE_NORETURN",
"-DHAVE_FUNC_ATTRIBUTE_OPTIMIZE",
"-DHAVE_FUNC_ATTRIBUTE_COLD",
"-DHAVE_FUNC_ATTRIBUTE_VISIBILITY",
"-DHAVE_UINT128",
"-DHAVE_REALLOCARRAY",
"-DHAVE_FMEMOPEN",
"-D_GNU_SOURCE",
"-DHAVE___BUILTIN_IA32_CLFLUSHOPT",
"-DUSE_GCC_ATOMIC_BUILTINS",
"-DMAJOR_IN_SYSMACROS",
"-DMAJOR_IN_MKDEV",
"-DHAS_SCHED_H",
"-DHAS_SCHED_GETAFFINITY",
"-DHAVE_SYS_SYSCTL_H",
"-DHAVE_XLOCALE_H",
"-DHAVE_LINUX_FUTEX_H",
"-DHAVE_ENDIAN_H",
"-DHAVE_DLFCN_H",
"-DHAVE_SYS_SHM_H",
"-DHAVE_CET_H",
"-DHAVE_PTHREAD_NP_H",
"-DHAVE_SYS_INOTIFY_H",
"-DHAVE_LINUX_UDMABUF_H",
"-DHAVE_STRTOF",
"-DHAVE_MKOSTEMP",
"-DHAVE_MEMFD_CREATE",
"-DHAVE_RANDOM_R",
"-DHAVE_FLOCK",
"-DHAVE_STRTOK_R",
"-DHAVE_GETRANDOM",
"-DHAVE_QSORT_S",
"-DHAVE_POSIX_FALLOCATE",
"-DHAVE_SECURE_GETENV",
"-DHAVE_SYSCONF",
"-DHAVE_GNU_QSORT_R",
"-DHAVE_STRUCT_TIMESPEC",
"-DHAVE_THRD_CREATE",
"-DHAVE_PROGRAM_INVOCATION_NAME",
"-DHAVE_ISSIGNALING",
"-DHAVE_POSIX_MEMALIGN",
"-DHAVE_DIRENT_D_TYPE",
"-DHAVE_STRTOD_L",
"-DHAVE_DLADDR",
"-DHAVE_DL_ITERATE_PHDR",
"-DHAVE_ZSTD",
"-DHAVE_COMPRESSION",
"-DHAVE_LIBDRM",
"-DMESA_LLVM_VERSION_STRING="16.0"",
"-DLLVM_IS_SHARED=1",
"-DDRAW_LLVM_AVAILABLE=1",
"-DAMD_LLVM_AVAILABLE=1",
"-DGALLIVM_USE_ORCJIT=0",
"-DUSE_LIBELF",
"-DTHREAD_SANITIZER=0",
"-DHAVE_DRI2",
"-DHAVE_LIBSENSORS=1",
"-fno-emulated-tls",
"-Werror=implicit-function-declaration",
"-Werror=missing-prototypes",
"-Werror=return-type",
"-Werror=empty-body",
"-Werror=incompatible-pointer-types",
"-Werror=int-conversion",
"-Wimplicit-fallthrough",
"-Wmisleading-indentation",
"-Wno-error=maybe-uninitialized",
"-Wno-missing-field-initializers",
"-Wno-format-truncation",
"-Wno-nonnull-compare",
"-fno-math-errno",
"-fno-trapping-math",
"-Qunused-arguments",
"-fno-common",
"-Wno-unknown-pragmas",
"-Wno-microsoft-enum-value",
"-Wno-unused-function",
"-Werror=format",
"-Wformat-security",
"-Werror=thread-safety",
"-ffunction-sections",
"-fdata-sections",
],
}

cc_defaults {
name: "mesa_cpp_project_args",
cppflags: [
"-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS",
"-D__STDC_LIMIT_MACROS",
"-DPACKAGE_VERSION="25.3.0-devel"",
"-DPACKAGE_BUGREPORT="https://gitlab.freedesktop.org/mesa/mesa/-/issues"",
"-DHAVE_OPENGL=0",
"-DHAVE_OPENGL_ES_1=1",
"-DHAVE_OPENGL_ES_2=1",
"-DMESA_SYSTEM_HAS_KMS_DRM=1",
"-DVIDEO_CODEC_VC1DEC=0",
"-DVIDEO_CODEC_H264DEC=0",
"-DVIDEO_CODEC_H264ENC=0",
"-DVIDEO_CODEC_H265DEC=0",
"-DVIDEO_CODEC_H265ENC=0",
"-DVIDEO_CODEC_AV1DEC=1",
"-DVIDEO_CODEC_AV1ENC=1",
"-DVIDEO_CODEC_VP9DEC=1",
"-DHAVE_ANDROID_PLATFORM",
"-DUSE_LIBGLVND=0",
"-DGLAPI_EXPORT_PROTO_ENTRY_POINTS=1",
"-DANDROID_API_LEVEL=34",
"-DANDROID_STRICT",
"-DETIME=ETIMEDOUT",
"-DMESA_DEBUG=0",
"-DENABLE_SHADER_CACHE",
"-DHAVE___BUILTIN_BSWAP32",
"-DHAVE___BUILTIN_BSWAP64",
"-DHAVE___BUILTIN_CLZ",
"-DHAVE___BUILTIN_CLZLL",
"-DHAVE___BUILTIN_CTZ",
"-DHAVE___BUILTIN_EXPECT",
"-DHAVE___BUILTIN_FFS",
"-DHAVE___BUILTIN_FFSLL",
"-DHAVE___BUILTIN_POPCOUNT",
"-DHAVE___BUILTIN_POPCOUNTLL",
"-DHAVE___BUILTIN_UNREACHABLE",
"-DHAVE___BUILTIN_TYPES_COMPATIBLE_P",
"-DHAVE___BUILTIN_ADD_OVERFLOW",
"-DHAVE___BUILTIN_ADD_OVERFLOW_P",
"-DHAVE___BUILTIN_SUB_OVERFLOW_P",
"-DHAVE_FUNC_ATTRIBUTE_CONST",
"-DHAVE_FUNC_ATTRIBUTE_FLATTEN",
"-DHAVE_FUNC_ATTRIBUTE_MALLOC",
"-DHAVE_FUNC_ATTRIBUTE_PURE",
"-DHAVE_FUNC_ATTRIBUTE_UNUSED",
"-DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT",
"-DHAVE_FUNC_ATTRIBUTE_WEAK",
"-DHAVE_FUNC_ATTRIBUTE_FORMAT",
"-DHAVE_FUNC_ATTRIBUTE_PACKED",
"-DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL",
"-DHAVE_FUNC_ATTRIBUTE_ALIAS",
"-DHAVE_FUNC_ATTRIBUTE_NORETURN",
"-DHAVE_FUNC_ATTRIBUTE_OPTIMIZE",
"-DHAVE_FUNC_ATTRIBUTE_COLD",
"-DHAVE_FUNC_ATTRIBUTE_VISIBILITY",
"-DHAVE_UINT128",
"-DHAVE_REALLOCARRAY",
"-DHAVE_FMEMOPEN",
"-D_GNU_SOURCE",
"-DHAVE___BUILTIN_IA32_CLFLUSHOPT",
"-DUSE_GCC_ATOMIC_BUILTINS",
"-DMAJOR_IN_SYSMACROS",
"-DMAJOR_IN_MKDEV",
"-DHAS_SCHED_H",
"-DHAS_SCHED_GETAFFINITY",
"-DHAVE_SYS_SYSCTL_H",
"-DHAVE_XLOCALE_H",
"-DHAVE_LINUX_FUTEX_H",
"-DHAVE_ENDIAN_H",
"-DHAVE_DLFCN_H",
"-DHAVE_SYS_SHM_H",
"-DHAVE_CET_H",
"-DHAVE_PTHREAD_NP_H",
"-DHAVE_SYS_INOTIFY_H",
"-DHAVE_LINUX_UDMABUF_H",
"-DHAVE_STRTOF",
"-DHAVE_MKOSTEMP",
"-DHAVE_MEMFD_CREATE",
"-DHAVE_RANDOM_R",
"-DHAVE_FLOCK",
"-DHAVE_STRTOK_R",
"-DHAVE_GETRANDOM",
"-DHAVE_QSORT_S",
"-DHAVE_POSIX_FALLOCATE",
"-DHAVE_SECURE_GETENV",
"-DHAVE_SYSCONF",
"-DHAVE_GNU_QSORT_R",
"-DHAVE_STRUCT_TIMESPEC",
"-DHAVE_THRD_CREATE",
"-DHAVE_PROGRAM_INVOCATION_NAME",
"-DHAVE_ISSIGNALING",
"-DHAVE_POSIX_MEMALIGN",
"-DHAVE_DIRENT_D_TYPE",
"-DHAVE_STRTOD_L",
"-DHAVE_DLADDR",
"-DHAVE_DL_ITERATE_PHDR",
"-DHAVE_ZSTD",
"-DHAVE_COMPRESSION",
"-DHAVE_LIBDRM",
"-DMESA_LLVM_VERSION_STRING="16.0"",
"-DLLVM_IS_SHARED=1",
"-DDRAW_LLVM_AVAILABLE=1",
"-DAMD_LLVM_AVAILABLE=1",
"-DGALLIVM_USE_ORCJIT=0",
"-DUSE_LIBELF",
"-DTHREAD_SANITIZER=0",
"-DHAVE_DRI2",
"-DHAVE_LIBSENSORS=1",
"-fno-emulated-tls",
"-Werror=return-type",
"-Werror=empty-body",
"-Wmisleading-indentation",
"-Wno-error=maybe-uninitialized",
"-Wno-non-virtual-dtor",
"-Wno-missing-field-initializers",
"-Wno-format-truncation",
"-fno-math-errno",
"-fno-trapping-math",
"-Qunused-arguments",
"-flifetime-dse=1",
"-Wno-unknown-pragmas",
"-Wno-microsoft-enum-value",
"-Werror=format",
"-Wformat-security",
"-ffunction-sections",
"-fdata-sections",
],
}

17 changes: 17 additions & 0 deletions output-dir/include/Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright (C) 2024 Android Open Source Project
* SPDX-License-Identifier: Apache-2.0
*/

package {
// See: http://go/android-license-faq
default_applicable_licenses: ["external_mesa3d_license"],
}

cc_library_headers {
name: "inc_winddk",
export_include_dirs: [
"winddk",
],
}

Loading