| 1 |
commit: 15145b740033975edb49e646ec73d4df5dfcf851 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Aug 6 14:47:39 2016 +0000 |
| 4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 14:53:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15145b74 |
| 7 |
|
| 8 |
dev-lang/erlang: remove unused patches |
| 9 |
|
| 10 |
Acked-By: Dirkjan Ochtman <djc <AT> gentoo.org> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/2161 |
| 12 |
|
| 13 |
dev-lang/erlang/files/16.2-tinfo.patch | 11 ----- |
| 14 |
dev-lang/erlang/files/17.0-systemd.patch | 85 -------------------------------- |
| 15 |
2 files changed, 96 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/erlang/files/16.2-tinfo.patch b/dev-lang/erlang/files/16.2-tinfo.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index f51ba58..00000000 |
| 20 |
--- a/dev-lang/erlang/files/16.2-tinfo.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,11 +0,0 @@ |
| 23 |
---- erts/configure.in.bak 2013-11-04 14:47:47.838188678 +0100 |
| 24 |
-+++ erts/configure.in 2013-11-04 14:46:54.352439671 +0100 |
| 25 |
-@@ -1322,7 +1322,7 @@ |
| 26 |
- if test "x$with_termcap" != "xno" && |
| 27 |
- test "X$host" != "Xwin32"; then |
| 28 |
- # try these libs |
| 29 |
-- termcap_libs="ncurses curses termcap termlib" |
| 30 |
-+ termcap_libs="tinfo ncurses curses termcap termlib" |
| 31 |
- |
| 32 |
- for termcap_lib in $termcap_libs; do |
| 33 |
- AC_CHECK_LIB($termcap_lib, tgetent, TERMCAP_LIB="-l$termcap_lib") |
| 34 |
|
| 35 |
diff --git a/dev-lang/erlang/files/17.0-systemd.patch b/dev-lang/erlang/files/17.0-systemd.patch |
| 36 |
deleted file mode 100644 |
| 37 |
index 2dba8c8..00000000 |
| 38 |
--- a/dev-lang/erlang/files/17.0-systemd.patch |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,85 +0,0 @@ |
| 41 |
---- erts/configure.in 2014-05-08 10:07:18.691087332 +0200 |
| 42 |
-+++ erts/configure.in 2014-05-08 10:12:56.579375822 +0200 |
| 43 |
-@@ -366,6 +366,11 @@ |
| 44 |
- $with_assumed_cache_line_size, |
| 45 |
- [Assumed cache-line size (in bytes)]) |
| 46 |
- |
| 47 |
-+AC_ARG_ENABLE(systemd, |
| 48 |
-+AS_HELP_STRING([--enable-systemd], [enable systemd support in epmd]), |
| 49 |
-+[], |
| 50 |
-+[enable_systemd=no]) |
| 51 |
-+ |
| 52 |
- dnl Magic test for clearcase. |
| 53 |
- OTP_RELEASE= |
| 54 |
- if test "${ERLANG_COMMERCIAL_BUILD}" != ""; then |
| 55 |
-@@ -1042,8 +1047,6 @@ |
| 56 |
- AC_CHECK_LIB(inet, main) |
| 57 |
- AC_CHECK_LIB(util, openpty) |
| 58 |
- |
| 59 |
--AC_CHECK_LIB(systemd-daemon, sd_listen_fds) |
| 60 |
-- |
| 61 |
- dnl Try to find a thread library. |
| 62 |
- dnl |
| 63 |
- dnl ETHR_LIB_NAME, ETHR_LIBS, ETHR_X_LIBS, ETHR_THR_LIB_BASE and ETHR_DEFS |
| 64 |
-@@ -1679,7 +1682,29 @@ |
| 65 |
- #endif |
| 66 |
- ]) |
| 67 |
- |
| 68 |
--AC_CHECK_HEADERS(systemd/sd-daemon.h) |
| 69 |
-+dnl ---------------------------------------------------------------------- |
| 70 |
-+dnl Check the availability of systemd |
| 71 |
-+dnl ---------------------------------------------------------------------- |
| 72 |
-+if test x"$enable_systemd" != x"no"; then |
| 73 |
-+ |
| 74 |
-+systemd_daemon_save_LIBS=$LIBS |
| 75 |
-+LIBS= |
| 76 |
-+AC_SEARCH_LIBS(sd_listen_fds,[systemd systemd-daemon], |
| 77 |
-+ [have_sd_listen_fds=yes],[have_sd_listen_fds=no],$systemd_daemon_save_LIBS) |
| 78 |
-+AC_CHECK_HEADERS(systemd/sd-daemon.h, |
| 79 |
-+ [have_systemd_sd_daemon_h=yes],[have_systemd_sd_daemon_h=no]) |
| 80 |
-+ |
| 81 |
-+if test x"$have_sd_listen_fds" = x"yes" && \ |
| 82 |
-+ test x"$have_systemd_sd_daemon_h" = x"yes"; then |
| 83 |
-+ AC_DEFINE([HAVE_SYSTEMD_DAEMON],[1],[Define if you have systemd daemon]) |
| 84 |
-+ SYSTEMD_DAEMON_LIBS=$LIBS |
| 85 |
-+elif test x"$enable_systemd" = x"yes"; then |
| 86 |
-+ AC_MSG_FAILURE([--enable-systemd was given, but test for systemd failed]) |
| 87 |
-+fi |
| 88 |
-+LIBS=$systemd_daemon_save_LIBS |
| 89 |
-+fi |
| 90 |
-+AC_SUBST(SYSTEMD_DAEMON_LIBS) |
| 91 |
-+ |
| 92 |
- |
| 93 |
- dnl ---------------------------------------------------------------------- |
| 94 |
- dnl Check the availability for libdlpi |
| 95 |
---- erts/epmd/src/Makefile.in 2014-05-08 10:07:58.344182314 +0200 |
| 96 |
-+++ erts/epmd/src/Makefile.in 2014-05-08 10:12:56.580375784 +0200 |
| 97 |
-@@ -84,7 +84,7 @@ |
| 98 |
- ifeq ($(findstring ose,$(TARGET)),ose) |
| 99 |
- LIBS = $(ERTS_INTERNAL_LIBS) @LIBS@ |
| 100 |
- else |
| 101 |
--LIBS = @LIBS@ $(ERTS_INTERNAL_LIBS) |
| 102 |
-+LIBS = @LIBS@ @SYSTEMD_DAEMON_LIBS@ $(ERTS_INTERNAL_LIBS) |
| 103 |
- endif |
| 104 |
- LDFLAGS = @LDFLAGS@ |
| 105 |
- |
| 106 |
---- erts/epmd/src/epmd_srv.c 2014-05-08 10:07:49.137392770 +0200 |
| 107 |
-+++ erts/epmd/src/epmd_srv.c 2014-05-08 10:12:39.777759407 +0200 |
| 108 |
-@@ -213,7 +213,7 @@ |
| 109 |
- node_init(g); |
| 110 |
- g->conn = conn_init(g); |
| 111 |
- |
| 112 |
--#ifdef HAVE_SYSTEMD_SD_DAEMON_H |
| 113 |
-+#ifdef HAVE_SYSTEMD_DAEMON |
| 114 |
- if (g->is_systemd) |
| 115 |
- { |
| 116 |
- int n; |
| 117 |
-@@ -310,7 +310,7 @@ |
| 118 |
- SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport); |
| 119 |
- num_sockets = 1; |
| 120 |
- } |
| 121 |
--#ifdef HAVE_SYSTEMD_SD_DAEMON_H |
| 122 |
-+#ifdef HAVE_SYSTEMD_DAEMON |
| 123 |
- } |
| 124 |
- #endif |
| 125 |
- |
Archives