Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1606745148110270"
MIME-Version: 1.0
Date: Mon, 30 Nov 2020 14:05:48 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/xapian
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20201130140548.54F80FA9D@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1606745148110270
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Mon Nov 30 14:05:48 UTC 2020

Modified Files:
	pkgsrc/textproc/xapian: distinfo-bindings
	pkgsrc/textproc/xapian/patches-bindings: patch-configure

Log Message:
Remove broken cross-compile check (builds a bundle, complains it can't
run as executable) to fix lua-xapian on Big Sur.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/xapian/distinfo-bindings
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/textproc/xapian/patches-bindings/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1606745148110270
Content-Disposition: inline
Content-Length: 4749
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/xapian/distinfo-bindings
diff -u pkgsrc/textproc/xapian/distinfo-bindings:1.20 pkgsrc/textproc/xapian/distinfo-bindings:1.21
--- pkgsrc/textproc/xapian/distinfo-bindings:1.20	Thu Nov  5 10:59:43 2020
+++ pkgsrc/textproc/xapian/distinfo-bindings	Mon Nov 30 14:05:48 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo-bindings,v 1.20 2020/11/05 10:59:43 schmonz Exp $
+$NetBSD: distinfo-bindings,v 1.21 2020/11/30 14:05:48 schmonz Exp $
 
 SHA1 (xapian-bindings-1.4.17.tar.xz) = 366dd7bbbbd9a4cb0253de974cb19f52e0877ca5
 RMD160 (xapian-bindings-1.4.17.tar.xz) = b9efdfd51eb2836fd942c10396f3afafe820e336
 SHA512 (xapian-bindings-1.4.17.tar.xz) = 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
 Size (xapian-bindings-1.4.17.tar.xz) = 1135100 bytes
-SHA1 (patch-configure) = 852d74a5c506387cdbf02329dc87ceab2597c59b
+SHA1 (patch-configure) = bed914e0c98e422e4d897ae57a541ff915acb129
 SHA1 (patch-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330
 SHA1 (patch-perl_Makefile.in) = 993b137b319d7d28c2b3a70d2e46e1a38d380578
 SHA1 (patch-php7_php7_xapian__wrap.cc) = aa5ca15ef04bbd5038e23f4d1d01d1029243c68e

Index: pkgsrc/textproc/xapian/patches-bindings/patch-configure
diff -u pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.3 pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.4
--- pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.3	Thu Nov  5 10:59:44 2020
+++ pkgsrc/textproc/xapian/patches-bindings/patch-configure	Mon Nov 30 14:05:48 2020
@@ -1,9 +1,11 @@
-$NetBSD: patch-configure,v 1.3 2020/11/05 10:59:44 schmonz Exp $
+$NetBSD: patch-configure,v 1.4 2020/11/30 14:05:48 schmonz Exp $
 
 - Remove hackaround for old OpenBSD bugs that break builds with other
   STL implementations.
 - Link directly with static-only libtclstub.a (fixes build on NetBSD).
 - Remove workaround for old macOS to fix Big Sur build.
+- Remove broken cross-compile check (builds a bundle, complains it can't
+  run as executable) to fix lua-xapian on Big Sur.
 
 --- configure.orig	2020-08-21 03:38:47.000000000 +0000
 +++ configure
@@ -22,7 +24,59 @@ $NetBSD: patch-configure,v 1.3 2020/11/0
    ;;
  esac
   if test -n "$OVERRIDE_MACOSX_DEPLOYMENT_TARGET"; then
-@@ -18048,7 +18040,7 @@ fi
+@@ -3971,51 +3963,6 @@ FILE *f = fopen ("conftest.out", "w");
+   return 0;
+ }
+ _ACEOF
+-ac_clean_files="$ac_clean_files conftest.out"
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-if test "$cross_compiling" != yes; then
+-  { { ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }
+-  if { ac_try='./conftest$ac_cv_exeext'
+-  { { case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
+-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
+-    fi
+-  fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+@@ -18048,7 +17995,7 @@ fi
  	    for x in "/tcl$tcl_version" "" ; do
  	      TCLCONFIG_SH=$tcl_libdir_runtime$x/tclConfig.sh
  	      if test -r "$TCLCONFIG_SH" ; then
@@ -31,7 +85,7 @@ $NetBSD: patch-configure,v 1.3 2020/11/0
  		break
  	      fi
  	    done
-@@ -19524,9 +19516,6 @@ SWIG_CXXFLAGS=
+@@ -19524,9 +19471,6 @@ SWIG_CXXFLAGS=
  if test yes = "$GXX" ; then
                      SWIG_CXXFLAGS="-fno-strict-aliasing"
  

--_----------=_1606745148110270--