[csw-devel] SF.net SVN: gar:[9394] csw/mgar/pkg/lftp/trunk

[chninkel at users.sourceforge.net]

Revision: 9394
          http://gar.svn.sourceforge.net/gar/?rev=9394&view=rev
Author:   chninkel
Date:     2010-03-26 23:50:40 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
lftp: modified lftp m4 macros to prevent the configure script from incorrectly thinking that Sun Studio 12 CC supports the __restrict__ keyword

Modified Paths:
--------------
    csw/mgar/pkg/lftp/trunk/Makefile
    csw/mgar/pkg/lftp/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2010-03-26 23:44:18 UTC (rev 9393)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2010-03-26 23:50:40 UTC (rev 9394)
@@ -42,14 +42,21 @@
 DISTFILES += CSWlftp.prototype
 DISTFILES += changelog.CSW
 
-
-##### Build and installation information #####
-
 # do some type conversion before munmap call
 # so lftp can be compiled with sun cc 
 # (patch only mandatory to compile with gnutls)
 #PATCHFILES = munmap.patch
 
+# Sun Studio 12 cc supports the __restrict__ keyword
+# but CC doesn't, that disturbs autoconf.
+# so we have to apply the following modification to 
+# lftp-provided autoconf m4 macros
+# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=aa30765d64d4a50ad7ce83e78b5699223571ef36
+PATCHFILES += sun_cc_no_restrict.patch
+
+##### Build and installation information #####
+
+
 CONFIGURE_ARGS = $(DIRPATHS)
 # previous maintainer compiled with openssl
 # instead of gnutls, no need to change that

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-03-26 23:44:18 UTC (rev 9393)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-03-26 23:50:40 UTC (rev 9394)
@@ -1,6 +1,9 @@
 lftp (4.0.6,REV=2010.03.26) unstable
 
   * New upstream release.
+  * Applied sun_cc_no_restrict.patch to prevent the configure script
+  from incorrectly thinking that Sun Studio 12 CC supports the __restrict__
+  keyword.
 
  -- Yann Rouillard <yann at opencsw.org>  Fri, 26 Mar 2010 22:03:15 +0100
 

Added: csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch	                        (rev 0)
+++ csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch	2010-03-26 23:50:40 UTC (rev 9394)
@@ -0,0 +1,22 @@
+--- lftp-4.0.6/m4/gnulib-common.m4.orig	2010-03-27 00:36:17.789995812 +0100
++++ lftp-4.0.6/m4/gnulib-common.m4	2010-03-27 00:37:09.978083148 +0100
+@@ -104,13 +104,14 @@
+    nothing if this is not supported.  Do not define if restrict is
+    supported directly.  */
+ #undef restrict
+-/* Work around a bug in Sun C++: it does not support _Restrict, even
+-   though the corresponding Sun C compiler does, which causes
+-   "#define restrict _Restrict" in the previous line.  Perhaps some future
+-   version of Sun C++ will work with _Restrict; if so, it'll probably
+-   define __RESTRICT, just as Sun C does.  */
++/* Work around a bug in Sun C++: it does not support _Restrict or
++ __restrict__, even though the corresponding Sun C compiler ends up with
++ "#define restrict _Restrict" or "#define restrict __restrict__" in the
++ previous line. Perhaps some future version of Sun C++ will work with
++ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
+ #if defined __SUNPRO_CC && !defined __RESTRICT
+ # define _Restrict
++# define __restrict__
+ #endif])
+  case $ac_cv_c_restrict in
+    restrict) ;;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.