Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:jayvdb:branches:devel:languages:python:numeric
meson
meson-fix-gcc48.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File meson-fix-gcc48.patch of Package meson
--- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -140,8 +140,8 @@ class ClangCPPCompiler(ClangCompiler, CP def get_options(self): opts = CPPCompiler.get_options(self) opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a', - 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'], + ['none', 'c++98', 'c++03', 'c++11', 'c++1y', 'c++14', 'c++17', 'c++1z', 'c++2a', + 'gnu++11', 'gnu++1y', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'], 'none')}) return opts @@ -171,8 +171,8 @@ class ArmclangCPPCompiler(ArmclangCompil def get_options(self): opts = CPPCompiler.get_options(self) opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', - 'gnu++98', 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17'], + ['none', 'c++98', 'c++03', 'c++11', 'c++1y', 'c++14', 'c++17', + 'gnu++98', 'gnu++03', 'gnu++11', 'gnu++1y', 'gnu++14', 'gnu++17'], 'none')}) return opts @@ -197,10 +197,12 @@ class GnuCPPCompiler(GnuCompiler, CPPCom '3': default_warn_args + ['-Wextra', '-Wpedantic']} def get_options(self): + cpp_stds = ['c++98', 'c++03', 'c++11', 'c++1y', 'gnu++11', 'gnu++1y'] + if version_compare(self.version, '>=5.0.0'): + cpp_stds += ['c++14', 'c++17', 'c++1z', 'c++2a', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'] opts = CPPCompiler.get_options(self) opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a', - 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'], + ['none'] + cpp_stds, 'none'), 'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl', 'STL debug mode', @@ -276,7 +278,7 @@ class IntelCPPCompiler(IntelCompiler, CP c_stds = ['c++98', 'c++03'] g_stds = ['gnu++98', 'gnu++03'] if version_compare(self.version, '>=15.0.0'): - c_stds += ['c++11', 'c++14'] + c_stds += ['c++11', 'c++1y', 'c++14'] g_stds += ['gnu++11'] if version_compare(self.version, '>=16.0.0'): c_stds += ['c++17'] --- a/mesonbuild/minit.py +++ b/mesonbuild/minit.py @@ -143,7 +143,7 @@ int main(int argc, char **argv) {{ hello_cpp_meson_template = '''project('{project_name}', 'cpp', version : '{version}', default_options : ['warning_level=3', - 'cpp_std=c++14']) + 'cpp_std=c++1y']) exe = executable('{exe_name}', '{source_name}', install : true) @@ -214,7 +214,7 @@ int main(int argc, char **argv) {{ lib_cpp_meson_template = '''project('{project_name}', 'cpp', version : '{version}', - default_options : ['warning_level=3', 'cpp_std=c++14']) + default_options : ['warning_level=3', 'cpp_std=c++1y']) # These arguments are only used to build the shared library # not the executables that use the library. @@ -404,7 +404,7 @@ def create_meson_build(options): default_options = ['warning_level=3'] if options.language == 'cpp': # This shows how to set this very common option. - default_options += ['cpp_std=c++14'] + default_options += ['cpp_std=c++1y'] # If we get a meson.build autoformatter one day, this code could # be simplified quite a bit. formatted_default_options = ', '.join("'{}'".format(x) for x in default_options) --- a/run_unittests.py +++ b/run_unittests.py @@ -3390,7 +3421,7 @@ self.assertListEqual(tests_to_find, []) # Check buildoptions - buildopts_to_find = {'cpp_std': 'c++11'} + buildopts_to_find = {'cpp_std': 'c++11'} for i in res['buildoptions']: assertKeyTypes(buildoptions_keylist, i) valid_type = False @@ -3493,12 +3524,12 @@ with open(introfile, 'r') as fp: res1 = json.load(fp) - self.setconf('-Dcpp_std=c++14') + self.setconf('-Dcpp_std=c++1y') self.setconf('-Dbuildtype=release') for idx, i in enumerate(res1): if i['name'] == 'cpp_std': - res1[idx]['value'] = 'c++14' + res1[idx]['value'] = 'c++1y' if i['name'] == 'buildtype': res1[idx]['value'] = 'release' if i['name'] == 'optimization': @@ -5505,11 +5537,12 @@ out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json')) expected = { 'kwargs': { - 'project#/': {'version': '0.0.1', 'default_options': ['cpp_std=c++14', 'debug=true']}, + 'project#/': {'version': '0.0.1', 'default_options': ['cpp_std=c++1y', 'debug=true']}, 'target#tgt1': {'build_by_default': True}, 'dependency#dep1': {'required': False} } } + print('expected', expected) self.assertDictEqual(out, expected) class NativeFileTests(BasePlatformTests): --- "a/test cases/common/152 simd/simdchecker.c" +++ "b/test cases/common/152 simd/simdchecker.c" @@ -10,11 +10,12 @@ int check_simd_implementation(float *fou const float *expected, simd_func fptr, const int blocksize) { + int i; int rv = 0; memcpy(four, four_initial, blocksize*sizeof(float)); printf("Using %s.\n", simd_type); fptr(four); - for(int i=0; i<blocksize; i++) { + for(i=0; i<blocksize; i++) { if(four[i] != expected[i]) { printf("Increment function failed, got %f expected %f.\n", four[i], expected[i]); rv = 1; --- "a/test cases/unit/55 introspection/meson.build" +++ "b/test cases/unit/55 introspection/meson.build" @@ -1,4 +1,4 @@ -project('introspection', ['c', 'cpp'], version: '1.2.3', default_options: ['cpp_std=c++11', 'buildtype=debug']) +project('introspection', ['c', 'cpp'], version: '1.2.3', default_options: ['cpp_std=c++11', 'buildtype=debug']) dep1 = dependency('threads') dep2 = dependency('zlib', required: false) --- "a/test cases/unit/56 introspect buildoptions/meson.build" +++ "b/test cases/unit/56 introspect buildoptions/meson.build" @@ -1,4 +1,4 @@ -project('introspect buildargs', ['c'], default_options: ['c_std=c11', 'cpp_std=c++14', 'buildtype=release']) +project('introspect buildargs', ['c'], default_options: ['c_std=c11', 'cpp_std=c++1y', 'buildtype=release']) subA = subproject('projectA') --- "a/test cases/rewrite/3 kwargs/defopts_delete.json" +++ "b/test cases/rewrite/3 kwargs/defopts_delete.json" @@ -5,7 +5,7 @@ "id": "/", "operation": "set", "kwargs": { - "default_options": ["cpp_std=c++14", "buildtype=release", "debug=true"] + "default_options": ["cpp_std=c++1y", "buildtype=release", "debug=true"] } }, { --- "a/test cases/rewrite/3 kwargs/remove_regex.json" +++ "b/test cases/rewrite/3 kwargs/remove_regex.json" @@ -5,7 +5,7 @@ "id": "/", "operation": "set", "kwargs": { - "default_options": ["cpp_std=c++14", "buildtype=release", "debug=true"] + "default_options": ["cpp_std=c++1y", "buildtype=release", "debug=true"] } }, {
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor