diff options
author | Armin Kuster <akuster808@gmail.com> | 2015-01-30 19:30:15 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2015-02-01 08:11:59 -0800 |
commit | 8be6d8851bb054aa56b5e4d588c819a56004073f (patch) | |
tree | ba807337c608fa0a8c50ffd22b7a0bbc3061978c | |
parent | a58d09e2f57e0f3e906143ba3c4d90216f993891 (diff) | |
download | meta-security-8be6d8851bb054aa56b5e4d588c819a56004073f.tar.gz |
samhain: fix aarch64 build issues
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/samhain/files/add_aarch64_to_configure.patch | 34 | ||||
-rw-r--r-- | recipes-security/samhain/samhain.inc | 5 |
2 files changed, 39 insertions, 0 deletions
diff --git a/recipes-security/samhain/files/add_aarch64_to_configure.patch b/recipes-security/samhain/files/add_aarch64_to_configure.patch new file mode 100644 index 0000000..05f4413 --- /dev/null +++ b/recipes-security/samhain/files/add_aarch64_to_configure.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Index: samhain-3.1.3/config.sub | ||
2 | =================================================================== | ||
3 | --- samhain-3.1.3.orig/config.sub | ||
4 | +++ samhain-3.1.3/config.sub | ||
5 | @@ -250,6 +250,7 @@ case $basic_machine in | ||
6 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
7 | | am33_2.0 \ | ||
8 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | ||
9 | + | aarch64 | aarch64be \ | ||
10 | | bfin \ | ||
11 | | c4x | clipper \ | ||
12 | | d10v | d30v | dlx | dsp16xx \ | ||
13 | @@ -332,6 +333,7 @@ case $basic_machine in | ||
14 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
15 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | ||
16 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | ||
17 | + | aarch64-* | aarch64be-* \ | ||
18 | | avr-* | avr32-* \ | ||
19 | | bfin-* | bs2000-* \ | ||
20 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | ||
21 | Index: samhain-3.1.3/config.guess | ||
22 | =================================================================== | ||
23 | --- samhain-3.1.3.orig/config.guess | ||
24 | +++ samhain-3.1.3/config.guess | ||
25 | @@ -882,6 +882,9 @@ EOF | ||
26 | echo ${UNAME_MACHINE}-unknown-linux-gnueabi | ||
27 | fi | ||
28 | exit ;; | ||
29 | + aarch64*:Linux:*:*) | ||
30 | + echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
31 | + exit ;; | ||
32 | avr32*:Linux:*:*) | ||
33 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
34 | exit ;; | ||
diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc index b914cb1..3c54c28 100644 --- a/recipes-security/samhain/samhain.inc +++ b/recipes-security/samhain/samhain.inc | |||
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b" | |||
7 | SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ | 7 | SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ |
8 | file://${INITSCRIPT_NAME}.init \ | 8 | file://${INITSCRIPT_NAME}.init \ |
9 | file://${INITSCRIPT_NAME}.default \ | 9 | file://${INITSCRIPT_NAME}.default \ |
10 | file://add_aarch64_to_configure.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRC_URI[md5sum] = "64572a4dbfdc8065d6e9f7ca0eab0a34" | 13 | SRC_URI[md5sum] = "64572a4dbfdc8065d6e9f7ca0eab0a34" |
@@ -41,6 +42,10 @@ do_configure_prepend_arm() { | |||
41 | export sh_cv___va_copy=yes | 42 | export sh_cv___va_copy=yes |
42 | } | 43 | } |
43 | 44 | ||
45 | do_configure_prepend_aarch64() { | ||
46 | export sh_cv___va_copy=yes | ||
47 | } | ||
48 | |||
44 | # If we use oe_runconf in do_configure() it will by default | 49 | # If we use oe_runconf in do_configure() it will by default |
45 | # use the prefix --oldincludedir=/usr/include which is not | 50 | # use the prefix --oldincludedir=/usr/include which is not |
46 | # recognized by Samhain's configure script and would invariably | 51 | # recognized by Samhain's configure script and would invariably |