Date: Sat, 21 Mar 2015 13:19:11 +0100 From: Guido Falsi <madpilot@FreeBSD.org> To: Michelle Sullivan <michelle@sorbs.net>, Jeremie Le Hen <jlh@FreeBSD.org> Cc: freebsd-ports@freebsd.org Subject: Re: net/unison240 depends on lang/ocaml-nox11 Message-ID: <550D61BF.3030403@FreeBSD.org> In-Reply-To: <550D4CA0.8000606@sorbs.net> References: <CAGSa5y3KPuEsGHPztA4k_ejfvHnREMHysynHY%2B4ephA44rw-bg@mail.gmail.com> <CAGSa5y1ye0tAkF3Yjcd4yHA1_RjZxW025PaK3pexMChVW0c3eg@mail.gmail.com> <550D4CA0.8000606@sorbs.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 03/21/15 11:49, Michelle Sullivan wrote:
> Jeremie Le Hen wrote:
>> Actually, I've just realized that I fixed net/unison232 in my local tree :o).
>>
>> Would you mind submitting it and applying the same for unison240?
>>
>> Here is the patch:
>>
>> Index: Makefile
>> ===================================================================
>> --- Makefile (revision 381259)
>> +++ Makefile (working copy)
>> @@ -34,20 +34,18 @@
>>
>> .include <bsd.port.options.mk>
>>
>> +BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml
>> .if ${PORT_OPTIONS:MX11}
>> MAKE_ARGS+= UISTYLE=gtk2
>> PLIST_SUB+= TEXT=""
>> -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \
>> - lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
>> +BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
>> icotool:${PORTSDIR}/graphics/icoutils
>> RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
>> PATCH_DEPENDS+= ${BUILD_DEPENDS}
>> -CONFLICTS+= ocaml-nox11*
>> SUB_FILES+= ${PORTNAME}.desktop
>> .else
>> MAKE_ARGS+= UISTYLE=text
>> PLIST_SUB+= TEXT="@comment "
>> -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11
>> PATCH_DEPENDS+= ${BUILD_DEPENDS}
>> .endif
>>
>>
> This breaks -nox11 when building with pourdriere...
>
> =======================<phase: patch >============================
> ===> Patching for unison-2.48.3_1
> ===========================================================================
> =======================<phase: build-depends >============================
> ===> unison-2.48.3_1 depends on executable: ocamlc - not found
> ===> Verifying install for ocamlc in /usr/ports/lang/ocaml
> ===> unison-2.48.3_1 depends on package:
> /packages/All/ocaml-4.01.0_4.tbz - not found
> ===> USE_PACKAGE_DEPENDS_ONLY set - not building missing dependency
> from source
> *** [build-depends] Error code 1
>
> Stop in /usr/ports/net/unison.
> ===> Cleaning for unison-2.48.3_1
> build of /usr/ports/net/unison ended at Sat Mar 21 12:32:36 CET 2015
>
> -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11
>
> should be there in the 'else' section of OPTIONS:MX11 (perhaps as
> BUILD_DEPENDS= instead of BUILD_DEPENDS+=)
Which is almost what the port did, and caused an error about multiple
origins, as reported by jlh.
I'm willing to find a solution to this, but at this point I need a way
to reproduce the problem and really understand where the problem is/was.
I do build regularly this port on poudriere in two jails, one with X11
set and one with it unset and never saw this happen.
I suspect it happens when there is some misalignment with the X11 option
between ports (some with, some wothout), which is perfectly legitimate
but makes things difficult to cope with, since the ocaml package changes
it's suffix depending on that option.
can you send me the full log for the failed build? I'd like to ask the
same from jlh if he still has it, so I can understand what is really
going on.
Thanks.
--
Guido Falsi <madpilot@FreeBSD.org>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?550D61BF.3030403>