FreeBSD Port: graphics/hugin

[Greg Larkin]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 1/18/13 1:34 PM, Rainer Hurling wrote:
> On 18.01.2013 18:48 (UTC+2), Greg Larkin wrote:
>> On 1/18/13 12:00 PM, Rainer Hurling wrote:
>>> On 18.01.2013 08:37 (UTC+2), Vasil Dimov wrote:
>>>> On Thu, Jan 17, 2013 at 16:34:59 -0600, ajtiM wrote:
>>>>> My system: 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243826: Tue
>>>>> Dec 4 06:55:39 UTC 2012 
>>>>> root at obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC
>>>>> i386
>>>>> 
>>>>> clang -v: FreeBSD clang version 3.1 (branches/release_31 
>>>>> 156863) 20120523 Target: i386-unknown-freebsd9.0 Thread
>>>>> model: posix
>>>>> 
>>>>> I try to update hugin (Chase OpenEXR lib update) with clang
>>>>> but I got an error:
>>>>> 
>>>>> 
>>>>> In file included from 
>>>>> /usr/ports/graphics/hugin/work/hugin-2011.4.0/src/foreign/zthread/src/vanilla/SimpleAtomicCount.cxx:26:
>>>>>
>>>>>
>>
>>>>> 
/usr/ports/graphics/hugin/work/hugin-2011.4.0/src/foreign/zthread/src/../include/zthread/Guard.h:117:9:
>> 
>>>>> error: void function 'createScope' should not return a
>>>>> value [-Wreturn-type] return false; ^      ~~~~~ 
>>>>> /usr/ports/graphics/hugin/work/hugin-2011.4.0/src/foreign/zthread/src/../include/zthread/Guard.h:121:5:
>>>>>
>>>>> 
error: void function 'createScope' should not return a value
>>>>> [-Wreturn-type] return true; ^      ~~~~ 2 errors
>>>>> generated. *** 
>>>>> [src/foreign/zthread/src/CMakeFiles/ZThread.dir/AtomicCount.cxx.o]
>>>>>
>>>>> 
Error code 1
>>>> [...]
>>>> 
>>>> Hello,
>>>> 
>>>> Do you have
>>>> 
>>>> CC=clang CXX=clang++ CPP=clang-cpp
>>>> 
>>>> in your environment, e.g. /etc/make.conf ?
>>>> 
>>>> hugin does not seem to compile with clang. I fixed the above 
>>>> error but a set of another ones spills out.
>>>> 
>>>> Can you try the attached patch which should force it to
>>>> compile with gcc and confirm whether it fixes the problem for
>>>> you?
>> 
>>> Hi Vasil,
>> 
>>> thanks for the patch for Makefile and 
>>> src/foreign/flann/util/logger.h. Both works nice for me on
>>> recent 10.0-CURRENT amd64.
>> 
>>> With USE_GCC=yes the patch uses lang/gcc46. Isn't USE_GCC=any
>>> also sufficient, so we can use systems compiler gcc-4.2.1, if
>>> present?
>> 
>>> Rainer
>> 
>>>> The clang compilation issues would better be addressed with
>>>> the hugin authors.
>>>> 
>> 
>> 
>> 
>> Hi all,
> 
> hi Greg,
> 
>> The build with clang dies inside of the zthread code included in
>> the hugin distro, and I wonder if it would be fixed with the same
>> patch that I committed to the devel/zthread port this week?
> 
> very nice idea and problably the right one.
> 
>> Here is the patch file for zthread's Guard.h file:
>> 
>> http://svnweb.freebsd.org/ports/head/devel/zthread/files/patch-include__zthread__Guard.h?revision=310556&view=co
>
>> 
> I just tried your patch on hugin (my patch attached) with clang and
> it builds and installs fine. A quick test using hugin also seems to
> be ok.
> 
> I did not use your fourth item in patching Guard.h, because it is 
> different from yours and should already ok for clang:
> 
> in zthreads Guard.h:l.494 -    if(!isDisabled()) +
> if(!this->isDisabled()) LockingPolicy::destroyScope(*this);
> 
> in hugins Guard.h:l.494 if(!LockHolder<LockType>::isDisabled()) 
> LockingPolicy::destroyScope(*this);
> 
> This should be ok within hugins Guard.h. What do you think about
> it?
> 
> Many thanks, Rainer
> 
>> 
>> Hope that helps, Greg

Hi Rainer,

Yes, your patch for Guard.h looks fine, and I think it should be
committed to the hugin port.

Cheers,
Greg
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (Darwin)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlD5tvUACgkQ0sRouByUApC2cgCdGEfO2U8SZi+CHUzy/zyLCS98
xQsAoLWNRDRZPShsHwJuRFYKHBA7JQ3h
=6Z87
-----END PGP SIGNATURE-----