[asterisk-commits] mjordan: branch 12 r412483 - in /branches/12: ./ channels/ main/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Apr 17 15:24:41 2014
New Revision: 412483

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412483
Log:
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

Modified:
    branches/12/   (props changed)
    branches/12/channels/chan_oss.c
    branches/12/main/Makefile

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/channels/chan_oss.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_oss.c?view=diff&rev=412483&r1=412482&r2=412483
==============================================================================
--- branches/12/channels/chan_oss.c (original)
+++ branches/12/channels/chan_oss.c Thu Apr 17 15:24:41 2014
@@ -53,7 +53,7 @@
 
 #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>

Modified: branches/12/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/Makefile?view=diff&rev=412483&r1=412482&r2=412483
==============================================================================
--- branches/12/main/Makefile (original)
+++ branches/12/main/Makefile Thu Apr 17 15:24:41 2014
@@ -209,7 +209,9 @@
 $(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