libraries
/
libpcscxx
1
0
Fork 0
Code Issues Releases Activity

fix build in stretch, problem: other pkcs11.h providers require old openssl 1.0 instead of new 1.1

Browse Source
master
Marc Wäckerlin 7 years ago
parent 04d681f784
commit 58c7549fb1
3 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      bootstrap.sh
  2. 4
      build-in-docker.sh
  3. 2
      configure.ac

18
bootstrap.sh
Unescape View File

@ -88,7 +88,7 @@ DESCRIPTION
${DEFAULT_PROJECT_NAME} as the project name for your project in ${DEFAULT_PROJECT_NAME} as the project name for your project in
${PROJECT_PATH}. In the first run, you should call ${MY_NAME} from a ${PROJECT_PATH}. In the first run, you should call ${MY_NAME} from a
checked out the bootstrap-build-environment from checked out the bootstrap-build-environment from
https://dev.marc.waeckerlin.org/, and the path from where you call https://mrw.sh/, and the path from where you call
${MY_NAME} (which is actually ${PROJECT_PATH}) should be the path to ${MY_NAME} (which is actually ${PROJECT_PATH}) should be the path to
your newly created project. Please note that your project must be a your newly created project. Please note that your project must be a
checked out subversion or git repository, since this build checked out subversion or git repository, since this build
@ -98,7 +98,7 @@ DESCRIPTION
subversion on https:/path/to/your/new-project: subversion on https:/path/to/your/new-project:
cd ~/svn cd ~/svn
svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\ svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\
bootstrap-build-environment bootstrap-build-environment
svn co https:/path/to/your/new-project/trunk new-project svn co https:/path/to/your/new-project/trunk new-project
cd new-project cd new-project
@ -108,7 +108,7 @@ DESCRIPTION
git on https:/path/to/your/new-project: git on https:/path/to/your/new-project:
cd ~/svn cd ~/svn
svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\ svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\
bootstrap-build-environment bootstrap-build-environment
cd ~/git cd ~/git
git clone https:/path/to/your/new-project git clone https:/path/to/your/new-project
@ -1092,10 +1092,10 @@ to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF
"foo": ["sha256", "fcde2b2edxx56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"] "foo": ["sha256", "fcde2b2edxx56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"]
}, },
"ldap": { "ldap": {
"url": "ldap://dev.marc.waeckerlin.org", "url": "ldap://your.ldap.host",
"adminDn": "cn=tmp,ou=system,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org", "adminDn": "cn=tmp,ou=system,ou=people,dc=your,dc=ldap,dc=host",
"adminPassword": "secret", "adminPassword": "secret",
"searchBase": "ou=person,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org", "searchBase": "ou=person,ou=people,dc=your,dc=ldap,dc=host",
"searchFilter": "(uid={{username}})" "searchFilter": "(uid={{username}})"
} }
} }
@ -1899,9 +1899,9 @@ to build-in-docker.conf <<EOF
${HEADER}# Use Ubuntu Universe Repository ${HEADER}# Use Ubuntu Universe Repository
repos+=("ubuntu:::universe") repos+=("ubuntu:::universe")
# Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org # Use Marc Wäckerlin's Repository, see https://repository.mrw.sh
repos+=("debian|ubuntu:::https://dev.marc.waeckerlin.org/repository:::https://dev.marc.waeckerlin.org/repository/@DISTRIBUTOR@/marc-waeckerlin.repo") repos+=("debian|ubuntu:::https://repository.mrw.sh:::https://repository.mrw.sh/@DISTRIBUTOR@/marc-waeckerlin.repo")
keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey") keys+=("https://repository.mrw.sh/PublicKey")
# centos requires epel-release for some packages, such as Qt WebKit # centos requires epel-release for some packages, such as Qt WebKit
packages+=("centos:::epel-release") packages+=("centos:::epel-release")

4
build-in-docker.sh
Unescape View File

@ -75,8 +75,8 @@ while test $# -gt 0; do
echo " -e ANDROID_HOME=/opt/local/android \\" echo " -e ANDROID_HOME=/opt/local/android \\"
echo " -d /opt/local/android \\" echo " -d /opt/local/android \\"
echo " -r universe \\" echo " -r universe \\"
echo " -r https://dev.marc.waeckerlin.org/repository \\" echo " -r https://repository.mrw.sh \\"
echo " -k https://dev.marc.waeckerlin.org/repository/PublicKey \\" echo " -k https://repository.mrw.sh/PublicKey \\"
echo " -p mrw-c++" echo " -p mrw-c++"
echo echo
exit 0 exit 0

2
configure.ac
Unescape View File

@ -52,7 +52,7 @@ CPPFLAGS="${CPPFLAGS} -DQT_NO_KEYWORDS"
# libraries used # libraries used
if test -z "$MINGW"; then if test -z "$MINGW"; then
AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h], [libpcsclite pcsc-lite]) AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h], [libpcsclite pcsc-lite])
AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [p11-kit libpkcs11-helper-1 libp11 libpkcs11-helper1]) AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [p11-kit gnutls libp11 libpkcs11-helper1 libpkcs11-helper-1])
AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl libopenssl]) AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl libopenssl])
AX_PKG_REQUIRE([crypto], [libcrypto], [openssl/crypto.h], [libssl openssl libopenssl]) AX_PKG_REQUIRE([crypto], [libcrypto], [openssl/crypto.h], [libssl openssl libopenssl])
else else

Write Preview
Loading…
Cancel
Save