From: Tomi Ollila <tomi.ollila@iki.fi>
To: =?utf-8?B?WMSrY8Oy?= <xico@atelo.org>, notmuch@notmuchmail.org
Subject: Re: pkg-config zlib check in 3c13bc
In-Reply-To: <20140506194025.GA17097@coyotlan.Tlalpan>
References: <20140506194025.GA17097@coyotlan.Tlalpan>
User-Agent: Notmuch/0.18+12~gbfbd199 (http://notmuchmail.org) Emacs/24.3.1
	(x86_64-unknown-linux-gnu)
Date: Tue, 06 May 2014 23:31:53 +0300
Message-ID: <m2mweuhcna.fsf@guru.guru-group.fi>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list

On Tue, May 06 2014, X=C4=ABc=C3=B2 <xico@atelo.org> wrote:

> Dear notmuch,
>
> Although notmuch was configuring fine on FreeBSD before 3c13bc, the pkg-c=
onfig
> check introduced for zlib does not work. Indeed, zlib is part of the
> base system, and always assumed to be present.
>
> Proposed patch puts platform test before pkg-config checks, and add a
> special case for zlib on FreeBSD. uname -U is used to get (numeric) OS ve=
rsion,
> and compared to lowest release where at least zlib 1.2.5.2 was available
> (that=E2=80=99s FreeBSD 9.1, with zlib 1.2.7).
>
> Best,

This line:
if [ $platform =3D FREEBSD -a `uname -U` -ge 901000 ] ; then

fails on systems where uname does not have -U option
as `uname -U` is executed always...

if [ $platform =3D FREEBSD ] && [ "`uname -U`" -ge 901000 ] ; then

would work better there...

But, I'd like suggest alternate option to create a test c program
and test whether it compiles (analogous to what there is already
done with many other checks) -- this same would apply to fdatasync()
case too.

If we cared about cross-compilability one could also do

zlib_vernum=3D$(printf '#include <zlib.h>\nZLIB_VERNUM' | gcc -E - | sed -n=
 '$ s/^0x/0x/p')

if [ $((${zlib_vernum:-0})) -ge 4690 ]; then # 4690 =3D=3D 0x1252
	printf "Yes\n"
        ...

But that would be sooooo inconsistent what we have now
(and possibly fragile?)

> --
> X=C4=ABc=C3=B2


Tomi


>>From ca0b168ac01391b4137de504bea2845d39d0fff9 Mon Sep 17 00:00:00 2001
> From: =3D?UTF-8?q?X=3DC4=3DABc=3DC3=3DB2?=3D <xico@atelo.org>
> Date: Tue, 6 May 2014 12:37:32 -0700
> Subject: [PATCH 1/1] FreeBSD check for zlib version.
>
> ---
>  configure | 130 +++++++++++++++++++++++++++++++++-----------------------=
------
>  1 file changed, 69 insertions(+), 61 deletions(-)
>
> diff --git a/configure b/configure
> index 9bde2eb..7204812 100755
> --- a/configure
> +++ b/configure
> @@ -270,6 +270,62 @@ EOF
>=20=20
>  errors=3D0
>=20=20
> +libdir_in_ldconfig=3D0
> +
> +printf "Checking which platform we are on... "
> +uname=3D`uname`
> +if [ $uname =3D "Darwin" ] ; then
> +    printf "Mac OS X.\n"
> +    platform=3DMACOSX
> +    linker_resolves_library_dependencies=3D0
> +elif [ $uname =3D "SunOS" ] ; then
> +    printf "Solaris.\n"
> +    platform=3DSOLARIS
> +    linker_resolves_library_dependencies=3D0
> +elif [ $uname =3D "FreeBSD" ] ; then
> +    printf "FreeBSD.\n"
> +    platform=3DFREEBSD
> +    linker_resolves_library_dependencies=3D0
> +elif [ $uname =3D "OpenBSD" ] ; then
> +    printf "OpenBSD.\n"
> +    platform=3DOPENBSD
> +    linker_resolves_library_dependencies=3D0
> +elif [ $uname =3D "Linux" ] || [ $uname =3D "GNU" ] ; then
> +    printf "$uname\n"
> +    platform=3D"$uname"
> +    linker_resolves_library_dependencies=3D1
> +
> +    printf "Checking for $libdir_expanded in ldconfig... "
> +    ldconfig_paths=3D$(/sbin/ldconfig -N -X -v 2>/dev/null | sed -n -e '=
s,^\(/.*\):\( (.*)\)\?$,\1,p')
> +    # Separate ldconfig_paths only on newline (not on any potential
> +    # embedded space characters in any filenames). Note, we use a
> +    # literal newline in the source here rather than something like:
> +    #
> +    #	IFS=3D$(printf '\n')
> +    #
> +    # because the shell's command substitution deletes any trailing newl=
ines.
> +    IFS=3D"
> +"
> +    for path in $ldconfig_paths; do
> +	if [ "$path" =3D "$libdir_expanded" ]; then
> +	    libdir_in_ldconfig=3D1
> +	fi
> +    done
> +    IFS=3D$DEFAULT_IFS
> +    if [ "$libdir_in_ldconfig" =3D '0' ]; then
> +	printf "No (will set RPATH)\n"
> +    else
> +	printf "Yes\n"
> +    fi
> +else
> +    printf "Unknown.\n"
> +    cat <<EOF
> +
> +*** Warning: Unknown platform. Notmuch might or might not build correctl=
y.
> +
> +EOF
> +fi
> +
>  if pkg-config --version > /dev/null 2>&1; then
>      have_pkg_config=3D1
>  else
> @@ -342,14 +398,22 @@ fi
>=20=20
>  printf "Checking for zlib (>=3D 1.2.5.2)... "
>  have_zlib=3D0
> -if pkg-config --atleast-version=3D1.2.5.2 zlib; then
> +# zlib is part of base in FreeBSD. version 9.1 included 1.2.7
> +if [ $platform =3D FREEBSD -a `uname -U` -ge 901000 ] ; then
>      printf "Yes.\n"
>      have_zlib=3D1
> -    zlib_cflags=3D$(pkg-config --cflags zlib)
> -    zlib_ldflags=3D$(pkg-config --libs zlib)
> +    zlib_cflags=3D
> +    zlib_ldflags=3D-lz
>  else
> -    printf "No.\n"
> -    errors=3D$((errors + 1))
> +    if pkg-config --atleast-version=3D1.2.5.2 zlib; then
> +        printf "Yes.\n"
> +        have_zlib=3D1
> +        zlib_cflags=3D$(pkg-config --cflags zlib)
> +        zlib_ldflags=3D$(pkg-config --libs zlib)
> +    else
> +        printf "No.\n"
> +        errors=3D$((errors + 1))
> +    fi
>  fi
>=20=20
>  printf "Checking for talloc development files... "
> @@ -427,62 +491,6 @@ else
>      fi
>  fi
>=20=20
> -libdir_in_ldconfig=3D0
> -
> -printf "Checking which platform we are on... "
> -uname=3D`uname`
> -if [ $uname =3D "Darwin" ] ; then
> -    printf "Mac OS X.\n"
> -    platform=3DMACOSX
> -    linker_resolves_library_dependencies=3D0
> -elif [ $uname =3D "SunOS" ] ; then
> -    printf "Solaris.\n"
> -    platform=3DSOLARIS
> -    linker_resolves_library_dependencies=3D0
> -elif [ $uname =3D "FreeBSD" ] ; then
> -    printf "FreeBSD.\n"
> -    platform=3DFREEBSD
> -    linker_resolves_library_dependencies=3D0
> -elif [ $uname =3D "OpenBSD" ] ; then
> -    printf "OpenBSD.\n"
> -    platform=3DOPENBSD
> -    linker_resolves_library_dependencies=3D0
> -elif [ $uname =3D "Linux" ] || [ $uname =3D "GNU" ] ; then
> -    printf "$uname\n"
> -    platform=3D"$uname"
> -    linker_resolves_library_dependencies=3D1
> -
> -    printf "Checking for $libdir_expanded in ldconfig... "
> -    ldconfig_paths=3D$(/sbin/ldconfig -N -X -v 2>/dev/null | sed -n -e '=
s,^\(/.*\):\( (.*)\)\?$,\1,p')
> -    # Separate ldconfig_paths only on newline (not on any potential
> -    # embedded space characters in any filenames). Note, we use a
> -    # literal newline in the source here rather than something like:
> -    #
> -    #	IFS=3D$(printf '\n')
> -    #
> -    # because the shell's command substitution deletes any trailing newl=
ines.
> -    IFS=3D"
> -"
> -    for path in $ldconfig_paths; do
> -	if [ "$path" =3D "$libdir_expanded" ]; then
> -	    libdir_in_ldconfig=3D1
> -	fi
> -    done
> -    IFS=3D$DEFAULT_IFS
> -    if [ "$libdir_in_ldconfig" =3D '0' ]; then
> -	printf "No (will set RPATH)\n"
> -    else
> -	printf "Yes\n"
> -    fi
> -else
> -    printf "Unknown.\n"
> -    cat <<EOF
> -
> -*** Warning: Unknown platform. Notmuch might or might not build correctl=
y.
> -
> -EOF
> -fi
> -
>  printf "Checking byte order... "
>  cat> _byteorder.c <<EOF
>  #include <stdio.h>
> --=20
> 1.9.2
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch