diff options
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/onetbb-other-arches.patch | 27 | ||||
| -rw-r--r-- | gnu/packages/patches/trytond-add-guix_trytond_path.patch | 19 |
2 files changed, 35 insertions, 11 deletions
diff --git a/gnu/packages/patches/onetbb-other-arches.patch b/gnu/packages/patches/onetbb-other-arches.patch new file mode 100644 index 0000000000..4802f0fb58 --- /dev/null +++ b/gnu/packages/patches/onetbb-other-arches.patch @@ -0,0 +1,27 @@ +Declare a fallback architecture not yet considered by upstream project. + +diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h +index 001d42e0..2e68f738 100644 +--- a/src/tbb/tools_api/ittnotify_config.h ++++ b/src/tbb/tools_api/ittnotify_config.h +@@ -180,6 +180,11 @@ + # define ITT_ARCH_ARM64 6 + #endif /* ITT_ARCH_ARM64 */ + ++/* Fallback for other architectures */ ++#ifndef ITT_ARCH_GENERIC ++# define ITT_ARCH_GENERIC 99 ++#endif /* ITT_ARCH_GENERIC */ ++ + #ifndef ITT_ARCH_LOONGARCH64 + # define ITT_ARCH_LOONGARCH64 7 + #endif /* ITT_ARCH_LOONGARCH64 */ +@@ -209,6 +214,8 @@ + # define ITT_ARCH ITT_ARCH_ARM64 + # elif defined __powerpc64__ + # define ITT_ARCH ITT_ARCH_PPC64 ++# elif ++# define ITT_ARCH ITT_ARCH_GENERIC + # elif defined __loongarch__ + # define ITT_ARCH ITT_ARCH_LOONGARCH64 + # elif defined __s390__ || defined __s390x__ diff --git a/gnu/packages/patches/trytond-add-guix_trytond_path.patch b/gnu/packages/patches/trytond-add-guix_trytond_path.patch index 7dc136ec46..de4b0a1d36 100644 --- a/gnu/packages/patches/trytond-add-guix_trytond_path.patch +++ b/gnu/packages/patches/trytond-add-guix_trytond_path.patch @@ -1,24 +1,21 @@ Make trytond add all paths listed in GUIX_TRYTOND_MODULES_PATH to sys.path. -*** a/trytond/modules/__init__.py 1970-01-01 01:00:01.000000000 +0100 ---- b/trytond/modules/__init__.py 2021-12-02 22:17:28.014612267 +0100 +*** a/trytond/modules/__init__.py +--- b/trytond/modules/__init__.py *************** *** 31,36 **** ---- 31,48 ---- +--- 31,45 ---- EGG_MODULES = {} + def __extend_python_path__(): -+ tryton_python_path = os.environ.get("GUIX_TRYTOND_MODULES_PATH") -+ if tryton_python_path: -+ paths = [path[:-16] # remove "/trytond/modules" -+ for path in tryton_python_path.split(os.pathsep)] -+ sys.path.extend(paths) -+ # ensure new paths are in the pkg_resources WorkingSet -+ import pkg_resources -+ list(map(pkg_resources.working_set.add_entry, paths)) ++ trytond_modules_path = os.environ.get("GUIX_TRYTOND_MODULES_PATH") ++ if trytond_modules_path: ++ # make tryton.module behave like a namespace package ++ __path__.extend(trytond_modules_path.split(os.pathsep)) + + __extend_python_path__() ++ del __extend_python_path__ + def update_egg_modules(): |