[odcctools-changes] [153] trunk

[source_changes at macosforge.org]

Revision: 153
          http://trac.macosforge.org/projects/odcctools/changeset/153
Author:   peter at pogma.com
Date:     2009-06-14 20:51:01 -0700 (Sun, 14 Jun 2009)
Log Message:
-----------
extract.sh: Fix extracting on 10.6
files/configure.ac: Fix ability to specify LDFLAGS/CXXFLAGS

Modified Paths:
--------------
    trunk/ChangeLog.odcctools
    trunk/extract.sh
    trunk/files/configure.ac

Modified: trunk/ChangeLog.odcctools
===================================================================
--- trunk/ChangeLog.odcctools	2009-06-14 18:26:26 UTC (rev 152)
+++ trunk/ChangeLog.odcctools	2009-06-15 03:51:01 UTC (rev 153)
@@ -1,7 +1,12 @@
+2009-06-14  Shantonu Sen  <ssen at opendarwin.org>
+
+	* extract.sh: Fix extracting on 10.6
+	* files/configure.ac: Fix ability to specify LDFLAGS/CXXFLAGS
+
 2009-06-14  Peter O'Gorman <peter at pogma.com>
 
 	* Fix typo - s/z86_64/z86_64/. Thanks to Shantonu.
-	* files/confugre.ac: Don't define NON_NATIVE, it's unused.
+	* files/configure.ac: Don't define NON_NATIVE, it's unused.
 	* extract.sh: Explicitly list PATCHFILES.
 
 	* Import cctools-698.1 and ld64-85.2.1

Modified: trunk/extract.sh
===================================================================
--- trunk/extract.sh	2009-06-14 18:26:26 UTC (rev 152)
+++ trunk/extract.sh	2009-06-15 03:51:01 UTC (rev 153)
@@ -46,6 +46,8 @@
 
 if [ "`tar --help | grep -- --strip-components 2> /dev/null`" ]; then
     TARSTRIP=--strip-components
+elif [ "`tar --help | grep bsdtar 2> /dev/null`" ]; then
+    TARSTRIP=--strip-components
 else
     TARSTRIP=--strip-path
 fi

Modified: trunk/files/configure.ac
===================================================================
--- trunk/files/configure.ac	2009-06-14 18:26:26 UTC (rev 152)
+++ trunk/files/configure.ac	2009-06-15 03:51:01 UTC (rev 153)
@@ -218,16 +218,17 @@
 )
 
 ORIGLDFLAGS=$LDFLAGS
-LDFLAGS="-multiply_defined suppress"
+LDFLAGS="$LDFLAGS -multiply_defined suppress"
 AC_MSG_CHECKING([if -multiply_defined suppress is supported])
 AC_LINK_IFELSE([AC_LANG_PROGRAM()],
 	[AC_MSG_RESULT([yes])],
 	[LDFLAGS="$ORIGLDFLAGS"
 	 AC_MSG_RESULT([no])]
 )
+
 AC_LANG_PUSH([C++])
 ORIGCXXFLAGS=$CXXFLAGS
-CXXFLAGS="-Wno-trigraphs"
+CXXFLAGS="$CXXFLAGS -Wno-trigraphs"
 AC_MSG_CHECKING([if -Wno-trigraphs is supported])
 AC_LINK_IFELSE([AC_LANG_PROGRAM()],
 	[AC_MSG_RESULT([yes])],
@@ -236,7 +237,7 @@
 )
 
 ORIGCXXFLAGS=$CXXFLAGS
-CXXFLAGS="-Wno-deprecated"
+CXXFLAGS="$CXXFLAGS -Wno-deprecated"
 AC_MSG_CHECKING([if -Wno-deprecated is supported])
 AC_LINK_IFELSE([AC_LANG_PROGRAM()],
         [AC_MSG_RESULT([yes])],
@@ -245,7 +246,7 @@
 )
 
 ORIGCXXFLAGS=$CXXFLAGS
-CXXFLAGS="-Wno-strict-aliasing"
+CXXFLAGS="$CXXFLAGS -Wno-strict-aliasing"
 AC_MSG_CHECKING([if -Wno-strict-aliasing is supported])
 AC_LINK_IFELSE([AC_LANG_PROGRAM()],
         [AC_MSG_RESULT([yes])],
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20090614/1ea2da58/attachment.html>