[asterisk-commits] kpfleming: branch 1.6.1 r214699 - in /branches/1.6.1: ./ include/asterisk/

Fri Aug 28 15:05:08 CDT 2009

Author: kpfleming
Date: Fri Aug 28 15:05:04 2009
New Revision: 214699

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=214699
Log:
Merged revisions 214696 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r214696 | kpfleming | 2009-08-28 15:01:21 -0500 (Fri, 28 Aug 2009) | 9 lines
  
  Ensure that CFLAGS and/or LDFLAGS provided to configure script are preserved.
  
  Cross-compilation environments want to provide 'defaults' for compiler and
  linker options, and frequently do this by specifying CFLAGS and LDFLAGS in the
  environment or as command-line arguments to the configure script. This patch
  modifies the configure script and Makefile to preserve these settings and
  ensure they are used in the build process.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile
    branches/1.6.1/configure
    branches/1.6.1/configure.ac
    branches/1.6.1/include/asterisk/autoconfig.h.in
    branches/1.6.1/makeopts.in

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/Makefile?view=diff&rev=214699&r1=214698&r2=214699
==============================================================================

--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Fri Aug 28 15:05:04 2009
@@ -95,10 +95,17 @@
   include makeopts
 endif
 
+# start the primary CFLAGS and LDFLAGS with any that were provided
+# to the configure script
+_ASTCFLAGS:=$(CONFIG_CFLAGS)
+_ASTLDFLAGS:=$(CONFIG_LDFLAGS)
+
 # Some build systems, such as the one in openwrt, like to pass custom target
-# CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
-ASTCFLAGS+=$(COPTS)
-ASTLDFLAGS+=$(LDOPTS)
+# CFLAGS and LDFLAGS in the COPTS and LDOPTS variables; these should also
+# go before any build-system computed flags, since they are defaults, not
+# overrides
+_ASTCFLAGS+=$(COPTS)
+_ASTLDFLAGS+=$(LDOPTS)
 
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes

Modified: branches/1.6.1/configure.ac
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/configure.ac?view=diff&rev=214699&r1=214698&r2=214699
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Fri Aug 28 15:05:04 2009
@@ -24,6 +24,12 @@
 AC_REVISION($Revision$)
 
 AC_USE_SYSTEM_EXTENSIONS	# note- does not work on FreeBSD
+
+# preserve any CFLAGS or LDFLAGS that may be set
+CONFIG_CFLAGS="${CFLAGS}"
+CONFIG_LDFLAGS="${LDFLAGS}"
+AC_SUBST(CONFIG_CFLAGS)
+AC_SUBST(CONFIG_LDFLAGS)
 
 case "${host_os}" in
      freebsd*)

Modified: branches/1.6.1/include/asterisk/autoconfig.h.in
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/autoconfig.h.in?view=diff&rev=214699&r1=214698&r2=214699
==============================================================================
--- branches/1.6.1/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.1/include/asterisk/autoconfig.h.in Fri Aug 28 15:05:04 2009
@@ -1081,9 +1081,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
 #undef PTHREAD_CREATE_JOINABLE
@@ -1099,11 +1096,6 @@
 
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
 
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
@@ -1125,20 +1117,30 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@@ -1155,20 +1157,6 @@
 
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Modified: branches/1.6.1/makeopts.in
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/makeopts.in?view=diff&rev=214699&r1=214698&r2=214699
==============================================================================
--- branches/1.6.1/makeopts.in (original)
+++ branches/1.6.1/makeopts.in Fri Aug 28 15:05:04 2009
@@ -46,6 +46,9 @@
 PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 PTHREAD_LIBS=@PTHREAD_LIBS@
 
+CONFIG_CFLAGS=@CONFIG_CFLAGS@
+CONFIG_LDFLAGS=@CONFIG_LDFLAGS@
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 


