diff options
| author | Otto Kekäläinen <otto@kekalainen.net> | 2020-04-03 14:05:40 +0300 |
|---|---|---|
| committer | Otto Kekäläinen <otto@kekalainen.net> | 2020-04-05 00:24:24 +0300 |
| commit | b541defea09b658e6714e0c8b08d10741185b2ed (patch) | |
| tree | d83680ce5f296cee6e0a1ce49bd250f8b3ddef4f | |
| parent | 6959c0922a6d62e469947eb3e0fec582e754f648 (diff) | |
| download | mariadb-git-b541defea09b658e6714e0c8b08d10741185b2ed.tar.gz | |
Deb: Build depend on libcurl4-openssl-dev as primary option
The package libcurl4-dev is a virtual package, and no package with that
name actually exists. Depend on libcurl4-openssl-dev as the primary
option in case no libcurl4-dev providing package has been installed, and
if some of them (libcurl4-gnutls-dev, libcurl4-nss-dev,
libcurl4-openssl-dev ) are installed, they also satisfy the dependency
via the virtual package.
The Travis-CI still runs on libcurl3-dev as Travis-CI also runs Ubuntu
Xenial which does not yet have libcurl4 available.
This complements commit 2e0a40bdf06f6bed060c28495b1b8d6ac2b8dd0d.
| -rwxr-xr-x | debian/autobake-deb.sh | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 90fdd12de20..cf5367329ad 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -88,7 +88,7 @@ sed -i -e "/Package: mariadb-plugin-tokudb/,/^$/d" debian/control # attempt to build using older libpcre3-dev (SIC!) if ! apt-cache madison libpcre2-dev | grep --quiet 'libpcre2-dev' then - sed 's/libpcre2-dev/libpcre3-dev/' -i debian/control + sed 's/libcurl4-openssl-dev | libcurl4-dev/libpcre3-dev/' -i debian/control fi # Cassandra, Mroonga etc never built on Travis CI anyway, see build flags above diff --git a/debian/control b/debian/control index fbb4570c29d..7612351d01d 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: bison, libaio-dev [linux-any], libboost-dev, libcrack2-dev (>= 2.9.0), - libcurl4-dev, + libcurl4-openssl-dev | libcurl4-dev, libjemalloc-dev (>= 3.0.0~) [linux-any], libjudy-dev, libkrb5-dev, |