Date: Fri, 21 Feb 2014 17:42:51 +0100 From: Tijl Coosemans <tijl@coosemans.org> To: Tomasz Sowa <t.sowa@ttmath.org>, Mike Jakubik <mike.jakubik@intertainservices.com>, kaltheat@googlemail.com, CiPHER nl <cipher_nl@hotmail.com> Cc: vbox@FreeBSD.org Subject: Re: emulators/virtualbox-ose doesn't compile with libiconv Message-ID: <20140221174251.72fa8e74@kalimero.tijl.coosemans.org> In-Reply-To: <20140221170046.07c87bce@kalimero.tijl.coosemans.org> References: <20140210191712.728e1b7d@s100.slimaczek.pl> <20140221170046.07c87bce@kalimero.tijl.coosemans.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/KHvs84lX+IgsBOp2+zcXTGc
Content-Type: multipart/mixed; boundary="MP_/6l3sz8S3CjCfV.TttVQoNu2"
--MP_/6l3sz8S3CjCfV.TttVQoNu2
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
On Fri, 21 Feb 2014 17:00:46 +0100 Tijl Coosemans wrote:
> On Mon, 10 Feb 2014 19:17:12 +0100 Tomasz Sowa wrote:
>> emulators/virtualbox-ose doesn't compile when converters/libiconv is
>> installed:
>=20
> Please try the attached patch for the port Makefile.
Sorry, that one was incomplete. This one should work better.
--MP_/6l3sz8S3CjCfV.TttVQoNu2
Content-Type: text/x-patch
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=virtualbox-ose.patch
Index: emulators/virtualbox-ose/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
--- emulators/virtualbox-ose/Makefile (revision 345324)
+++ emulators/virtualbox-ose/Makefile (working copy)
@@ -220,7 +220,11 @@ post-patch:
${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
@${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed=
|g' ${WRKSRC}/configure
.if empty(ICONV_LIB)
- @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/=
Runtime/Makefile.kmk
+ @${REINPLACE_CMD} \
+ -e 's|iconv||' \
+ -e '/TEMPLATE_VBOXBLDPROG_DEFS *:=3D/s/$$/ LIBICONV_PLUG/' \
+ -e '/TEMPLATE_VBOXR3EXE_DEFS *=3D/s/$$/ LIBICONV_PLUG/' \
+ ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
.endif
=20
pre-build:
--MP_/6l3sz8S3CjCfV.TttVQoNu2--
--Sig_/KHvs84lX+IgsBOp2+zcXTGc
Content-Type: application/pgp-signature; name=signature.asc
Content-Disposition: attachment; filename=signature.asc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)
iF4EAREKAAYFAlMHghAACgkQfoCS2CCgtiu3ugD+JlO+pyCr18yWp+JF4tbaTupd
dNgGMlazKtrUN2+l2V4A/2lsrvaYsy0+yzrrmRHpGPqCDvQa8CwUbD2K4IugQPJ6
=7wtW
-----END PGP SIGNATURE-----
--Sig_/KHvs84lX+IgsBOp2+zcXTGc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140221174251.72fa8e74>