summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMats Lidell <matsl@gentoo.org>2017-01-30 23:46:17 +0100
committerMats Lidell <matsl@gentoo.org>2017-01-30 23:46:17 +0100
commitcfe84c42d2f43337019bacb4ae545643b367b27b (patch)
tree94bf69d24b5d62afeb6dc65f4e83ab0c4edf8255
parentapp-xemacs/cc-mode: Pre release version bump. (diff)
downloademacs-cfe84c42d2f43337019bacb4ae545643b367b27b.tar.gz
emacs-cfe84c42d2f43337019bacb4ae545643b367b27b.tar.bz2
emacs-cfe84c42d2f43337019bacb4ae545643b367b27b.zip
app-editors/xemacs: Remove define of deprecated glibc macros
Package-Manager: portage-2.3.3
-rw-r--r--app-editors/xemacs/ChangeLog6
-rw-r--r--app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch32
-rw-r--r--app-editors/xemacs/xemacs-21.5.34-r5.ebuild3
3 files changed, 39 insertions, 2 deletions
diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 88ee964..324c044 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for app-editors/xemacs
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 30 Jan 2017; <matsl@gentoo.org> xemacs-21.5.34-r5.ebuild,
+ +files/xemacs-21.5.34-glibc-macro.patch:
+ Remove define of deprecated glibc macros.
+
31 Mar 2015; Ulrich Müller <ulm@gentoo.org> xemacs-21.5.34-r4.ebuild:
Update dependency after package move of eselect modules to app-eselect.
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
new file mode 100644
index 0000000..b611b15
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
@@ -0,0 +1,32 @@
+diff -r f412e9f093d4 configure
+--- a/configure Wed Jan 25 00:47:06 2017 +0000
++++ b/configure Sun Jan 29 19:32:47 2017 +0100
+@@ -13507,7 +13507,10 @@
+ -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
+ * ) val=1 ;;
+ esac
+- if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++ if grep "^#define $sym " confdefs.h >/dev/null || \
++ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++ then :; else
+ if test "$val" = "1"
+ then cat >>confdefs.h <<_ACEOF
+ #define $sym 1
+diff -r f412e9f093d4 configure.ac
+--- a/configure.ac Wed Jan 25 00:47:06 2017 +0000
++++ b/configure.ac Sun Jan 29 19:32:47 2017 +0100
+@@ -3136,7 +3136,12 @@
+ * ) val=1 ;;
+ esac
+ dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
+- if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
++dnl likes us to define; ignore them if appropriate.
++ if grep "^#define $sym " confdefs.h >/dev/null || \
++ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++ then :; else
+ if test "$val" = "1"
+ then AC_DEFINE_UNQUOTED($sym)
+ else AC_DEFINE_UNQUOTED($sym,$val)
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index 486bc7c..4ff3a44 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -69,6 +69,7 @@ src_prepare() {
epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
epatch "${FILESDIR}/${P}-gcc5.patch"
epatch "${FILESDIR}/${P}-destdir.patch"
+ epatch "${FILESDIR}/${P}-glibc-macro.patch"
# Some binaries and man pages are installed under suffixed names
# to avoid collions with their GNU Emacs counterparts (see below).