app-crypt/libu2f-server: backport optional tests patch #587472

Package-Manager: portage-2.3.0

diff --git a/app-crypt/libu2f-server/files/libu2f-server-1.0.1-tests-fix.patch b/app-crypt/libu2f-server/files/libu2f-server-1.0.1-tests-fix.patch
new file mode 100644 (file)
index 0000000..3cbb9c9
--- /dev/null
+++ b/app-crypt/libu2f-server/files/libu2f-server-1.0.1-tests-fix.patch
@@ -0,0 +1,54 @@
+From: Gokturk Yuksek <gokturk@gentoo.org>
+Subject: [PATCH] Make tests with CHECK optional at configure time
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,15 @@
+ 
+ PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto], [], [])
+ 
+-PKG_CHECK_MODULES([CHECK], [check], [], [])
++AC_ARG_ENABLE([tests],
++              [AS_HELP_STRING([--enable-tests],
++                              [use check to run the unit tests])],
++                              [enable_tests=$enableval],
++                              [enable_tests=no])
++AM_CONDITIONAL([ENABLE_TESTS],[test '!' "$enable_tests" = no])
++if test '!' "$enable_tests" = no; then
++  PKG_CHECK_MODULES([CHECK], [check], [], [AC_MSG_NOTICE(Check package not found `make check` won't work)])
++fi
+ 
+ AC_ARG_ENABLE([coverage],
+               [AS_HELP_STRING([--enable-coverage],
+@@ -123,11 +131,15 @@
+   Makefile
+   gtk-doc/Makefile
+   src/Makefile
+-  tests/Makefile
+   u2f-server/Makefile
+   u2f-server/u2f-server-version.h
+   u2f-server/u2f-server.pc
+ ])
++if test '!' "$enable_tests" = no; then
++  AC_CONFIG_FILES([
++    tests/Makefile
++  ])
++fi
+ AC_OUTPUT
+ 
+ AC_MSG_NOTICE([summary of build options:
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,7 +25,11 @@
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-SUBDIRS = u2f-server src tests gtk-doc
++SUBDIRS = u2f-server src gtk-doc
++
++if ENABLE_TESTS
++SUBDIRS+=tests
++endif
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 

diff --git a/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
index 1ff2ecd28903ea918dba84560d45e69844245084..e59d5748197f7acb17ca071c65c477bd9190c2b1 100644 (file)
--- a/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
+++ b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
+IUSE="static-libs test"
 
 RDEPEND="
        dev-libs/openssl:0=[${MULTILIB_USEDEP}]
@@ -22,18 +22,24 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       dev-libs/check[${MULTILIB_USEDEP}]
+       test? ( dev-libs/check[${MULTILIB_USEDEP}] )
 "
 
+PATCHES=(
+       "${FILESDIR}/${P}-tests-fix.patch"
+)
+
 src_prepare() {
        default
        eautoreconf
+       touch man/u2f-server.1 || die # do not rebuild the man page
 }
 
 multilib_src_configure() {
        myeconfargs=(
                --disable-h2a # tarball already contains the manpage
                $(use_enable static-libs static)
+               $(use_enable test tests)
        )
 
        ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"