diff options
Diffstat (limited to 'meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch')
-rw-r--r-- | meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch b/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch index 06908e94fe..e3d0477930 100644 --- a/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch +++ b/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch | |||
@@ -21,8 +21,6 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
21 | CPP/7zip/var_gcc.mak | 2 -- | 21 | CPP/7zip/var_gcc.mak | 2 -- |
22 | 2 files changed, 1 insertion(+), 3 deletions(-) | 22 | 2 files changed, 1 insertion(+), 3 deletions(-) |
23 | 23 | ||
24 | diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak | ||
25 | index bcb06a0..297f0a8 100644 | ||
26 | --- a/CPP/7zip/7zip_gcc.mak | 24 | --- a/CPP/7zip/7zip_gcc.mak |
27 | +++ b/CPP/7zip/7zip_gcc.mak | 25 | +++ b/CPP/7zip/7zip_gcc.mak |
28 | @@ -45,7 +45,7 @@ CFLAGS_DEBUG = -g | 26 | @@ -45,7 +45,7 @@ CFLAGS_DEBUG = -g |
@@ -30,12 +28,10 @@ index bcb06a0..297f0a8 100644 | |||
30 | CFLAGS_DEBUG = -DNDEBUG | 28 | CFLAGS_DEBUG = -DNDEBUG |
31 | ifneq ($(CC), $(CROSS_COMPILE)clang) | 29 | ifneq ($(CC), $(CROSS_COMPILE)clang) |
32 | -LFLAGS_STRIP = -s | 30 | -LFLAGS_STRIP = -s |
33 | +LFLAGS_STRIP = | 31 | +LFLAGS_STRIP = |
34 | endif | 32 | endif |
35 | endif | 33 | endif |
36 | 34 | ||
37 | diff --git a/CPP/7zip/var_gcc.mak b/CPP/7zip/var_gcc.mak | ||
38 | index 664491c..6d0f485 100644 | ||
39 | --- a/CPP/7zip/var_gcc.mak | 35 | --- a/CPP/7zip/var_gcc.mak |
40 | +++ b/CPP/7zip/var_gcc.mak | 36 | +++ b/CPP/7zip/var_gcc.mak |
41 | @@ -6,7 +6,5 @@ IS_ARM64= | 37 | @@ -6,7 +6,5 @@ IS_ARM64= |
@@ -46,6 +42,12 @@ index 664491c..6d0f485 100644 | |||
46 | -CXX=$(CROSS_COMPILE)g++ | 42 | -CXX=$(CROSS_COMPILE)g++ |
47 | 43 | ||
48 | # -march=armv8-a+crc+crypto | 44 | # -march=armv8-a+crc+crypto |
49 | -- | 45 | --- a/CPP/7zip/var_clang.mak |
50 | 2.34.1 | 46 | +++ b/CPP/7zip/var_clang.mak |
51 | 47 | @@ -6,6 +6,4 @@ IS_ARM64= | |
48 | CROSS_COMPILE= | ||
49 | MY_ARCH= | ||
50 | USE_ASM= | ||
51 | -CC=$(CROSS_COMPILE)clang | ||
52 | -CXX=$(CROSS_COMPILE)clang++ | ||
53 | USE_CLANG=1 | ||