james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compile time warnings about -no-install on Darwin/clang

Browse Source
This commit is contained in:
Trevor Bentley
2017-10-26 11:59:56 +02:00
parent 05ac49abbb
commit a7eb0657f1
5 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+16
View File
@@ -58,6 +58,22 @@ DX_INIT_DOXYGEN(libykpiv,lib/Doxyfile)
gl_LD_VERSION_SCRIPT gl_LD_VERSION_SCRIPT
gl_VALGRIND_TESTS gl_VALGRIND_TESTS
# Check for clang
AC_CACHE_CHECK([for clang],
cv_clang,[
AC_TRY_COMPILE([], [
#ifdef __clang__
#else
#error "NOT CLANG"
#endif
return 0;
],
[cv_clang=yes],
[cv_clang=no],
[])
])
AM_CONDITIONAL([COMPILER_CLANG], [test "$cv_clang" = yes])
AC_ARG_WITH([backend], AC_ARG_WITH([backend],
[AS_HELP_STRING([--with-backend=ARG], [AS_HELP_STRING([--with-backend=ARG],
[use specific backend/linkage; 'pcsc', 'macscard' or 'winscard'])], [use specific backend/linkage; 'pcsc', 'macscard' or 'winscard'])],
lib/tests/Makefile.am
+8 -1
View File
@@ -28,7 +28,14 @@
AM_CFLAGS = $(WARN_CFLAGS) @CHECK_CFLAGS@ $(OPENSSL_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) @CHECK_CFLAGS@ $(OPENSSL_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(OPENSSL_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(OPENSSL_CFLAGS)
AM_LDFLAGS = -no-install @CHECK_LIBS@ AM_LDFLAGS = @CHECK_LIBS@
if COMPILER_CLANG
AM_LDFLAGS += -no-fast-install
else
AM_LDFLAGS += -no-install
endif
LDADD = ../libykpiv.la $(OPENSSL_LIBS) LDADD = ../libykpiv.la $(OPENSSL_LIBS)
check_PROGRAMS = basic parse_key api check_PROGRAMS = basic parse_key api
tool/tests/Makefile.am
+7 -1
View File
@@ -34,7 +34,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib
AM_CPPFLAGS += -I$(top_srcdir)/tool -I$(top_builddir)/tool AM_CPPFLAGS += -I$(top_srcdir)/tool -I$(top_builddir)/tool
AM_CPPFLAGS += $(OPENSSL_CFLAGS) AM_CPPFLAGS += $(OPENSSL_CFLAGS)
AM_LDFLAGS = -no-install @CHECK_LIBS@ AM_LDFLAGS = @CHECK_LIBS@
if COMPILER_CLANG
AM_LDFLAGS += -no-fast-install
else
AM_LDFLAGS += -no-install
endif
parse_name_LDADD = ../libpiv_util.la $(OPENSSL_LIBS) parse_name_LDADD = ../libpiv_util.la $(OPENSSL_LIBS)
test_inout_LDADD = ../libpiv_util.la test_inout_LDADD = ../libpiv_util.la
ykcs11/tests/Makefile.am
+7 -1
View File
@@ -34,7 +34,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib
AM_CPPFLAGS += -I$(top_srcdir)/ykcs11 -I$(top_builddir)/ykcs11 AM_CPPFLAGS += -I$(top_srcdir)/ykcs11 -I$(top_builddir)/ykcs11
AM_CPPFLAGS += $(OPENSSL_CFLAGS) AM_CPPFLAGS += $(OPENSSL_CFLAGS)
AM_LDFLAGS = -no-install @CHECK_LIBS@ AM_LDFLAGS = @CHECK_LIBS@
if COMPILER_CLANG
AM_LDFLAGS += -no-fast-install
else
AM_LDFLAGS += -no-install
endif
ykcs11_tests_LDADD = ../libykcs11.la $(OPENSSL_LIBS) ykcs11_tests_LDADD = ../libykcs11.la $(OPENSSL_LIBS)
ykcs11/tests/ykcs11_tests.c
+5
View File
@@ -39,6 +39,9 @@
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpointer-sign"
void dump_hex(const unsigned char *buf, unsigned int len, FILE *output, int space) { void dump_hex(const unsigned char *buf, unsigned int len, FILE *output, int space) {
unsigned int i; unsigned int i;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
@@ -662,3 +665,5 @@ int main(void) {
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#pragma clang diagnostic pop