pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

emacs-git: Do not inject X11 LDFLAGS, pkgsrc handles that.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon May 13 16:09:50 2019 +0200
Changeset:	afe1682d4c63b7ad452c6ce9e656a1cbbb209fed

Modified Files:
	emacs-git/PLIST
	emacs-git/distinfo
Added Files:
	emacs-git/patches/patch-configure.ac

Log Message:
emacs-git: Do not inject X11 LDFLAGS, pkgsrc handles that.

Fixes PR pkg/53688.

Update PLIST while here.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=afe1682d4c63b7ad452c6ce9e656a1cbbb209fed

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

diffstat:
 emacs-git/PLIST                      |  2 ++
 emacs-git/distinfo                   |  1 +
 emacs-git/patches/patch-configure.ac | 17 +++++++++++++++++
 3 files changed, 20 insertions(+)

diffs:
diff --git a/emacs-git/PLIST b/emacs-git/PLIST
index c3e3fcc3e3..5d3db048ab 100644
--- a/emacs-git/PLIST
+++ b/emacs-git/PLIST
@@ -1506,6 +1506,8 @@ share/emacs/${PKGVERSION}/lisp/dirtrack.el.gz
 share/emacs/${PKGVERSION}/lisp/dirtrack.elc
 share/emacs/${PKGVERSION}/lisp/disp-table.el.gz
 share/emacs/${PKGVERSION}/lisp/disp-table.elc
+share/emacs/${PKGVERSION}/lisp/display-fill-column-indicator.el.gz
+share/emacs/${PKGVERSION}/lisp/display-fill-column-indicator.elc
 share/emacs/${PKGVERSION}/lisp/display-line-numbers.el.gz
 share/emacs/${PKGVERSION}/lisp/display-line-numbers.elc
 share/emacs/${PKGVERSION}/lisp/dnd.el.gz
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
index afc76512f4..63f4110da5 100644
--- a/emacs-git/distinfo
+++ b/emacs-git/distinfo
@@ -1,2 +1,3 @@
 $NetBSD$
 
+SHA1 (patch-configure.ac) = c9731094e059ac80d25e5a32894404a14be64433
diff --git a/emacs-git/patches/patch-configure.ac b/emacs-git/patches/patch-configure.ac
new file mode 100644
index 0000000000..9a9f8a951b
--- /dev/null
+++ b/emacs-git/patches/patch-configure.ac
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Do not inject X11 LDFLAGS, pkgsrc handles that.
+Fixes PR pkg/53688.
+
+--- configure.ac.orig	2019-05-13 12:01:24.181647930 +0000
++++ configure.ac
+@@ -1551,7 +1551,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
+ 
+ C_SWITCH_MACHINE=


Home | Main Index | Thread Index | Old Index