optflags.patch

   1 --- DarwinStreamingSrvr6.0.3-Source/Buildit     2010-08-01 15:52:52.789829857 +0300
   2 +++ DarwinStreamingSrvr6.0.3-Source/Buildit     2010-08-09 16:23:35.167262333 +0300
   3 @@ -66,15 +66,15 @@
   4
   5         Linux.ppc)
   6                 echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
   7 -               CPLUS=gcc
   8 -               CCOMP=gcc
   9 -               LINKER='gcc'
  10 -               MAKE=make
  11 +               CPLUS=${CXX:-gcc}
  12 +               CCOMP=${CC:-gcc}
  13 +               LINKER=${CC:-gcc}
  14 +               MAKE=${MAKE:-make}
  15
  16 -               COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linuxppc__ -pipe"
  17 -               INCLUDE_FLAG="-include"
  18 +               COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linuxppc__ -pipe $CFLAGS"
  19 +               INCLUDE_FLAG="-include"
  20
  21 -               CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt"
  22 +               CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt $LDFLAGS"
  23
  24                 SHARED=-shared
  25                 MODULE_LIBS=
  26 @@ -90,15 +90,15 @@
  27         Linux.i586 | \
  28         Linux.i686)
  29                 echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
  30 -               CPLUS=gcc
  31 -               CCOMP=gcc
  32 -               LINKER='gcc'
  33 -               MAKE=make
  34 +               CPLUS=${CXX:-gcc}
  35 +               CCOMP=${CC:-gcc}
  36 +               LINKER=${CC:-gcc}
  37 +               MAKE=${MAKE:-make}
  38
  39 -               COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe"
  40 +               COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe $CFLAGS"
  41                 INCLUDE_FLAG="-include"
  42
  43 -               CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt"
  44 +               CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt $LDFLAGS"
  45
  46                 SHARED=-shared
  47                 MODULE_LIBS=
  48 @@ -111,15 +111,15 @@
  49
  50          Linux.x86_64)
  51                 echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
  52 -               CPLUS=gcc
  53 -               CCOMP=gcc
  54 -               LINKER='gcc'
  55 -               MAKE=make
  56 +               CPLUS=${CXX:-gcc}
  57 +               CCOMP=${CC:-gcc}
  58 +               LINKER=${CC:-gcc}
  59 +               MAKE=${MAKE:-make}
  60
  61 -               COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe -fPIC"
  62 +               COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe -fPIC $CFLAGS"
  63                 INCLUDE_FLAG="-include"
  64
  65 -               CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt"
  66 +               CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt $LDFLAGS"
  67
  68                 SHARED=-shared
  69                 MODULE_LIBS=
  70 @@ -132,15 +132,15 @@
  71
  72         Linux.mips)
  73                 echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
  74 -               CPLUS=gcc
  75 -               CCOMP=gcc
  76 -               LINKER='egcs'
  77 -               MAKE=make
  78 +               CPLUS=${CXX:-gcc}
  79 +               CCOMP=${CC:-gcc}
  80 +               LINKER=${CC:-egcs}
  81 +               MAKE=${MAKE:-make}
  82
  83 -               COMPILER_FLAGS="-D_REENTRANT -D__linux__ -Wno-multichar -pipe"
  84 +               COMPILER_FLAGS="-D_REENTRANT -D__linux__ -Wno-multichar -pipe $CFLAGS"
  85                 INCLUDE_FLAG="-include"
  86
  87 -               CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt"
  88 +               CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt $LDFLAGS"
  89
  90                 SHARED=-shared
  91                 MODULE_LIBS=
  92 @@ -153,15 +153,15 @@
  93
  94         FreeBSD.i386)
  95                 echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
  96 -               CPLUS=gcc
  97 -               CCOMP=gcc
  98 -               LINKER="gcc"
  99 -               MAKE=make
 100 +               CPLUS=${CXX:-gcc}
 101 +               CCOMP=${CC:-gcc}
 102 +               LINKER=${CC:-gcc}
 103 +               MAKE=${MAKE:-make}
 104
 105 -               COMPILER_FLAGS=
 106 +               COMPILER_FLAGS=$CFLAGS
 107                 INCLUDE_FLAG="-include"
 108
 109 -               CORE_LINK_LIBS="-pthread -lm -lcrypt"
 110 +               CORE_LINK_LIBS="-pthread -lm -lcrypt $LDFLAGS"
 111
 112                 SHARED=-shared
 113                 MODULE_LIBS="-lgcc -lstdc++"
 114 @@ -171,15 +171,15 @@
 115  #      SunOS.sun4u)
 116         SunOS.*)
 117                 echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
 118 -               CPLUS=g++
 119 -               CCOMP=gcc
 120 -               LINKER="g++"
 121 -               MAKE=make
 122 +               CPLUS=${CXX:-g++}
 123 +               CCOMP=${CC:-gcc}
 124 +               LINKER=${CC:-g++}
 125 +               MAKE=${MAKE:-make}
 126
 127 -               COMPILER_FLAGS="-D__solaris__ -D_REENTRANT -DFD_SETSIZE=65536 -L/usr/local/lib -R/usr/local/lib"
 128 +               COMPILER_FLAGS="-D__solaris__ -D_REENTRANT -DFD_SETSIZE=65536 -L/usr/local/lib -R/usr/local/lib $CFLAGS"
 129                 INCLUDE_FLAG="-include"
 130
 131 -               CORE_LINK_LIBS="-lpthread -ldl -lsocket -lnsl -lresolv -lm -lcrypt -lstdc++"
 132 +               CORE_LINK_LIBS="-lpthread -ldl -lsocket -lnsl -lresolv -lm -lcrypt -lstdc++ $LDFLAGS"
 133
 134                 SHARED=-G
 135                 MODULE_LIBS=