diff options
author | Matthew Jordan <mjordan@digium.com> | 2014-04-17 20:25:16 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2014-04-17 20:25:16 +0000 |
commit | c3497aa2bbfcf2e78d479a9d586b0320ba2b7cb0 (patch) | |
tree | 650d9d2a6f1798e18090f4987a081c6d750ad92f | |
parent | 7d26eefce43bf5f0d51c97377dcc96820a909d5e (diff) |
main/Makefile: Fix build failure on SmartOS/Illumos/SunOS
This patch fixes two issues when building on SmartOS:
- channels/chan_oss.c: it makes sure soundcard.h is found
- main/Makefile: only use "-Wl,--version-script" when GNU LD is used as the Sun
Linker doesn't support that. Similar checks are already used elswhere in the
Makefile
Review: https://reviewboard.asterisk.org/r/3426
ASTERISK-23576 #close
Reported by: Sebastian Wiedenroth
patches:
fix-sunos.diff uploaded by Sebastian Wiedenroth (License 6597)
........
Merged revisions 412468 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 412483 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channels/chan_oss.c | 2 | ||||
-rw-r--r-- | main/Makefile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 7fc4f4052..4459b4b6f 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -53,7 +53,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #ifdef __linux #include <linux/soundcard.h> -#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) +#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun) #include <sys/soundcard.h> #else #include <soundcard.h> diff --git a/main/Makefile b/main/Makefile index 1d80f1198..ba4c05a3b 100644 --- a/main/Makefile +++ b/main/Makefile @@ -209,7 +209,9 @@ ASTSSL_LIB:=libasteriskssl.so $(ASTSSL_LIB).$(ASTSSL_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTSSL_LIB).$(ASTSSL_SO_VERSION) $(ASTSSL_LIB).$(ASTSSL_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskssl\" $(ASTSSL_LIB).$(ASTSSL_SO_VERSION): LIBS+=$(ASTSSL_LIBS) -$(ASTSSL_LIB).$(ASTSSL_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskssl.exports,--warn-common +ifeq ($(GNU_LD),1) + $(ASTSSL_LIB).$(ASTSSL_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskssl.exports,--warn-common +endif $(ASTSSL_LIB).$(ASTSSL_SO_VERSION): SOLINK=$(DYLINK) # These rules are duplicated from $(ASTTOPDIR)/Makefile.rules because the library name |