Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libglvnd
Commits: 6336253f by Timo Aaltonen at 2019-12-16T17:31:34Z fix-armel-build.diff: Attempt to fix build on armel. - - - - - 79a24201 by Timo Aaltonen at 2019-12-16T17:31:50Z release to experimental - - - - - 3 changed files: - debian/changelog - + debian/patches/fix-armel-build.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +libglvnd (1.3.0-3) experimental; urgency=medium + + * fix-armel-build.diff: Attempt to fix build on armel. + + -- Timo Aaltonen <[email protected]> Mon, 16 Dec 2019 19:31:37 +0200 + libglvnd (1.3.0-2) experimental; urgency=medium * Update libglvnd0.symbols for arm64. ===================================== debian/patches/fix-armel-build.diff ===================================== @@ -0,0 +1,42 @@ +--- a/meson.build ++++ b/meson.build +@@ -39,6 +39,9 @@ prog_py = import('python').find_installa + files_symbols_check = files('bin/symbols-check.py') + prog_nm = find_program('nm') + ++message('Host CPU family: @0@'.format(host_machine.cpu_family())) ++message('Host CPU: @0@'.format(host_machine.cpu())) ++ + with_asm = get_option('asm') + use_asm = false + if not with_asm.disabled() +@@ -52,7 +55,28 @@ if not with_asm.disabled() + 'netbsd'].contains(host_machine.system())) + add_project_arguments('-DUSE_X86_64_ASM', language : 'c') + elif host_machine.cpu_family() == 'arm' +- add_project_arguments('-DUSE_ARMV7_ASM', language : 'c') ++ # Try to figure out if we're targeting an ARMv7 or something older like ++ # armel. Note that host_machine.cpu() won't help here -- it might still ++ # return "armv7l" or "armv8l". Instead, try checking for compiler macros. ++ if ['gcc', 'clang'].contains(cc.get_id()) ++ is_armv7 = cc.compiles(''' ++#if !(defined(__ARM_ARCH_7__) \ ++ || defined(__ARM_ARCH_7A__) \ ++ || defined(__ARM_ARCH_7R__) \ ++ || defined(__ARM_ARCH_7M__) \ ++ || defined(__ARM_ARCH_7S__) \ ++ || (defined(__ARM_ARCH) && __ARM_ARCH >= 7)) ++#error "Not ARM7" ++#endif ++ ''', name : 'ARMv7 macros') ++ else ++ is_armv7 = true ++ endif ++ if is_armv7 ++ add_project_arguments('-DUSE_ARMV7_ASM', language : 'c') ++ else ++ use_asm = false ++ endif + elif host_machine.cpu_family() == 'aarch64' + add_project_arguments('-DUSE_AARCH64_ASM', language : 'c') + elif host_machine.cpu_family() == 'ppc' and host_machine.endian() == 'little' ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ fix-armv7-build.diff +fix-armel-build.diff View it on GitLab: https://salsa.debian.org/xorg-team/lib/libglvnd/compare/d3cd7dbf7cf62158e4976bc64dd1fae5d00f42f1...79a242014ef6779b1dbf9a6cf1f62261b5f6c559 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/libglvnd/compare/d3cd7dbf7cf62158e4976bc64dd1fae5d00f42f1...79a242014ef6779b1dbf9a6cf1f62261b5f6c559 You're receiving this email because of your account on salsa.debian.org.
