Skip to content

Commit

Permalink
Update python build for conda packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
bryan-hunt committed Dec 3, 2020
1 parent e981e09 commit 09bfc5a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.6.4)
project (cryptoauthlib)
project (cryptoauthlib C)

# Set the current release version
set(VERSION "3.2.5")
Expand Down
2 changes: 1 addition & 1 deletion lib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.1.0)
project(cryptoauth)
project(cryptoauth C)

include(CMakeDependentOption)
include(CheckSymbolExists)
Expand Down
2 changes: 2 additions & 0 deletions lib/hal/hal_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ ATCA_STATUS hal_create_mutex(void ** ppMutex, char* pName)
pthread_mutexattr_t muattr;
pthread_mutexattr_init(&muattr);
pthread_mutexattr_settype(&muattr, PTHREAD_MUTEX_ERRORCHECK);
#ifdef PTHREAD_PRIO_INHERIT
pthread_mutexattr_setprotocol(&muattr, PTHREAD_PRIO_INHERIT);
#endif
pthread_mutexattr_setrobust(&muattr, PTHREAD_MUTEX_ROBUST);
if (pName)
{
Expand Down
2 changes: 1 addition & 1 deletion python/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
recursive-include lib *.c *.h atca_config.h.in CMakeLists.txt 90-cryptohid.rules
recursive-include third_party *.c *.h
recursive-include app *.c *.h
include MANIFEST.in setup.py setup.cfg README.md VERSION
include MANIFEST.in setup.py setup.cfg README.md VERSION LICENSE.txt
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
lib = cdll.LoadLibrary('libcryptoauth.so')
# Test to ensure it has the required features to support the
# python wrapper. It may change later to a version check
assert 0 != lib.ATCAIfacecfg_size
assert 0 != lib.ATCAIfaceCfg_size
_EXTENSIONS = None
except:
_EXTENSIONS = [Extension('cryptoauthlib', sources=[])]
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10)
project (cryptoauth_test)
project (cryptoauth_test C)

option (ATCA_TEST_LOCK_ENABLE "Enable device locking functions and tests" OFF)

Expand Down

0 comments on commit 09bfc5a

Please sign in to comment.