1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
Description: Add CPU arch conditions to test 05_32_bits
This should solve FTBFS on riscv64 as well as other platforms that
does not support -m32 or -m64 options.
.
Tested on Debian riscv64 on QEMU and worked fine.
.
I have also submitted a [PR](https://github.com/haampie/libtree/pull/82)
to upstream, but they haven't merged it yet.
.
I've only included part of platforms here, including x86_64 and
i386, since I don't know the exact output of uname -m on those
platforms. Feel free to append more platforms to the list.
Forwarded: https://github.com/haampie/libtree/pull/82
Author: Eric Long <i@hack3r.moe>
Last-Update: 2022-08-18
--- a/tests/05_32_bits/Makefile
+++ b/tests/05_32_bits/Makefile
@@ -2,11 +2,13 @@
# Make sure the 64 bits versions are not picked up.
LD_LIBRARY_PATH=
+CPU_ARCH=$(shell uname -m)
.PHONY: clean
all: check
+ifeq ($(CPU_ARCH), $(filter x86_64 amd64 i686 i386 ppc% sparc64,$(CPU_ARCH)))
lib64/libx.so:
mkdir -p $(@D)
echo 'int a(){return 42;}' | $(CC) -shared -Wl,-soname,$(@F) -m64 -o $@ -nostdlib -x c -
@@ -25,6 +27,11 @@
../../libtree exe32
../../libtree exe64
+else
+check:
+ @echo Architecture does not support -m32 or -m64 options. Do nothing.
+endif
+
clean:
rm -rf lib32 lib64 exe*
|
