net/freeswitch/patches/301-modrules_cross.patch

   1 --- a/build/modmake.rules.in
   2 +++ b/build/modmake.rules.in
   3 @@ -3,6 +3,10 @@
   4  switch_builddir=@switch_builddir@
   5  switch_srcdir=@switch_srcdir@
   6
   7 +build=@build@
   8 +host=@host@
   9 +target=$(host)
  10 +
  11  CC=@CC@
  12  CXX=@CXX@
  13  AWK=@AWK@
  14 @@ -29,13 +33,13 @@ DEFS=@DEFS@
  15  PREFIX = @prefix@
  16  MODINSTDIR = @modinstdir@
  17
  18 -DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH
  19 -LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
  20  OSARCH=`uname -s`
  21  DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
  22  LIBTOOL_LIB_EXTEN = @LIBTOOL_LIB_EXTEN@
  23  SOLINK = @SOLINK@
  24
  25 +CFLAGS=@CFLAGS@
  26 +CPPFLAGS=@CPPFLAGS@
  27  LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS)
  28
  29  ALL_CFLAGS   = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ @CPPFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
  30 --- a/src/mod/applications/mod_curl/Makefile
  31 +++ b/src/mod/applications/mod_curl/Makefile
  32 @@ -11,7 +11,9 @@ LOCAL_LIBADD=$(JSONLA)
  33
  34  include $(BASE)/build/modmake.rules
  35
  36 -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
  37 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
  38 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
  39 +DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
  40
  41  $(LOCAL_OBJS): $(LOCAL_SOURCES)
  42
  43 @@ -19,7 +21,7 @@ $(JSON_DIR):
  44         $(GETLIB) $(json-c).tar.gz
  45
  46  $(JSON_DIR)/Makefile: $(JSON_DIR)
  47 -       cd $(JSON_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS=
  48 +       cd $(JSON_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
  49         $(TOUCH_TARGET)
  50
  51  $(JSONLA): $(JSON_DIR)/Makefile
  52 --- a/src/mod/asr_tts/mod_flite/Makefile
  53 +++ b/src/mod/asr_tts/mod_flite/Makefile
  54 @@ -13,15 +13,21 @@ LOCAL_LIBADD=$(FLITE_A)
  55  BASE=../../../..
  56  include $(BASE)/build/modmake.rules
  57
  58 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
  59 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
  60 +DEFAULT_ARGS+= --without-audio
  61 +DEFAULT_VARS:= CFLAGS="$(subst -std=c99,,$(CFLAGS))" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
  62 +
  63  $(FLITE_DIR):
  64         $(GETLIB) $(FLITE)-latest.tar.gz
  65
  66  $(FLITE_DIR)/Makefile: $(FLITE_DIR)
  67 -       cd $(FLITE_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure --without-audio --with-pic --disable-shared
  68 +       cd $(FLITE_DIR) && cp -fp ../../build/config/config.sub .
  69 +       cd $(FLITE_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
  70         $(TOUCH_TARGET)
  71
  72  $(FLITE_A): $(FLITE_DIR) $(FLITE_DIR)/Makefile
  73         cd $(FLITE_DIR) && $(MAKE)
  74         test -d $(FLITE_LIBDIR) || mkdir $(FLITE_LIBDIR)
  75 -       cd $(FLITE_DIR) && FLITE_TMP_LIBDIR=`$(FLITE_DIR)/config.guess | sed "s/-[^-]*//" | sed "s/i[3456]86/i386/"` && cp build/$$FLITE_TMP_LIBDIR/lib/*.a $(FLITE_LIBDIR)
  76 +       cd $(FLITE_DIR) && cp build/*/lib/*.a $(FLITE_LIBDIR)
  77
  78 --- a/src/mod/directories/mod_ldap/Makefile
  79 +++ b/src/mod/directories/mod_ldap/Makefile
  80 @@ -8,15 +8,18 @@ LIBLBERLA=$(LDAP_DIR)/libraries/liblber/
  81
  82  LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
  83
  84 -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
  85 -
  86  LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA)
  87
  88  include $(switch_srcdir)/build/modmake.rules
  89
  90 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
  91 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
  92 +DEFAULT_ARGS+= --disable-bdb --disable-hdb --disable-slapd
  93 +DEFAULT_VARS+= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
  94 +
  95  $(LDAP_DIR):
  96         $(GETLIB) $(LDAP).tar.gz
  97 -       cd $(LDAP_DIR) && ./configure $(DEFAULT_ARGS) --disable-bdb --disable-hdb --disable-slapd
  98 +       cd $(LDAP_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
  99
 100  $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)
 101         cd $(LDAP_DIR) && $(MAKE)
 102 --- a/src/mod/codecs/mod_siren/Makefile
 103 +++ b/src/mod/codecs/mod_siren/Makefile
 104 @@ -5,6 +5,10 @@ G722_1_LA=$(G722_1_DIR)/src/.libs/libg72
 105  LOCAL_LIBADD=$(G722_1_LA)
 106  include $(BASE)/build/modmake.rules
 107
 108 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 109 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
 110 +DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 111 +
 112  $(G722_1_LA): $(G722_1_DIR)/.update
 113 -       cd $(G722_1_DIR) && ./configure  --disable-shared --with-pic  && $(MAKE)
 114 +       cd $(G722_1_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) && $(MAKE)
 115         $(TOUCH_TARGET)
 116 --- a/src/mod/languages/mod_yaml/Makefile
 117 +++ b/src/mod/languages/mod_yaml/Makefile
 118 @@ -7,10 +7,15 @@ VERBOSE=1
 119
 120  include $(BASE)/build/modmake.rules
 121
 122 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 123 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
 124 +DEFAULT_ARGS+= --without-audio
 125 +DEFAULT_VARS+= CFLAGS="$(AM_CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 126 +
 127  local_depend: $(LIBYAML_A)
 128
 129  $(LIBYAML_A):
 130 -       cd $(YAMLLIB) && ./configure $(DEFAULT_ARGS) --disable-shared --with-pic
 131 +       cd $(YAMLLIB) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
 132         cd $(YAMLLIB) && $(MAKE)
 133
 134  yamlclean:
 135 --- a/src/mod/applications/mod_memcache/Makefile
 136 +++ b/src/mod/applications/mod_memcache/Makefile
 137 @@ -12,7 +12,9 @@ LOCAL_LIBADD=$(MEMCACHEDLA)
 138
 139  include $(switch_srcdir)/build/modmake.rules
 140
 141 -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
 142 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 143 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
 144 +DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 145
 146  $(LOCAL_OBJS): $(LOCAL_SOURCES)
 147
 148 @@ -20,7 +22,7 @@ $(MEMCACHED_DIR):
 149         $(GETLIB) $(MEMCACHED).tar.gz
 150
 151  $(MEMCACHED_DIR)/Makefile: $(MEMCACHED_DIR)
 152 -       cd $(MEMCACHED_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS=
 153 +       cd $(MEMCACHED_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
 154         $(TOUCH_TARGET)
 155
 156  $(MEMCACHEDLA): $(MEMCACHED_DIR)/Makefile
 157 --- a/src/mod/applications/mod_soundtouch/Makefile
 158 +++ b/src/mod/applications/mod_soundtouch/Makefile
 159 @@ -5,13 +5,16 @@ LA=$(DIRECTORY)/source/SoundTouch/.libs/
 160  BASE=../../../..
 161  LOCAL_CFLAGS += -I$(DIRECTORY)/include -DINTEGER_SAMPLES
 162  LOCAL_LIBADD=$(LA)
 163 -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
 164
 165  include $(BASE)/build/modmake.rules
 166
 167 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 168 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
 169 +DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 170 +
 171  $(DIRECTORY)/Makefile $(DIRECTORY)/config.status:
 172         $(GETLIB) $(VERSION).tar.gz
 173 -       cd $(DIRECTORY) && ./configure $(DEFAULT_ARGS) --enable-integer-samples
 174 +       cd $(DIRECTORY) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --enable-integer-samples
 175         $(TOUCH_TARGET)
 176
 177  $(LA): $(DIRECTORY)/Makefile $(DIRECTORY)/config.status
 178 --- a/src/mod/asr_tts/mod_pocketsphinx/Makefile
 179 +++ b/src/mod/asr_tts/mod_pocketsphinx/Makefile
 180 @@ -12,13 +12,19 @@ SPHINXMODEL=communicator_semi_6000_20080
 181  LOCAL_CFLAGS=-I$(SPHINXBASE_DIR)/include -I$(POCKETSPHINX_DIR)/include
 182  LOCAL_LIBADD=$(SPHINXBASE_LA) $(SPHINXBASE_LA2) $(POCKETSPHINX_LA)
 183  BASE=../../../..
 184 +
 185  include $(BASE)/build/modmake.rules
 186
 187 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 188 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
 189 +DEFAULT_ARGS+= --without-python
 190 +DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 191 +
 192  $(SPHINXBASE_DIR):
 193         $(GETLIB) $(SPHINXBASE)-latest.tar.gz
 194
 195  $(SPHINXBASE_DIR)/buildstamp: $(SPHINXBASE_DIR)
 196 -       test -f $(SPHINXBASE_DIR)/Makefile || (cd $(SPHINXBASE_DIR) && ./configure --with-pic --without-python --disable-shared CFLAGS=)
 197 +       test -f $(SPHINXBASE_DIR)/Makefile || (cd $(SPHINXBASE_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS))
 198         test -f $(SPHINXBASE_DIR)/buildstamp || (touch $(SPHINXBASE_DIR)/buildstamp)
 199
 200  $(SPHINXBASE_LA): $(SPHINXBASE_DIR)/buildstamp
 201 @@ -29,7 +35,7 @@ $(POCKETSPHINX_DIR):
 202         $(GETLIB) $(POCKETSPHINX)-latest.tar.gz
 203
 204  $(POCKETSPHINX_DIR)/Makefile: $(POCKETSPHINX_DIR)
 205 -       cd $(POCKETSPHINX_DIR) && ./configure --with-pic --without-python --disable-shared --with-sphinxbase=$(SPHINXBASE_DIR) CFLAGS=
 206 +       cd $(POCKETSPHINX_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --with-sphinxbase=$(SPHINXBASE_DIR)
 207         $(TOUCH_TARGET)
 208
 209  $(POCKETSPHINX_DIR)/buildstamp: $(POCKETSPHINX_DIR)/Makefile
 210 --- a/src/mod/codecs/mod_celt/Makefile
 211 +++ b/src/mod/codecs/mod_celt/Makefile
 212 @@ -8,11 +8,16 @@ CELT_LA=$(CELT_DIR)/libcelt/.libs/libcel
 213  LOCAL_LIBADD=$(CELT_LA)
 214  include $(BASE)/build/modmake.rules
 215
 216 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 217 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
 218 +DEFAULT_ARGS+= --without-ogg
 219 +DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 220 +
 221  $(CELT_DIR):
 222         $(GETLIB) $(CELT).tar.gz
 223
 224  $(CELT_DIR)/Makefile: $(CELT_DIR)
 225 -       cd $(CELT_DIR) && CFLAGS=$(AM_CFLAGS) ./configure --disable-shared --with-pic
 226 +       cd $(CELT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
 227
 228  $(CELT_LA): $(CELT_DIR)/Makefile
 229         cd $(CELT_DIR) && $(MAKE)
 230 --- a/src/mod/event_handlers/mod_radius_cdr/Makefile
 231 +++ b/src/mod/event_handlers/mod_radius_cdr/Makefile
 232 @@ -10,11 +10,15 @@ LOCAL_LIBADD=$(RADCLIENT_LA)
 233  BASE=../../../..
 234  include $(BASE)/build/modmake.rules
 235
 236 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 237 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
 238 +DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 239 +
 240  $(RADCLIENT_DIR):
 241         $(GETLIB) $(RADCLIENT).tar.gz
 242
 243  $(RADCLIENT_DIR)/Makefile: $(RADCLIENT_DIR)
 244 -       cd $(RADCLIENT_DIR) && ./configure --disable-shared --with-pic
 245 +       cd $(RADCLIENT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
 246         $(TOUCH_TARGET)
 247
 248  $(RADCLIENT_LA): $(RADCLIENT_DIR)/Makefile
 249 --- a/src/mod/event_handlers/mod_zeroconf/Makefile
 250 +++ b/src/mod/event_handlers/mod_zeroconf/Makefile
 251 @@ -7,13 +7,15 @@ HOWLLA=$(HOWL_DIR)/src/lib/howl/libhowl.
 252  LOCAL_CFLAGS=-I$(HOWL_DIR)/include
 253  LOCAL_LIBADD=$(HOWLLA)
 254
 255 -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
 256 -
 257  include $(switch_srcdir)/build/modmake.rules
 258
 259 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 260 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
 261 +DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 262 +
 263  $(HOWL_DIR):
 264         $(GETLIB) $(HOWL).tar.gz
 265 -       cd $(HOWL_DIR) && ./configure $(DEFAULT_ARGS)
 266 +       cd $(HOWL_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
 267
 268  $(HOWLLA): $(HOWL_DIR)
 269         cd $(HOWL_DIR) && $(MAKE)
 270 --- a/src/mod/formats/mod_shout/Makefile
 271 +++ b/src/mod/formats/mod_shout/Makefile
 272 @@ -22,7 +22,9 @@ LOCAL_SOURCES=$(MP3SOURCES)
 273
 274  include $(switch_srcdir)/build/modmake.rules
 275
 276 -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
 277 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 278 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic
 279 +DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 280
 281  $(LOCAL_OBJS): $(LOCAL_SOURCES)
 282
 283 @@ -30,7 +32,7 @@ $(MPG123_DIR):
 284         $(GETLIB) $(MPG123).tar.gz
 285
 286  $(MPG123_DIR)/Makefile: $(MPG123_DIR)
 287 -       cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS=
 288 +       cd $(MPG123_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
 289         $(TOUCH_TARGET)
 290
 291  $(MPG123LA): $(MPG123_DIR)/Makefile
 292 @@ -41,7 +43,7 @@ $(LAME_DIR):
 293         $(GETLIB) $(LAME).tar.gz
 294
 295  $(LAME_DIR)/Makefile: $(LAME_DIR)
 296 -       cd $(LAME_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS=
 297 +       cd $(LAME_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --disable-decoder
 298         $(TOUCH_TARGET)
 299
 300  $(LAMELA): $(LAME_DIR)/Makefile
 301 @@ -52,7 +54,7 @@ $(SHOUT_DIR):
 302         $(GETLIB) $(SHOUT).tar.gz
 303
 304  $(SHOUT_DIR)/Makefile: $(SHOUT_DIR)
 305 -       cd $(SHOUT_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS=
 306 +       cd $(SHOUT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg
 307         $(TOUCH_TARGET)
 308
 309  $(SHOUTLA): $(SHOUT_DIR)/Makefile
 310 --- a/src/mod/xml_int/mod_xml_ldap/Makefile
 311 +++ b/src/mod/xml_int/mod_xml_ldap/Makefile
 312 @@ -9,16 +9,18 @@ LIBLUTILA=$(LDAP_DIR)/libraries/liblutil
 313
 314  LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
 315
 316 -DEFAULT_ARGS= --prefix=$(PREFIX) --disable-shared --with-pic --disable-slapd
 317 -DEFAULT_ARGS+= --disable-slurpd --disable-relay --disable-bdb --disable-hdb
 318 -
 319  LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
 320
 321  include $(switch_srcdir)/build/modmake.rules
 322
 323 +DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target)
 324 +DEFAULT_ARGS+= --prefix=$(PREFIX) --disable-shared --with-pic --disable-slapd
 325 +DEFAULT_ARGS+= --disable-slurpd --disable-relay --disable-bdb --disable-hdb
 326 +DEFAULT_VARS:= CFLAGS="$(subst -std=c99,,$(CFLAGS))" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 327 +
 328  $(LDAP_DIR):
 329         $(GETLIB) $(LDAP).tar.gz
 330 -       cd $(LDAP_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS)
 331 +       cd $(LDAP_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
 332
 333  $(LIBLUTILA) $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)
 334         cd $(LDAP_DIR) && $(MAKE)