Skip to contentSkip to conversation

fix unit tests build when LZO installed to custom folder

PATCH In review [email protected]... 2 participants 3 messages Apr 11, 2019

lore
Share & tools
lore
#0 lore raw

cover fix unit tests build when LZO installed to custom folder

From: Ilya Shipitsin <[email protected]...>

Under FreeBSD default folder is /usr/local/lib, all 3rd parties software is installed to it. I added LZO directories to unit tests search path

Ilya Shipitsin (1):
configure.ac: fix compile-time error in argv_testdriver

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 configure.ac: fix compile-time error in argv_testdriver

From: Ilya Shipitsin <[email protected]...>

allow run tests when lzo is installed to non default directory

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
configure.ac +2 -2
index dfb268ca..bcc74c32 100644
@@ -1360,8 +1360,8 @@ AC_SUBST([VENDOR_SRC_ROOT])
 AC_SUBST([VENDOR_BUILD_ROOT])
 AC_SUBST([VENDOR_DIST_ROOT])
 
-TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} -lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib"
-TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} -I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include"
+TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} ${OPTIONAL_LZO_LIBS} -lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib"
+TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} ${OPTIONAL_LZO_CFLAGS} -I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include"
 
 AC_SUBST([TEST_LDFLAGS])
 AC_SUBST([TEST_CFLAGS])
Signature · 1 line
2.20.1
Acked-by on v1 1/1
#2 lore raw

[Openvpn-devel] [PATCH applied] Re: configure.ac: fix compile-time error in argv_testdriver

Tested on FreeBSD 12, fixes the problem. Thanks.

(For the record, this needs a setup where *lzo* needs extra -L/-I flags, but OpenSSL does *not*. If you have your local OpenSSL in the same place as your local lzo, the "OpenSSL cflags" will bring in all the build needs, so I had a bit of trouble to figure this out)

Your patch has been applied to the master branch.

commit aa830e1217ddce8fdcf9995a13a8907124508e36

Author: Ilya Shipitsin
Date:   Thu Apr 11 12:45:19 2019 +0500
     configure.ac: fix compile-time error in argv_testdriver

     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18357.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering