package/asterisk/patches/asterisk-1.2.0-Makefile.patch

   1 diff -ruN asterisk-1.2.0-old/Makefile asterisk-1.2.0-new/Makefile
   2 --- asterisk-1.2.0-old/Makefile 2005-11-16 21:23:53.000000000 +0100
   3 +++ asterisk-1.2.0-new/Makefile 2005-12-04 23:01:16.000000000 +0100
   4 @@ -341,16 +339,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 @@ -401,7 +389,9 @@
  22    HAVEDOT=no
  23  endif
  24
  25 +ifneq ($(NOCRYPTO),yes)
  26  LIBS+=-lssl
  27 +endif
  28
  29  INSTALL=install
  30
  31 @@ -430,12 +420,12 @@
  32         cd editline && unset CFLAGS LIBS && ./configure ; \
  33
  34  editline/libedit.a: FORCE
  35 -       cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  36 +       cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE) $(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LDFLAGS)" ./configure
  37         $(MAKE) -C editline libedit.a
  38
  39  db1-ast/libdb1.a: FORCE
  40         @if [ -d db1-ast ]; then \
  41 -               $(MAKE) -C db1-ast libdb1.a ; \
  42 +               $(MAKE) OORG="$(OPTIMIZE)" -C db1-ast libdb1.a ; \
  43         else \
  44                 echo "You need to do a cvs update -d not just cvs update"; \
  45                 exit 1; \
  46 @@ -513,7 +503,7 @@
  47         fi
  48         rm -f include/asterisk/build.h.tmp
  49         $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
  50 -       $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
  51 +       $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(EXTRA_LDFLAGS) $(LIBS)
  52
  53  muted: muted.o
  54         $(CC) $(AUDIO_LIBS) -o muted muted.o