Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Jul 2018 19:36:52 +0200
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        Guido Falsi <madpilot@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r475110 - head/deskutils/calibre
Message-ID:  <20180722173652.onc5s42errrboqtn@atuin.in.mat.cc>
In-Reply-To: <201807221648.w6MGmnWF049911@repo.freebsd.org>
References:  <201807221648.w6MGmnWF049911@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--ly7lcbx7avmcwoke
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Jul 22, 2018 at 04:48:49PM +0000, Guido Falsi wrote:
> Author: madpilot
> Date: Sun Jul 22 16:48:48 2018
> New Revision: 475110
> URL: https://svnweb.freebsd.org/changeset/ports/475110
>=20
> Log:
>   Fix build when using python 3 as default by propagating flavored
>   sip binary to make environment.

I do not understand when that can possibly be the case, whatever Python
is the default, it is the defaut, and calibre not being flavored, it
will bring in the default, which will have LOCAL/bin/sip.

>   PR:		229956
>   Submitted by:	fluffy
>=20
> Modified:
>   head/deskutils/calibre/Makefile
>=20
> Modified: head/deskutils/calibre/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/deskutils/calibre/Makefile	Sun Jul 22 16:39:16 2018	(r475109)
> +++ head/deskutils/calibre/Makefile	Sun Jul 22 16:48:48 2018	(r475110)
> @@ -70,7 +70,8 @@ MAKE_ENV+=3D	FC_INC_DIR=3D"${LOCALBASE}/include/fontcon=
fig
>  		XDG_DATA_DIRS=3D${STAGEDIR}${PREFIX}/share \
>  		XDG_CONFIG_HOME=3D${WRKDIR}/xdg-config \
>  		XDG_UTILS_INSTALL_MODE=3Dsystem \
> -		QMAKE=3D${QMAKE}
> +		QMAKE=3D${QMAKE} \
> +		SIP_BIN=3Dsip-${PYTHON_VER}
> =20
>  post-patch:
>  	@${REINPLACE_CMD} -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \
>=20
>=20

--=20
Mathieu Arnold

--ly7lcbx7avmcwoke
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAltUwLRfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB
QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD
zkicYQ/+P+9paW88omWOSXnGRksjSOuav5Ln1UKMwmcvkWkiUQJ5EENOHHBwjiYJ
i0tsJTlupFdZBYSIL/g8TDrtjKabnFz/7fXLor1rBConfgidIIvbwGgCCY5XjkgR
qjo8jTocgyzi+7b+cMaB1aSwEWnAHaDtw/UpwGW6iqdrp1fP0pvwHCiPYW6JArO7
rlJhXjyth4QlY7AYOUEfe18f4V/utSlKMZd0ML5yD/NNw0v9/hajPfm0+ot4MVOp
wqyhNjFIJ359eSkxwFII43xYa30aeRKMIttfhb+i6siraDlikFHT5frVCxHunYGS
bh7qwTypCeLFW1QUnCA9B1upiMZ/71DInVf1C3Rz2SFAZSGnmmG/W0OQUl/YSpx8
UNS+kJy9hB9NpPYVIp1wnfRO7mh9ygZ0/zRzLIarCkJJsgVg84ZyduMHKwdOeTil
+bGpLB5itRFHK990CZGkyRz0C2eNySehRyznKCbz2j0WwZG7uiVWasCVwZsMhzoE
rjU3r50OIg60N+oW1jIKlKYC5zPWpCt20X2Il8f0myaIyOGDCEyr0hgkZRNa0Q3I
QtreFD/Dqt6cgK5Bbksu9HHecUn0Y0YVmuhJ9MlR1qZPkhFgnd/uq8AbbzLCGlRU
wLn6w1AiVyO8prFX1c7BAUmFU006K7oVGLMVtJVqP9DddTjGhMI=
=W7Od
-----END PGP SIGNATURE-----

--ly7lcbx7avmcwoke--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180722173652.onc5s42errrboqtn>