CVS commit: pkgsrc/editors/emacs26

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Oct 27 20:58:39 UTC 2018

Modified Files:
        pkgsrc/editors/emacs26: Makefile distinfo
Added Files:
        pkgsrc/editors/emacs26/patches: patch-configure patch-configure.ac

Log Message:
emacs26: Do not (manually) inject X11 LDFLAGS via configure

On NetBSD and OpenBSD the configure script injects LD_SWITCH_X_SITE_RPATH
(e.g.  `-Wl,-rpath,/usr/X11R7/lib') early as LDFLAGS leading to link with
possible X11 native libraries when it is not requested.

Should fix PR pkg/53688.

Bump PKGREVISION

Thanks to <maya> for debug-fu help!


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs26/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs26/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/emacs26/patches/patch-configure \
    pkgsrc/editors/emacs26/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/editors/emacs26/Makefile
diff -u pkgsrc/editors/emacs26/Makefile:1.3 pkgsrc/editors/emacs26/Makefile:1.4
--- pkgsrc/editors/emacs26/Makefile:1.3 Fri Jul 20 03:34:11 2018
+++ pkgsrc/editors/emacs26/Makefile     Sat Oct 27 20:58:39 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2018/07/20 03:34:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2018/10/27 20:58:39 leot Exp $
 
 CONFLICTS+=    emacs26-nox11-[0-9]*
-PKGREVISION=   2
+PKGREVISION=   3
 
 .include "../../editors/emacs26/Makefile.common"
 

Index: pkgsrc/editors/emacs26/distinfo
diff -u pkgsrc/editors/emacs26/distinfo:1.1 pkgsrc/editors/emacs26/distinfo:1.2
--- pkgsrc/editors/emacs26/distinfo:1.1 Wed Jun 20 11:04:19 2018
+++ pkgsrc/editors/emacs26/distinfo     Sat Oct 27 20:58:39 2018
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1 2018/06/20 11:04:19 mef Exp $
+$NetBSD: distinfo,v 1.2 2018/10/27 20:58:39 leot Exp $
 
 SHA1 (emacs-26.1.tar.gz) = 278c4873693173136fb7503ec75cefa32d2ab658
 RMD160 (emacs-26.1.tar.gz) = f13fe104345738c853bcce2e3e061dbfb8692bc5
 SHA512 (emacs-26.1.tar.gz) = 0be0c093f15f620d7d200a4ca4ddd9ec68481d966d08e4606a42e399ba0eb125ffed05771cc5cd6524a56135d2b8dc5c2fd48f04716f98531d2837efbccc09ef
 Size (emacs-26.1.tar.gz) = 65007481 bytes
+SHA1 (patch-configure) = ceb64518bd90b9c6dbd46174ad19e540b5ea96ed
+SHA1 (patch-configure.ac) = 232c4466c7de759881169c7016b07537043a6d54
 SHA1 (patch-src_inotify.c) = 1fdc6566ed57e8418f1ddc85bb03518d7d9d6bb3

Added files:

Index: pkgsrc/editors/emacs26/patches/patch-configure
diff -u /dev/null pkgsrc/editors/emacs26/patches/patch-configure:1.1
--- /dev/null   Sat Oct 27 20:58:39 2018
+++ pkgsrc/editors/emacs26/patches/patch-configure      Sat Oct 27 20:58:39 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2018/10/27 20:58:39 leot Exp $
+
+Do not inject X11 LDFLAGS, pkgsrc handles that.
+Fixes PR pkg/53688.
+
+--- configure.orig     2017-09-11 17:28:38.000000000 +0000
++++ configure
+@@ -9549,7 +9549,8 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM"
+ ## LD_SWITCH_SYSTEM_TEMACS.
+ case "$opsys" in
+   netbsd|openbsd)
+-   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
++### This is handled by pkgsrc.
++###   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
+ esac
+ 
+ 
Index: pkgsrc/editors/emacs26/patches/patch-configure.ac
diff -u /dev/null pkgsrc/editors/emacs26/patches/patch-configure.ac:1.1
--- /dev/null   Sat Oct 27 20:58:39 2018
+++ pkgsrc/editors/emacs26/patches/patch-configure.ac   Sat Oct 27 20:58:39 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure.ac,v 1.1 2018/10/27 20:58:39 leot Exp $
+
+Do not inject X11 LDFLAGS, pkgsrc handles that.
+Fixes PR pkg/53688.
+
+--- configure.ac.orig  2017-09-11 16:55:00.000000000 +0000
++++ configure.ac
+@@ -1383,7 +1383,8 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM"
+ ## LD_SWITCH_SYSTEM_TEMACS.
+ case "$opsys" in
+   netbsd|openbsd)
+-   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
++### This is handled by pkgsrc.
++###   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
+ esac
+ 
+