From 67e5407f8d9457f041a582138361d6fe323efdaf Mon Sep 17 00:00:00 2001 From: Dominik Date: Sun, 1 Jun 2014 09:33:47 +0200 Subject: [PATCH 1/3] Fix OpenSC compilation for TravisML tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 307a134..6420673 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ script: - cd pcsc-relay && autoreconf -vsi && ./configure && make && cd .. # Build libnpa, which requires OpenPACE and OpenSC - cd /tmp && git clone https://github.com/frankmorgner/openpace && cd openpace && autoreconf -vsi && ./configure --enable-openssl-install --prefix=$PREFIX && make install && cd $TRAVIS_BUILD_DIR - - cd npa/src/opensc && cp configure.ac.in configure.ac && autoreconf -vsi && ./configure --prefix=$PREFIX --enable-sm && make install && cd ../../.. + - cd npa/src/opensc && autoreconf -vsi && ./configure --prefix=$PREFIX --enable-sm && make install && cd ../../.. # - cd npa && autoreconf -vsi && ./configure OPENSC_LIBS="-L$PREFIX/lib -lopensc -lcrypto" && make # Build ccid - cd ccid && autoreconf -vsi && ./configure OPENSSL_CFLAGS="-I$PREFIX/include" OPENSSL_LIBS="-L$PREFIX/lib -lcrypto" OPENSC_LIBS="-L$PREFIX/lib -lopensc" && make From 10104b090a68a659ec248250019174e237d7ec4d Mon Sep 17 00:00:00 2001 From: Dominik Date: Sun, 1 Jun 2014 12:01:53 +0200 Subject: [PATCH 2/3] Build libnpa during TravisML tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6420673..849fcdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,6 @@ script: # Build libnpa, which requires OpenPACE and OpenSC - cd /tmp && git clone https://github.com/frankmorgner/openpace && cd openpace && autoreconf -vsi && ./configure --enable-openssl-install --prefix=$PREFIX && make install && cd $TRAVIS_BUILD_DIR - cd npa/src/opensc && autoreconf -vsi && ./configure --prefix=$PREFIX --enable-sm && make install && cd ../../.. -# - cd npa && autoreconf -vsi && ./configure OPENSC_LIBS="-L$PREFIX/lib -lopensc -lcrypto" && make + - cd npa && autoreconf -vsi && ./configure OPENSC_LIBS="-L$PREFIX/lib -lopensc -lcrypto" && make # Build ccid - cd ccid && autoreconf -vsi && ./configure OPENSSL_CFLAGS="-I$PREFIX/include" OPENSSL_LIBS="-L$PREFIX/lib -lcrypto" OPENSC_LIBS="-L$PREFIX/lib -lopensc" && make From ac259067caa90b3c836d2085adef08f33159b10e Mon Sep 17 00:00:00 2001 From: Dominik Date: Sun, 1 Jun 2014 12:12:14 +0200 Subject: [PATCH 3/3] Go back to the project root after building libnpa --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 849fcdc..b122c90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,6 @@ script: # Build libnpa, which requires OpenPACE and OpenSC - cd /tmp && git clone https://github.com/frankmorgner/openpace && cd openpace && autoreconf -vsi && ./configure --enable-openssl-install --prefix=$PREFIX && make install && cd $TRAVIS_BUILD_DIR - cd npa/src/opensc && autoreconf -vsi && ./configure --prefix=$PREFIX --enable-sm && make install && cd ../../.. - - cd npa && autoreconf -vsi && ./configure OPENSC_LIBS="-L$PREFIX/lib -lopensc -lcrypto" && make + - cd npa && autoreconf -vsi && ./configure OPENSC_LIBS="-L$PREFIX/lib -lopensc -lcrypto" && make && cd .. # Build ccid - cd ccid && autoreconf -vsi && ./configure OPENSSL_CFLAGS="-I$PREFIX/include" OPENSSL_LIBS="-L$PREFIX/lib -lcrypto" OPENSC_LIBS="-L$PREFIX/lib -lopensc" && make