puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Drop unused WWW::Curl dependency

Browse source
This commit is contained in:
Eelco Dolstra 2016-11-28 15:58:24 +01:00
parent ae71895f55
commit d1da6967b8
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
configure.ac
View file

@ -214,7 +214,7 @@ if test "$gc" = yes; then
fi fi
# Check for the required Perl dependencies (DBI, DBD::SQLite and WWW::Curl). # Check for the required Perl dependencies (DBI, DBD::SQLite).
perlFlags="-I$perllibdir" perlFlags="-I$perllibdir"
AC_ARG_WITH(dbi, AC_HELP_STRING([--with-dbi=PATH], AC_ARG_WITH(dbi, AC_HELP_STRING([--with-dbi=PATH],
@ -225,10 +225,6 @@ AC_ARG_WITH(dbd-sqlite, AC_HELP_STRING([--with-dbd-sqlite=PATH],
[prefix of the Perl DBD::SQLite library]), [prefix of the Perl DBD::SQLite library]),
perlFlags="$perlFlags -I$withval") perlFlags="$perlFlags -I$withval")
AC_ARG_WITH(www-curl, AC_HELP_STRING([--with-www-curl=PATH],
[prefix of the Perl WWW::Curl library]),
perlFlags="$perlFlags -I$withval")
AC_MSG_CHECKING([whether DBD::SQLite works]) AC_MSG_CHECKING([whether DBD::SQLite works])
if ! $perl $perlFlags -e 'use DBI; use DBD::SQLite;' 2>&5; then if ! $perl $perlFlags -e 'use DBI; use DBD::SQLite;' 2>&5; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -236,13 +232,6 @@ if ! $perl $perlFlags -e 'use DBI; use DBD::SQLite;' 2>&5; then
fi fi
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_MSG_CHECKING([whether WWW::Curl works])
if ! $perl $perlFlags -e 'use WWW::Curl;' 2>&5; then
AC_MSG_RESULT(no)
AC_MSG_FAILURE([The Perl module WWW::Curl is missing.])
fi
AC_MSG_RESULT(yes)
AC_SUBST(perlFlags) AC_SUBST(perlFlags)

2
doc/manual/installation/prerequisites-source.xml
View file

@ -34,7 +34,7 @@
or higher. If your distribution does not provide it, please install or higher. If your distribution does not provide it, please install
it from <link xlink:href="http://www.sqlite.org/" />.</para></listitem> it from <link xlink:href="http://www.sqlite.org/" />.</para></listitem>
<listitem><para>The Perl DBI, DBD::SQLite, and WWW::Curl libraries, which are <listitem><para>The Perl DBI and DBD::SQLite libraries, which are
available from <link available from <link
xlink:href="http://search.cpan.org/">CPAN</link> if your xlink:href="http://search.cpan.org/">CPAN</link> if your
distribution does not provide them.</para></listitem> distribution does not provide them.</para></listitem>

1
nix.spec.in
View file

@ -16,7 +16,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%endif %endif
BuildRequires: perl(DBD::SQLite) BuildRequires: perl(DBD::SQLite)
BuildRequires: perl(DBI) BuildRequires: perl(DBI)
BuildRequires: perl(WWW::Curl)
BuildRequires: perl(ExtUtils::ParseXS) BuildRequires: perl(ExtUtils::ParseXS)
Requires: /usr/bin/perl Requires: /usr/bin/perl
Requires: curl Requires: curl

5
release.nix
View file

@ -33,7 +33,6 @@ let
configureFlags = '' configureFlags = ''
--with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
--enable-gc --enable-gc
''; '';
@ -85,7 +84,6 @@ let
--disable-init-state --disable-init-state
--with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
--enable-gc --enable-gc
--sysconfdir=/etc --sysconfdir=/etc
''; '';
@ -157,7 +155,6 @@ let
--disable-init-state --disable-init-state
--with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
''; '';
dontInstall = false; dontInstall = false;
@ -284,7 +281,7 @@ let
src = jobs.tarball; src = jobs.tarball;
diskImage = (diskImageFun vmTools.diskImageFuns) diskImage = (diskImageFun vmTools.diskImageFuns)
{ extraPackages = { extraPackages =
[ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "perl-WWW-Curl" "libcurl-devel" "openssl-devel" "xz-devel" ] [ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "libcurl-devel" "openssl-devel" "xz-devel" ]
++ extraPackages; }; ++ extraPackages; };
memSize = 1024; memSize = 1024;
meta.schedulingPriority = 50; meta.schedulingPriority = 50;