[asterisk-commits] rizzo: branch 1.4 r44080 - in /branches/1.4: ./ codecs/lpc10/ main/

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Sat Sep 30 11:28:39 2006
New Revision: 44080

URL: http://svn.digium.com/view/asterisk?rev=44080&view=rev
Log:
fix two recent build problems:

- with AST_DEVMODE, building codecs/lpc10 fails because of lots
  of warnings, and the configure step in editline fails as well.
  Fix this by removing the -Werror in these steps.

- on FreeBSD (but probably on other platforms as well), the final
  link of asterisk fails because AST_LIBS was not exported to the
  subdirs Makefiles. Add a proper fix in the top-level Makefile
  (a possible alternative way is to add "export AST_LIBS" near
  the beginning of the file).
  With this fix, i believe that some of the platform-specific
  conditionals in main/Makefile are redundant (because they should
  be already dealt with in the top level Makefile) but i don't
  have a platform to check.
  
Merging to head will happen in a moment.


Modified:
    branches/1.4/Makefile
    branches/1.4/codecs/lpc10/Makefile
    branches/1.4/main/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?rev=44080&r1=44079&r2=44080&view=diff
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Sat Sep 30 11:28:39 2006
@@ -15,6 +15,7 @@
 #
 # ASTCFLAGS - compiler options
 # ASTLDFLAGS - linker flags (not libraries)
+# AST_LIBS - libraries to build binaries XXX
 # LIBS - additional libraries, at top-level for all links,
 #      on a single object just for that object
 # SOLINK - linker flags used only for creating shared objects (.so files),
@@ -302,7 +303,7 @@
 main: $(filter-out main,$(MOD_SUBDIRS))
 
 $(MOD_SUBDIRS):
-	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
+	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
 
 $(OTHER_SUBDIRS):
 	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all

Modified: branches/1.4/codecs/lpc10/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/codecs/lpc10/Makefile?rev=44080&r1=44079&r2=44080&view=diff
==============================================================================
--- branches/1.4/codecs/lpc10/Makefile (original)
+++ branches/1.4/codecs/lpc10/Makefile Sat Sep 30 11:28:39 2006
@@ -23,30 +23,34 @@
 
 CFLAGS+= -fPIC -Wno-comment
 
+# The code here generates lots of warnings, so compiling with -Werror
+# fails miserably. Remove it for the time being.
+ASTCFLAGS:= $(ASTCFLAGS:-Werror=)
+
 #fix for PPC processors and ALPHA, And UltraSparc too
 ifneq ($(OSARCH),Darwin)
-ifneq ($(findstring BSD,${OSARCH}),BSD)
-ifneq ($(PROC),ppc)
-ifneq ($(PROC),x86_64)
-ifneq ($(PROC),alpha)
+ ifneq ($(findstring BSD,${OSARCH}),BSD)
+  ifneq ($(PROC),ppc)
+   ifneq ($(PROC),x86_64)
+    ifneq ($(PROC),alpha)
 #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
 #This works for even old (2.96) versions of gcc and provides a small boost either way.
 #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
 #So we go lowest common available by gcc and go a step down, still a step up from
 #the default as we now have a better instruction set to work with. - Belgarath
-ifeq ($(PROC),ultrasparc)
+     ifeq ($(PROC),ultrasparc)
         CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
-else
-ifneq ($(OSARCH),SunOS)
-ifneq  ($(OSARCH),arm)
+     else
+      ifneq ($(OSARCH),SunOS)
+       ifneq  ($(OSARCH),arm)
 #        CFLAGS+= -march=$(PROC)
-endif
-endif
-endif
-endif
-endif
-endif
-endif
+       endif
+      endif
+     endif
+    endif
+   endif
+  endif
+ endif
 endif
 
 LIB = $(LIB_TARGET_DIR)/liblpc10.a

Modified: branches/1.4/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/Makefile?rev=44080&r1=44079&r2=44080&view=diff
==============================================================================
--- branches/1.4/main/Makefile (original)
+++ branches/1.4/main/Makefile Sat Sep 30 11:28:39 2006
@@ -90,7 +90,7 @@
 endif
 
 editline/libedit.a:
-	cd editline && test -f config.h || CFLAGS="$(ASTCFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+	cd editline && test -f config.h || CFLAGS="$(ASTCFLAGS:-Werror=)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 	$(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a: