Projects

Ticket #55: DSS-6.0.3-x86_64.patch

File DSS-6.0.3-x86_64.patch, 2.8 KB (added by bero@…, 3 years ago)

Additional fix for 64bit Linux

  • DarwinStreamingSrvr6.0.3-Source/Buildit

    old new  
    8686                ;;               
    8787 
    8888        Linux.i586 | \ 
    89         Linux.i686) 
     89        Linux.i686 | \ 
     90        Linux.x86_64) 
    9091        echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform" 
    9192                CPLUS=gcc 
    9293                CCOMP=gcc 
    … …  
    9596                 
    9697                COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe" 
    9798        INCLUDE_FLAG="-include" 
     99 
     100                if [ "$HARDWARENAME" = "x86_64" ]; then 
     101                        COMPILER_FLAGS="$COMPILER_FLAGS -fPIC" 
     102                fi 
    98103                 
    99104                CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt" 
    100105 

  • DarwinStreamingSrvr6.0.3-Source/MP3Broadcaster/BroadcasterMain.cpp

    old new  
    216216 
    217217struct sigaction act; 
    218218     
    219 #if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__linuxppc__) 
     219#if defined(sun) || defined(i386) || defined(__x86_64__) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__linuxppc__) 
    220220    sigemptyset(&act.sa_mask); 
    221221    act.sa_flags = 0; 
    222222    act.sa_handler = (void(*)(int))&SignalEventHandler; 

  • DarwinStreamingSrvr6.0.3-Source/PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp

    old new  
    20822082 
    20832083struct sigaction act; 
    20842084     
    2085 #if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__) 
     2085#if defined(sun) || defined(i386) || defined(__x86_64__) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__) 
    20862086        sigemptyset(&act.sa_mask); 
    20872087        act.sa_flags = 0; 
    20882088    act.sa_handler = (void(*)(int))&SignalEventHandler; 

  • DarwinStreamingSrvr6.0.3-Source/Server.tproj/main.cpp

    old new  
    216216    //(void) ::signal(SIGPIPE, SIG_IGN); 
    217217    struct sigaction act; 
    218218     
    219 #if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) 
     219#if defined(sun) || defined(i386) || defined(__x86_64__) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) 
    220220    sigemptyset(&act.sa_mask); 
    221221    act.sa_flags = 0; 
    222222    act.sa_handler = (void(*)(int))&sigcatcher;