Re: libffi on solaris x64 and gcc

["OBATA Akio" <obache%netbsd.org@localhost>]

On Sun, 17 Mar 2013 22:34:52 +0900, Jonathan Perkin 
<jperkin%joyent.com@localhost> wrote:

> * On 2013-03-17 at 10:12 GMT, Richard PALO wrote:
>
> > Apparently the same issue was noticed as well on other platforms.
> >
> > https://github.com/atgreen/libffi/issues/31
> >
> > Please rollback until the issue is resolved.
>
> Indeed, see:
>
>   
> http://pkgsrc.smartos.org/reports/upstream-trunk64/20130316.0620/meta/report.html
>
> Breaking >4,000 packages is not cool.

Could you try following?

Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libffi/patches/patch-aa,v
retrieving revision 1.15
diff -u -r1.15 patch-aa
--- patches/patch-aa    14 Mar 2013 19:56:41 -0000      1.15
+++ patches/patch-aa    17 Mar 2013 14:04:51 -0000
@@ -49,7 +49,20 @@

  $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h

-@@ -16716,13 +16716,13 @@ s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-a
+@@ -14826,12 +14826,6 @@ if test "x$GCC" = "xyes"; then
+     toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+     toolexeclibdir='$(libdir)'
+   fi
+-  multi_os_directory=`$CC -print-multi-os-directory`
+-  case $multi_os_directory in
+-    .) ;; # Avoid trailing /.
+-    *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+-  esac
+-
+ else
+   toolexeclibdir='$(libdir)'
+ fi
+@@ -16716,13 +16710,13 @@ s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-a
  /-all-all/d
  a\\
        @ HOST="\$(HOST)\" \\\\\\


--
OBATA Akio / obache%NetBSD.org@localhost