diff options
| -rw-r--r-- | meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch | 15 | ||||
| -rw-r--r-- | meta/recipes-support/libgcrypt/files/run-ptest | 2 | ||||
| -rw-r--r-- | meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb | 18 |
3 files changed, 20 insertions, 15 deletions
diff --git a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch new file mode 100644 index 00000000000..4655ad4f7cd --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch @@ -0,0 +1,15 @@ +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/tests/testdrv.c b/tests/testdrv.c +index 0ccde326..6d6abd57 100644 +--- a/tests/testdrv.c ++++ b/tests/testdrv.c +@@ -32,7 +32,6 @@ + # include <fcntl.h> + # include <sys/wait.h> + #endif +-#include <gpg-error.h> /* For some macros. */ + + #include "stopwatch.h" + diff --git a/meta/recipes-support/libgcrypt/files/run-ptest b/meta/recipes-support/libgcrypt/files/run-ptest index 4818a061b4b..bdb3b280744 100644 --- a/meta/recipes-support/libgcrypt/files/run-ptest +++ b/meta/recipes-support/libgcrypt/files/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -make -C build/tests runtest-TESTS +GCRYPT_IN_REGRESSION_TEST=1 ./testdrv --verbose diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb index c1f52aedff5..da48b87a91c 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb @@ -25,6 +25,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \ file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ + file://no-native-gpg-error.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de" @@ -39,8 +40,6 @@ inherit autotools texinfo binconfig-disabled pkgconfig ptest EXTRA_OECONF = "--disable-asm" EXTRA_OEMAKE:class-target = "LIBTOOLFLAGS='--tag=CC'" -PRIVATE_LIBS:${PN}-ptest:append = " libgcrypt.so.20" - PACKAGECONFIG ??= "capabilities" PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap" @@ -50,18 +49,9 @@ do_configure:prepend () { } do_install_ptest() { - cp -r --preserve=mode,links -v ${S} ${D}${PTEST_PATH} - cp -r --preserve=mode,links -v ${B} ${D}${PTEST_PATH} - rm ${D}${PTEST_PATH}/build/cipher/gost-s-box - rm ${D}${PTEST_PATH}/build/doc/yat2m - rm ${D}${PTEST_PATH}/build/libtool - rm ${D}${PTEST_PATH}/build/config.status - rm ${D}${PTEST_PATH}/build/config.log - rm ${D}${PTEST_PATH}/build/src/mpicalc - rm ${D}${PTEST_PATH}/${BP}/autom4te* -rf - sed -i -e 's/Makefile:.*/Makefile-disabled:/' ${D}${PTEST_PATH}/build/Makefile - find ${D}/${PTEST_PATH}/build -name "*.cmake" -or -name "Makefile" \ - | xargs sed -e "s|${WORKDIR}|${PTEST_PATH}|g" -e "s|${WORKDIR}/recipe-sysroot-native||g" -i + cd tests + oe_runmake testdrv-build testdrv + install testdrv $(srcdir=${S}/tests ./testdrv-build --files | sort | uniq) ${D}${PTEST_PATH} } FILES:${PN}-dev += "${bindir}/hmac256 ${bindir}/dumpsexp" |