pnet-systemffi.patch

   1 --- Makefile.am~        2005-08-17 00:42:32.000000000 +0000
   2 +++ Makefile.am 2005-11-01 14:49:05.134576856 +0000
   3 @@ -12,14 +12,14 @@
   4
   5  if PNET_TOOLS
   6
   7 -SUBDIRS = . $(LIBGC_DIR) $(LIBFFI_DIR) include support image dumpasm engine ilasm ildasm \
   8 +SUBDIRS = . $(LIBGC_DIR) include support image dumpasm engine ilasm ildasm \
   9                   ilalink ilsize ilnative ilheader ilfind ildd codegen cscc \
  10                   resgen ilstrip ilranlib ilgac csdoc csant clrwrap samples doc tests
  11
  12  else
  13
  14  ## We only want to build the runtime engine.
  15 -SUBDIRS = . $(LIBGC_DIR) $(LIBFFI_DIR) include coremul support image engine
  16 +SUBDIRS = . $(LIBGC_DIR) include coremul support image engine
  17
  18  endif
  19
  20 --- configure.in~       2005-08-17 00:42:32.000000000 +0000
  21 +++ configure.in        2005-11-01 14:56:02.761087976 +0000
  22 @@ -559,7 +559,7 @@
  23  dnl Set up libffi-related variables.
  24  AC_SUBST(FFILIBS)
  25  if test x$withffi = xyes ; then
  26 -       FFILIBS='$(top_builddir)/libffi/.libs/libffi.a'
  27 +       FFILIBS='-lffi'
  28         AC_DEFINE(HAVE_LIBFFI, 1, [Define if you are using libffi])
  29  else
  30         FFILIBS=""
  31 --- configure.in~       2006-03-13 01:26:28.000000000 +0000
  32 +++ configure.in        2006-03-13 01:28:22.350401250 +0000
  33 @@ -659,32 +659,10 @@
  34         dnl under $srcdir from a subdirectory of the build tree.  This is
  35         dnl     different depending on whether $srcdir is absolute or relative.
  36         if echo $srcdir | grep '^[[~/]]'; then
  37 -               ffisrcdir=$srcdir/libffi
  38                 gcsrcdir=$srcdir/libgc
  39         else
  40 -               ffisrcdir=../$srcdir/libffi
  41                 gcsrcdir=../$srcdir/libgc
  42         fi
  43 -       if test x$withffi = xyes ; then
  44 -               if test ! -d libffi ; then
  45 -                       mkdir libffi
  46 -               fi
  47 -               cd "libffi"
  48 -               ${CONFIG_SHELL-/bin/sh} ${ffisrcdir}/configure --disable-shared \
  49 -                       --enable-multilib=no \
  50 -                       --disable-dependency-tracking \
  51 -                       --host="${host}" --build="${build}" --target="${target}" \
  52 -                       --disable-fast-install --prefix="${prefix}" \
  53 -                       --exec-prefix="${exec_prefix}" --bindir="${bindir}" \
  54 -                       --sbindir="${sbindir}" --libexecdir="${libexecdir}" \
  55 -                       --datadir="${datadir}" --sysconfdir="${sysconfdir}" \
  56 -                       --sharedstatedir="${sharedstatedir}" \
  57 -                       --localstatedir="${localstatedir}" --libdir="${libdir}/pnet" \
  58 -                       --includedir="${includedir}/pnet" \
  59 -                       --oldincludedir="${oldincludedir}/pnet" --infodir="${infodir}" \
  60 -                       --mandir="${mandir}" --srcdir="${ffisrcdir}" || exit 1
  61 -               cd ..
  62 -       fi
  63
  64         if test x$withgc = xyes ; then
  65                 if test ! -d libgc ; then