diff options
| -rwxr-xr-x | configure | 61 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | main/Makefile | 5 | ||||
| -rw-r--r-- | makeopts.in | 1 |
4 files changed, 77 insertions, 3 deletions
@@ -1084,6 +1084,7 @@ ALLOCA LIBOBJS PBX_WORKING_FORK POW_LIB +PBX_DYNAMIC_LIST HAS_POLL PBX_PTHREAD_RWLOCK_INITIALIZER PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP @@ -18195,6 +18196,61 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +{ echo "$as_me:$LINENO: checking for a version of GNU ld that supports the --dynamic-list flag" >&5 +echo $ECHO_N "checking for a version of GNU ld that supports the --dynamic-list flag... $ECHO_C" >&6; } +old_LDFLAGS=${LDFLAGS} +LDFLAGS+="-Wl,--dynamic-list,main/asterisk.dynamics" +PBX_DYNAMIC_LIST=0 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + PBX_DYNAMIC_LIST=1 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +LDFLAGS=${old_LDFLAGS} + if test "${ac_cv_header_sys_poll_h+set}" = set; then { echo "$as_me:$LINENO: checking for sys/poll.h" >&5 echo $ECHO_N "checking for sys/poll.h... $ECHO_C" >&6; } @@ -52785,6 +52841,7 @@ ALLOCA!$ALLOCA$ac_delim LIBOBJS!$LIBOBJS$ac_delim PBX_WORKING_FORK!$PBX_WORKING_FORK$ac_delim POW_LIB!$POW_LIB$ac_delim +PBX_DYNAMIC_LIST!$PBX_DYNAMIC_LIST$ac_delim HAS_POLL!$HAS_POLL$ac_delim PBX_PTHREAD_RWLOCK_INITIALIZER!$PBX_PTHREAD_RWLOCK_INITIALIZER$ac_delim PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP!$PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP$ac_delim @@ -52807,7 +52864,6 @@ CONFIG_MYSQLCLIENT!$CONFIG_MYSQLCLIENT$ac_delim CONFIG_NEON!$CONFIG_NEON$ac_delim CONFIG_NEON29!$CONFIG_NEON29$ac_delim CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim -PG_CONFIG!$PG_CONFIG$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52849,6 +52905,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PG_CONFIG!$PG_CONFIG$ac_delim PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim PWLIBDIR!$PWLIBDIR$ac_delim PWLIB_INCDIR!$PWLIB_INCDIR$ac_delim @@ -52889,7 +52946,7 @@ PBX_SYSLOG!$PBX_SYSLOG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 4bfac0af8..8d69691b1 100644 --- a/configure.ac +++ b/configure.ac @@ -480,6 +480,19 @@ AC_LINK_IFELSE( AC_MSG_RESULT(no) ) +AC_MSG_CHECKING(for a version of GNU ld that supports the --dynamic-list flag) +old_LDFLAGS=${LDFLAGS} +LDFLAGS+="-Wl,--dynamic-list,main/asterisk.dynamics" +PBX_DYNAMIC_LIST=0 +AC_LINK_IFELSE( + AC_LANG_PROGRAM([], []), + PBX_DYNAMIC_LIST=1 + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) +) +AC_SUBST(PBX_DYNAMIC_LIST) +LDFLAGS=${old_LDFLAGS} + AC_CHECK_HEADER([sys/poll.h], [HAS_POLL=1] AC_DEFINE([HAVE_SYS_POLL_H], 1, [Define to 1 if your system has working sys/poll.h]), diff --git a/main/Makefile b/main/Makefile index 1ec018bb3..8175f1e7f 100644 --- a/main/Makefile +++ b/main/Makefile @@ -95,7 +95,10 @@ ifneq ($(findstring USE_HOARD_ALLOCATOR,$(MENUSELECT_CFLAGS)),) endif ifeq ($(GNU_LD),1) -ASTLINK+=-Wl,--version-script,asterisk.exports,--dynamic-list,asterisk.dynamics +ASTLINK+=-Wl,--version-script,asterisk.exports + ifeq ($(HAVE_DYNAMIC_LIST),1) + ASTLINK+=-Wl,--dynamic-list,asterisk.dynamics + endif endif CHECK_SUBDIR: # do nothing, just make sure that we recurse in the subdir/ diff --git a/makeopts.in b/makeopts.in index 71a7c353b..233c06c97 100644 --- a/makeopts.in +++ b/makeopts.in @@ -58,6 +58,7 @@ CONFIG_LDFLAGS=@CONFIG_LDFLAGS@ GNU_LD=@GNU_LD@ WEAKREF=@PBX_WEAKREF@ +HAVE_DYNAMIC_LIST=@PBX_DYNAMIC_LIST@ prefix = @prefix@ exec_prefix = @exec_prefix@ |