CVS commit: pkgsrc/editors/xemacs

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Dec 20 15:26:31 UTC 2018

Modified Files:
        pkgsrc/editors/xemacs: distinfo
Added Files:
        pkgsrc/editors/xemacs/patches: patch-configure

Log Message:
On progressive Linuxen (Arch here), CPPFLAGS pre-filled with
-D_FORTIFY_SOURCE=2 -Werror will make configure tests fail on
pre-processor warnings, and break the build. Make sure we set CPP to
something that works.

This patch should go upstream into configure.in, but it is really the
autoconf AC_PROG_CPP macro definition that needs to be amended.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/editors/xemacs/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/editors/xemacs/patches/patch-configure

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

Modified files:

Index: pkgsrc/editors/xemacs/distinfo
diff -u pkgsrc/editors/xemacs/distinfo:1.27 pkgsrc/editors/xemacs/distinfo:1.28
--- pkgsrc/editors/xemacs/distinfo:1.27 Tue Jan 24 20:31:14 2017
+++ pkgsrc/editors/xemacs/distinfo      Thu Dec 20 15:26:31 2018
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.27 2017/01/24 20:31:14 hauke Exp $
+$NetBSD: distinfo,v 1.28 2018/12/20 15:26:31 hauke Exp $
 
 SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
 RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
 SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes
 SHA1 (patch-Makefile.in.in) = a65cf383a343bb582f6950a28c4e7219e3dd22e7
+SHA1 (patch-configure) = 10ae7a19ada6321996d9f57b8129ee91c326ac72
 SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd
 SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3
 SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e

Added files:

Index: pkgsrc/editors/xemacs/patches/patch-configure
diff -u /dev/null pkgsrc/editors/xemacs/patches/patch-configure:1.3
--- /dev/null   Thu Dec 20 15:26:31 2018
+++ pkgsrc/editors/xemacs/patches/patch-configure       Thu Dec 20 15:26:31 2018
@@ -0,0 +1,43 @@
+$NetBSD: patch-configure,v 1.3 2018/12/20 15:26:31 hauke Exp $
+
+On progressive Linuxen (Arch here), CPPFLAGS pre-filled with
+-D_FORTIFY_SOURCE=2 -Werror will make configure tests fail on
+pre-processor warnings. Make sure we set CPP to something that works.
+
+This patch should go upstream into configure.in, but it is really the
+autoconf AC_PROG_CPP macro definition that needs to be amended.
+
+--- configure.orig     2015-03-25 11:25:33.000000000 +0000
++++ configure
+@@ -2362,10 +2362,31 @@ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
++  # Some Linuxen (Arch) define _FORTIFY_SOURCE in CPPFLAGS together 
++  # with -Werror. Make sure the warnings do not disrupt feature tests.
++  CPP="${CC-cc} -E -Wno-cpp"
++  cat > conftest.$ac_ext <<EOF
++#line 2370 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:2376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
+   CPP=/lib/cpp
+ fi
+ rm -f conftest*
+ fi
++rm -f conftest*
++fi
+ rm -f conftest*
+ fi
+ rm -f conftest*