From 2db8cd966b9535468497485a2075b031549aac0a Mon Sep 17 00:00:00 2001
From: Mats Lidell <matsl@gentoo.org>
Date: Tue, 9 Jul 2019 10:16:51 +0200
Subject: app-editors/xemacs: Fix configure problem

libneXtaw was not found. This was caused by libs not being linked in
the right order which is required when '--as-needed' is used.

Bug: https://bugs.gentoo.org/689176
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Mats Lidell <matsl@gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.16
---
 .../xemacs/files/xemacs-21.5.34-as-needed.patch    | 25 ++++++++++++++++++++++
 app-editors/xemacs/xemacs-21.5.34-r4.ebuild        |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch

(limited to 'app-editors/xemacs')

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
new file mode 100644
index 000000000000..542ce14c36af
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
@@ -0,0 +1,25 @@
+diff -r 30910ee1cf8c configure
+--- a/configure	Tue Jun 18 10:37:46 2019 +0100
++++ b/configure	Mon Jul 08 20:38:49 2019 +0200
+@@ -16668,7 +16668,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$athena_variant  $LIBS"
++LIBS="-l$athena_variant $libs_x $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+diff -r 30910ee1cf8c configure.ac
+--- a/configure.ac	Tue Jun 18 10:37:46 2019 +0100
++++ b/configure.ac	Mon Jul 08 20:38:49 2019 +0200
+@@ -4068,7 +4068,8 @@
+           athena_lib=Xaw;
+           AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
+         ],
+-        [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]))
++        [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]),
++        $libs_x)
+   fi
+ 
+   dnl Now we locate the Athena headers that we need.
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 9747f72b358e..28f843bc94a4 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -66,6 +66,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
 	epatch "${FILESDIR}/${P}-gcc5.patch"
 	epatch "${FILESDIR}/${P}-glibc-macro.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 
 	# Some binaries and man pages are installed under suffixed names
 	# to avoid collions with their GNU Emacs counterparts (see below).
-- 
cgit v1.2.3-65-gdbad