diff options
| author | leot <leot@pkgsrc.org> | 2018-10-27 20:58:39 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2018-10-27 20:58:39 +0000 |
| commit | 80b3f13279e3c0651221db82d9b16639ac2db786 (patch) | |
| tree | a455912dc0cf824b1123fe39fa06fde5ca86e485 /editors | |
| parent | 6e6a160295da1c00915b971d285d70ae8addfecf (diff) | |
| download | pkgsrc-80b3f13279e3c0651221db82d9b16639ac2db786.tar.gz | |
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!
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs26/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs26/distinfo | 4 | ||||
| -rw-r--r-- | editors/emacs26/patches/patch-configure | 17 | ||||
| -rw-r--r-- | editors/emacs26/patches/patch-configure.ac | 17 |
4 files changed, 39 insertions, 3 deletions
diff --git a/editors/emacs26/Makefile b/editors/emacs26/Makefile index 39592c27f39..7a708efba48 100644 --- a/editors/emacs26/Makefile +++ b/editors/emacs26/Makefile @@ -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" diff --git a/editors/emacs26/distinfo b/editors/emacs26/distinfo index 1a2a954e8e4..9e8c8ed8660 100644 --- a/editors/emacs26/distinfo +++ b/editors/emacs26/distinfo @@ -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 diff --git a/editors/emacs26/patches/patch-configure b/editors/emacs26/patches/patch-configure new file mode 100644 index 00000000000..877e68f986e --- /dev/null +++ b/editors/emacs26/patches/patch-configure @@ -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 + + diff --git a/editors/emacs26/patches/patch-configure.ac b/editors/emacs26/patches/patch-configure.ac new file mode 100644 index 00000000000..2958095672e --- /dev/null +++ b/editors/emacs26/patches/patch-configure.ac @@ -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 + + |