net/asterisk/patches/015-Makefile.patch

   1 diff -Nru asterisk-1.2.14.org/Makefile asterisk-1.2.14/Makefile
   2 --- asterisk-1.2.14.org/Makefile        2006-12-11 22:55:43.000000000 +0100
   3 +++ asterisk-1.2.14/Makefile    2006-12-27 09:16:50.000000000 +0100
   4 @@ -356,16 +356,6 @@
   5         netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
   6         cryptostub.o
   7
   8 -ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
   9 -  OBJS+= poll.o
  10 -  ASTCFLAGS+=-DPOLLCOMPAT
  11 -endif
  12 -
  13 -ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
  14 -  OBJS+= dlfcn.o
  15 -  ASTCFLAGS+=-DDLFCNCOMPAT
  16 -endif
  17 -
  18  ifeq ($(OSARCH),Linux)
  19    LIBS+=-ldl -lpthread -lncurses -lm -lresolv  #-lnjamd
  20  else
  21 @@ -420,8 +410,6 @@
  22    HAVEDOT=no
  23  endif
  24
  25 -LIBS+=-lssl
  26 -
  27  _all: all
  28         @echo " +--------- Asterisk Build Complete ---------+"
  29         @echo " + Asterisk has successfully been built, but +"
  30 @@ -447,12 +435,12 @@
  31         cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
  32
  33  editline/libedit.a: FORCE
  34 -       cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
  35 +       cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE) $(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LDFLAGS)" ./configure
  36         $(MAKE) -C editline libedit.a
  37
  38  db1-ast/libdb1.a: FORCE
  39         @if [ -d db1-ast ]; then \
  40 -               $(MAKE) -C db1-ast libdb1.a ; \
  41 +               $(MAKE) OORG="$(OPTIMIZE)" -C db1-ast libdb1.a ; \
  42         else \
  43                 echo "You need to do a cvs update -d not just cvs update"; \
  44                 exit 1; \
  45 @@ -530,7 +518,7 @@
  46         fi
  47         rm -f include/asterisk/build.h.tmp
  48         $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
  49 -       $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
  50 +       $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(EXTRA_LDFLAGS) $(LIBS)
  51
  52  muted: muted.o
  53         $(CC) $(AUDIO_LIBS) -o muted muted.o