diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-30 16:37:21 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-30 16:37:21 +0000 |
| commit | 5b3b15328fc32e1708c2ac731c59e9b59ec13b3a (patch) | |
| tree | d587d6fcffa7d423427ff8c5f81aaef95a9d3687 /codecs | |
| parent | 3b3c483ceff9cab8a9cb49c6077d400649bb0800 (diff) | |
merge compile fixes from 44080:
- 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.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44081 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/lpc10/Makefile | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index 18b7c0bcc..5594bb86b 100644 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -23,30 +23,34 @@ LIB_TARGET_DIR = . 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 |