From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/
Date: Thu, 20 Aug 2020 06:36:53 +0000 (UTC) [thread overview]
Message-ID: <1597905369.ba67378034a0e8c36e0b6af7cbf9f63d3b82c5be.slyfox@gentoo> (raw)
commit: ba67378034a0e8c36e0b6af7cbf9f63d3b82c5be
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 19 17:38:01 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 06:36:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba673780
dev-lang/erlang: remove unused patches
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17172
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/erlang-20.3.2-dont-ignore-LDFLAGS.patch | 42 ----------
...ang-add-epmd-pid-file-creation-for-openrc.patch | 90 ----------------------
dev-lang/erlang/files/erlang-custom-autoconf.patch | 14 ----
3 files changed, 146 deletions(-)
diff --git a/dev-lang/erlang/files/erlang-20.3.2-dont-ignore-LDFLAGS.patch b/dev-lang/erlang/files/erlang-20.3.2-dont-ignore-LDFLAGS.patch
deleted file mode 100644
index 32dd89e0d6c..00000000000
--- a/dev-lang/erlang/files/erlang-20.3.2-dont-ignore-LDFLAGS.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 69043168302ec7c0bcfaa8b1fb56bfae500bd139 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <commendsarnex@gmail.com>
-Date: Sun, 8 Apr 2018 16:11:55 -0400
-Subject: [PATCH] Don't ignore LDFLAGS
-
-Bug: https://bugs.gentoo.org/263129
-
-Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
----
- lib/megaco/src/flex/Makefile.in | 2 +-
- lib/odbc/c_src/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index c37ad4d702..400024ca0c 100644
---- a/lib/megaco/src/flex/Makefile.in
-+++ b/lib/megaco/src/flex/Makefile.in
-@@ -66,7 +66,7 @@ endif
- CC = $(DED_CC)
- CFLAGS_MT = $(CFLAGS) $(DED_THR_DEFS)
- LD = $(DED_LD)
--LDFLAGS = $(DED_LDFLAGS)
-+LDFLAGS += $(DED_LDFLAGS)
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- PERL = @PERL@
-diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index 784e73c47e..51c023f710 100644
---- a/lib/odbc/c_src/Makefile.in
-+++ b/lib/odbc/c_src/Makefile.in
-@@ -82,7 +82,7 @@ CC = @CC@
- CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@
- EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET)
- LD = @LD@
--LDFLAGS = $(ODBC_LIB) $(EI_LDFLAGS)
-+LDFLAGS += $(ODBC_LIB) $(EI_LDFLAGS)
- LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB)
- INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE)
- TARGET_FLAGS = @TARGET_FLAGS@
---
-2.17.0
-
diff --git a/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch b/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch
deleted file mode 100644
index 56e3946c93f..00000000000
--- a/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 04ace92c33a699f75445dc99c30d521311aba826 Mon Sep 17 00:00:00 2001
-From: Steve Arnold <nerdboy@gentoo.org>
-Date: Mon, 6 Aug 2018 16:38:30 -0700
-Subject: [PATCH] Add daemon-mode pid file creation when not configured for
- systemd
-
-Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
----
- erts/epmd/src/epmd.c | 39 ++++++++++++++++++++++++++++++++++++++-
- erts/epmd/src/epmd.h | 3 +++
- 2 files changed, 41 insertions(+), 1 deletion(-)
-
-diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
-index 44e997e609..c74888a1ee 100644
---- a/erts/epmd/src/epmd.c
-+++ b/erts/epmd/src/epmd.c
-@@ -40,6 +40,37 @@ static int check_relaxed(void);
- #ifdef __WIN32__
- static int has_console(void);
- #endif
-+#ifndef HAVE_SYSTEMD_DAEMON
-+static int create_pidfile(void);
-+static const char *pidfile = EPMD_PIDFILE;
-+#endif
-+
-+#ifndef HAVE_SYSTEMD_DAEMON
-+static int create_pidfile(void)
-+{
-+ int fd;
-+
-+ unlink(pidfile);
-+
-+ /* open the pidfile */
-+ fd = open(pidfile, O_WRONLY|O_CREAT|O_EXCL, 0644);
-+ if (fd >= 0) {
-+ FILE *f;
-+
-+ /* write our pid to it */
-+ f = fdopen(fd, "w");
-+ if (f != NULL) {
-+ fprintf(f, "%d\n", getpid());
-+ fclose(f);
-+ /* leave the fd open */
-+ return 0;
-+ }
-+ close(fd);
-+ }
-+
-+ return -1;
-+}
-+#endif /* (no) HAVE_SYSTEMD_DAEMON */
-
- #ifdef DONT_USE_MAIN
-
-@@ -340,6 +371,13 @@ static void run_daemon(EpmdVars *g)
-
- umask(0);
-
-+#ifndef HAVE_SYSTEMD_DAEMON
-+ if (create_pidfile() < 0) {
-+ dbg_perror(g,"could not create pidfile %s", pidfile);
-+ epmd_cleanup_exit(g,1);
-+ }
-+#endif /* HAVE_SYSTEMD_DAEMON */
-+
- for (fd = 0; fd < g->max_conn ; fd++) /* close all files ... */
- close(fd);
- /* Syslog on linux will try to write to whatever if we dont
-@@ -614,4 +652,3 @@ static int check_relaxed(void)
- char* port_str = getenv("ERL_EPMD_RELAXED_COMMAND_CHECK");
- return (port_str != NULL) ? 1 : 0;
- }
--
-diff --git a/erts/epmd/src/epmd.h b/erts/epmd/src/epmd.h
-index cffcd4ae7a..e53322acf5 100644
---- a/erts/epmd/src/epmd.h
-+++ b/erts/epmd/src/epmd.h
-@@ -20,6 +20,9 @@
-
- /* The port number is defined in a makefile */
-
-+/* The name and path to the pid file */
-+#define EPMD_PIDFILE "/var/run/epmd.pid"
-+
- /* Definitions of message codes */
-
- /* Registration and queries */
---
-2.17.0
-
diff --git a/dev-lang/erlang/files/erlang-custom-autoconf.patch b/dev-lang/erlang/files/erlang-custom-autoconf.patch
deleted file mode 100644
index 5ae7b43ba28..00000000000
--- a/dev-lang/erlang/files/erlang-custom-autoconf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur otp-OTP-21.0.5.orig/otp_build otp-OTP-21.0.5/otp_build
---- otp-OTP-21.0.5.orig/otp_build 2018-08-10 19:02:51.000000000 +0200
-+++ otp-OTP-21.0.5/otp_build 2018-08-15 23:44:59.417191209 +0200
-@@ -1343,7 +1343,9 @@
- do_lazy_configure "$@";
- do_boot;;
- autoconf)
-- do_autoconf;;
-+ create_lib_configure_in
-+ distribute_config_helpers
-+ ;;
- configure)
- shift;
- do_configure "$@";;
next reply other threads:[~2020-08-20 6:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 6:36 Sergei Trofimovich [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-15 22:04 [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/ Conrad Kostecki
2022-12-16 20:38 Matthew Smith
2022-09-12 18:17 Matthew Smith
2021-02-27 15:38 Conrad Kostecki
2020-05-26 22:56 Sergei Trofimovich
2020-04-18 21:31 Sergei Trofimovich
2019-09-18 12:44 Hans de Graaff
2019-07-17 22:04 Zac Medico
2019-06-17 20:08 Ulrich Müller
2017-09-02 14:46 Michael Palimaka
2016-08-30 14:54 Göktürk Yüksek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1597905369.ba67378034a0e8c36e0b6af7cbf9f63d3b82c5be.slyfox@gentoo \
--to=slyfox@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox