components/runtime/clisp/patches/linking-paths.patch

   1 $NetBSD: patch-src_configure,v 1.2 2014/05/14 11:24:25 jperkin Exp $
   2
   3 Fix shell syntax.
   4
   5 --- src/configure.orig  2010-07-07 17:22:03.000000000 +0000
   6 +++ src/configure
   7 @@ -17045,7 +17045,7 @@ fi
   8    fi
   9    if test "X$ltrpathdirs" != "X"; then
  10              for found_dir in $ltrpathdirs; do
  11 -      LTLIBSIGSEGV="${LTLIBSIGSEGV}${LTLIBSIGSEGV:+ }-R$found_dir"
  12 +      LTLIBSIGSEGV="${LTLIBSIGSEGV}${LTLIBSIGSEGV:+ }${COMPILER_RPATH_FLAG}$found_dir"
  13      done
  14    fi
  15
  16 @@ -20036,7 +20036,7 @@ fi
  17    fi
  18    if test "X$ltrpathdirs" != "X"; then
  19              for found_dir in $ltrpathdirs; do
  20 -      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
  21 +      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }${COMPILER_RPATH_FLAG}$found_dir"
  22      done
  23    fi
  24
  25 @@ -21458,7 +21458,7 @@ fi
  26    fi
  27    if test "X$ltrpathdirs" != "X"; then
  28              for found_dir in $ltrpathdirs; do
  29 -      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
  30 +      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }${COMPILER_RPATH_FLAG}$found_dir"
  31      done
  32    fi
  33
  34 @@ -22136,7 +22136,7 @@ fi
  35    fi
  36    if test "X$ltrpathdirs" != "X"; then
  37              for found_dir in $ltrpathdirs; do
  38 -      LTLIBAVCALL="${LTLIBAVCALL}${LTLIBAVCALL:+ }-R$found_dir"
  39 +      LTLIBAVCALL="${LTLIBAVCALL}${LTLIBAVCALL:+ }${COMPILER_RPATH_FLAG}$found_dir"
  40      done
  41    fi
  42
  43 @@ -22650,7 +22650,7 @@ fi
  44    fi
  45    if test "X$ltrpathdirs" != "X"; then
  46              for found_dir in $ltrpathdirs; do
  47 -      LTLIBCALLBACK="${LTLIBCALLBACK}${LTLIBCALLBACK:+ }-R$found_dir"
  48 +      LTLIBCALLBACK="${LTLIBCALLBACK}${LTLIBCALLBACK:+ }${COMPILER_RPATH_FLAG}$found_dir"
  49      done
  50    fi
  51
  52 @@ -22898,7 +22898,7 @@ fi
  53  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cl_cv_have_ffcall" >&5
  54  $as_echo "$cl_cv_have_ffcall" >&6; }
  55  if test $cl_use_ffcall = yes -a $cl_cv_have_ffcall = no; then
  56 -  if  "$ac_cv_build" = "$ac_cv_host" ; then host_arg="";
  57 +  if test "$ac_cv_build" = "$ac_cv_host" ; then host_arg="";
  58    else host_arg=" --host=$ac_cv_host";
  59    fi
  60    as_fn_error "despite --with-ffcall, FFCALL was not found
  61 @@ -23566,9 +23566,9 @@ _ACEOF
  62  if ac_fn_c_try_link "$LINENO"; then :
  63    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  64  $as_echo "no" >&6; }
  65 -       X_LIBS="$X_LIBS -R$x_libraries"
  66 +       X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
  67  else
  68 -  LIBS="$ac_xsave_LIBS -R $x_libraries"
  69 +  LIBS="$ac_xsave_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
  70         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  71  /* end confdefs.h.  */
  72
  73 @@ -23583,7 +23583,7 @@ _ACEOF
  74  if ac_fn_c_try_link "$LINENO"; then :
  75    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  76  $as_echo "yes" >&6; }
  77 -         X_LIBS="$X_LIBS -R $x_libraries"
  78 +         X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
  79  else
  80    { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
  81  $as_echo "neither works" >&6; }
  82 @@ -29120,7 +29120,7 @@ fi
  83    fi
  84    if test "X$ltrpathdirs" != "X"; then
  85              for found_dir in $ltrpathdirs; do
  86 -      LTLIBREADLINE="${LTLIBREADLINE}${LTLIBREADLINE:+ }-R$found_dir"
  87 +      LTLIBREADLINE="${LTLIBREADLINE}${LTLIBREADLINE:+ }${COMPILER_RPATH_FLAG}$found_dir"
  88      done
  89    fi
  90