kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Pass --fno-partial-inlining to third-party when appropriate

Browse Source 
When the gcc version is >= 8.2.1, we were already setting the
--fno-partial-inlining flag for Asterisk source files to get around
a gcc bug but we weren't passing the flag down to the bundled
builds of pjproject and jansson.

ASTERISK-28392

Change-Id: I99ede9bc35408ecd096f7d5369e8192d3dc75704
This commit is contained in:
George Joseph
2019-05-03 12:31:06 -06:00
parent 8357ab7e9a
commit 543d487746
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
third-party/jansson/Makefile vendored
View File

@@ -49,6 +49,11 @@ include ../../Makefile.rules
include ../Makefile.rules include ../Makefile.rules
include Makefile.rules include Makefile.rules
OPTIMIZE_CFLAGS = -g3
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
OPTIMIZE_CFLAGS += $(OPTIMIZE)
endif
ECHO_PREFIX := $(ECHO_PREFIX) echo '[jansson] ' ECHO_PREFIX := $(ECHO_PREFIX) echo '[jansson] '
SHELL_ECHO_PREFIX := echo '[jansson] ' SHELL_ECHO_PREFIX := echo '[jansson] '
@@ -82,7 +87,7 @@ source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE)
source/config.status: source/.unpacked Makefile.rules .rebuild_needed source/config.status: source/.unpacked Makefile.rules .rebuild_needed
$(ECHO_PREFIX) Configuring $(ECHO_PREFIX) Configuring
$(CMD_PREFIX) (cd source ; ./configure $(QUIET_CONFIGURE) $(JANSSON_CONFIG_OPTS) --disable-shared \ $(CMD_PREFIX) (cd source ; ./configure $(QUIET_CONFIGURE) $(JANSSON_CONFIG_OPTS) --disable-shared \
--enable-static --prefix=$(JANSSON_DIR)/dest --libdir=$(JANSSON_DIR)/dest/lib) --enable-static --prefix=$(JANSSON_DIR)/dest --libdir=$(JANSSON_DIR)/dest/lib CFLAGS="$(OPTIMIZE_CFLAGS)")
configure: source/config.status configure: source/config.status

18
third-party/pjproject/Makefile vendored
View File

@@ -45,6 +45,9 @@ ifeq ($(SPECIAL_TARGETS),)
else else
$(warning ASTTOPDIR/menuselect hasn't been run yet. Can't find debug options.) $(warning ASTTOPDIR/menuselect hasn't been run yet. Can't find debug options.)
endif endif
include ../../Makefile.rules
include ../Makefile.rules
include Makefile.rules
all: _all all: _all
install: _install install: _install
@@ -64,20 +67,19 @@ ifeq ($(SPECIAL_TARGETS),)
endif endif
MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a
MALLOC_DEBUG_LDFLAGS = -L$(PJDIR)/pjsip-apps/lib -Wl,-whole-archive -lasterisk_malloc_debug -Wl,-no-whole-archive MALLOC_DEBUG_LDFLAGS = -L$(PJDIR)/pjsip-apps/lib -Wl,-whole-archive -lasterisk_malloc_debug -Wl,-no-whole-archive
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
CF += -O3
endif
export CFLAGS += $(CF) -g3
export LDFLAGS += $(CC_LDFLAGS)
TARGETS += pjproject.symbols TARGETS += pjproject.symbols
else else
all install: all install:
endif endif
else
include ../../Makefile.rules
include ../Makefile.rules
include Makefile.rules
endif endif
include ../../Makefile.rules export PJ_CFLAGS := $(filter-out -O% -g%,$(PJ_CFLAGS))
include ../Makefile.rules export CFLAGS += $(CF)
include Makefile.rules export LDFLAGS += $(CC_LDFLAGS)
ECHO_PREFIX := $(ECHO_PREFIX) echo '[pjproject] ' ECHO_PREFIX := $(ECHO_PREFIX) echo '[pjproject] '
SHELL_ECHO_PREFIX := echo '[pjproject] ' SHELL_ECHO_PREFIX := echo '[pjproject] '