amarok 2.2 and phonon-xine backend

[Dima Panov]

On Thursday 01 October 2009 19:01:43 Jakob Kummerow wrote:
> > Heh. not works.
> > output log:
> >
> > CMake Warning (dev) in CMakeLists.txt:
> >  A logical block opening on the line
> >
> >  
> >  /var/tmp/usr/ports/audio/amarok-kde4/work/amarok-2.2.0/CMakeLists.txt:58
> > (if)
> >
> >  closes on the line
> >
> >  
> >  /var/tmp/usr/ports/audio/amarok-kde4/work/amarok-2.2.0/CMakeLists.txt:60
> > (endif)
> >
> >  with mis-matching arguments.
> 
> You need to insert the " AND NOT FREEBSD" part into both the "if" and
> the corresponding "endif" line, which gives the following patch:
> 
> --- ./CMakeLists.txt.orig     2009-09-30 09:21:06.000000000 -0400
> +++ ./CMakeLists.txt  2009-09-30 09:21:49.000000000 -0400
> @@ -55,9 +55,6 @@
> SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
>  if (CMAKE_COMPILER_IS_GNUCXX)
>      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
> -    if( NOT WIN32 AND NOT APPLE )
> +    if( NOT WIN32 AND NOT APPLE AND NOT FREEBSD)
>          SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed")
> -    endif( NOT WIN32 AND NOT APPLE )
> +    endif( NOT WIN32 AND NOT APPLE AND NOT FREEBSD)
>   endif (CMAKE_COMPILER_IS_GNUCXX)
> 
>   include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/shared )
> 
> This correction should make CMake happy. Since I don't have FreeBSD, I
> have no idea whether the changed code actually works.

Not work anyway. At first, this check for HOST_SYSTEM, not OS, and only accepted value is 
UNIX, which covers all unix system.

And really, which OS require to define linker flags for compiler instead of linker itself? 
It's a wrong way in any case.


-- 
Dima "Red Fox" Panov @ Home | C73E 2B72 1FFD 61BD E206 1234 A626 76ED 93E3 B018
Khabarovsk, Russia          | 2D30 2CCB 9984 130C 6F87 BAFC FB8B A09D D539 8F29
KDE at FreeBSD Team | FreeBSD committer since 10.08.2009 | FreeBSD since Sept 1995
Twitter.com:fluffy_khv | Skype:dima.panov | Jabber.org:fluffy.khv | ICQ:1745024
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 196 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/amarok/attachments/20091001/d70d2c6c/attachment.sig>