| 1 |
commit: 56c4cfd704cae6488d0d06b5ab581a98af40dd2b |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 1 21:15:56 2020 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 1 21:15:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56c4cfd7 |
| 7 |
|
| 8 |
www-apps/webmcp: EAPI 7 & respect LDFLAGS |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/726086 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch | 42 ++++++++++++------------- |
| 15 |
www-apps/webmcp/webmcp-1.2.6.ebuild | 19 ++++++----- |
| 16 |
2 files changed, 30 insertions(+), 31 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch |
| 19 |
index 2fa1eb4aff5..3b399fe96ad 100644 |
| 20 |
--- a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch |
| 21 |
+++ b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch |
| 22 |
@@ -1,5 +1,5 @@ |
| 23 |
---- Makefile.old 2013-03-12 21:49:03.976676966 +0100 |
| 24 |
-+++ Makefile 2013-03-12 21:50:02.888103540 +0100 |
| 25 |
+--- a/Makefile 2013-03-12 21:49:03.976676966 +0100 |
| 26 |
++++ b/Makefile 2013-03-12 21:50:02.888103540 +0100 |
| 27 |
@@ -1,11 +1,11 @@ |
| 28 |
include Makefile.options |
| 29 |
|
| 30 |
@@ -34,8 +34,8 @@ |
| 31 |
|
| 32 |
symlinks:: |
| 33 |
ln -s -f ../../libraries/atom/atom.lua framework/lib/ |
| 34 |
---- Makefile.options.old 2015-05-26 21:43:41.354197822 +0200 |
| 35 |
-+++ Makefile.options 2015-05-26 22:01:34.594735786 +0200 |
| 36 |
+--- a/Makefile.options 2015-05-26 21:43:41.354197822 +0200 |
| 37 |
++++ b/Makefile.options 2015-05-26 22:01:34.594735786 +0200 |
| 38 |
@@ -14,13 +14,13 @@ |
| 39 |
# C compiler flags |
| 40 |
# TODO: check alternatives to -D_GNU_SOURCE -fPIC |
| 41 |
@@ -49,13 +49,13 @@ |
| 42 |
|
| 43 |
# linker flags |
| 44 |
-LDFLAGS = -shared -L /usr/lib -L /usr/local/lib |
| 45 |
-+LDFLAGS = -shared |
| 46 |
++LDFLAGS = -shared $(MYLDFLAGS) |
| 47 |
|
| 48 |
# additional linker flags for parts which depend on PostgreSQL |
| 49 |
-LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql |
| 50 |
+LDFLAGS_PGSQL = |
| 51 |
---- libraries/extos/Makefile.old 2013-03-13 21:49:19.710360750 +0100 |
| 52 |
-+++ libraries/extos/Makefile 2013-03-13 21:49:47.778096460 +0100 |
| 53 |
+--- a/libraries/extos/Makefile 2013-03-13 21:49:19.710360750 +0100 |
| 54 |
++++ b/libraries/extos/Makefile 2013-03-13 21:49:47.778096460 +0100 |
| 55 |
@@ -1,7 +1,7 @@ |
| 56 |
include ../../Makefile.options |
| 57 |
|
| 58 |
@@ -65,8 +65,8 @@ |
| 59 |
|
| 60 |
extos.o: extos.c |
| 61 |
$(CC) -c $(CFLAGS) -o extos.o extos.c |
| 62 |
---- libraries/mondelefant/Makefile.old 2013-03-13 21:52:54.884250479 +0100 |
| 63 |
-+++ libraries/mondelefant/Makefile 2013-03-13 21:53:27.511932686 +0100 |
| 64 |
+--- a/libraries/mondelefant/Makefile 2013-03-13 21:52:54.884250479 +0100 |
| 65 |
++++ b/libraries/mondelefant/Makefile 2013-03-13 21:53:27.511932686 +0100 |
| 66 |
@@ -1,7 +1,7 @@ |
| 67 |
include ../../Makefile.options |
| 68 |
|
| 69 |
@@ -76,8 +76,8 @@ |
| 70 |
|
| 71 |
mondelefant_native.o: mondelefant_native.c |
| 72 |
$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c |
| 73 |
---- libraries/multirand/Makefile.old 2013-03-13 21:54:29.399328173 +0100 |
| 74 |
-+++ libraries/multirand/Makefile 2013-03-13 21:54:58.019048434 +0100 |
| 75 |
+--- a/libraries/multirand/Makefile 2013-03-13 21:54:29.399328173 +0100 |
| 76 |
++++ b/libraries/multirand/Makefile 2013-03-13 21:54:58.019048434 +0100 |
| 77 |
@@ -1,7 +1,7 @@ |
| 78 |
include ../../Makefile.options |
| 79 |
|
| 80 |
@@ -87,8 +87,8 @@ |
| 81 |
|
| 82 |
multirand.o: multirand.c |
| 83 |
$(CC) -c $(CFLAGS) -o multirand.o multirand.c |
| 84 |
---- libraries/extos/extos.c.old 2013-04-05 23:19:52.028115226 +0200 |
| 85 |
-+++ libraries/extos/extos.c 2013-04-05 23:20:14.819896253 +0200 |
| 86 |
+--- a/libraries/extos/extos.c 2013-04-05 23:19:52.028115226 +0200 |
| 87 |
++++ b/libraries/extos/extos.c 2013-04-05 23:20:14.819896253 +0200 |
| 88 |
@@ -12,6 +12,7 @@ |
| 89 |
#include <fcntl.h> |
| 90 |
#include <poll.h> |
| 91 |
@@ -97,8 +97,8 @@ |
| 92 |
|
| 93 |
#define EXTOS_MAX_ERRLEN 80 |
| 94 |
#define EXTOS_EXEC_MAX_ARGS 64 |
| 95 |
---- framework/accelerator/Makefile.old 2014-06-21 20:15:21.019918183 +0200 |
| 96 |
-+++ framework/accelerator/Makefile 2014-06-21 20:15:44.700471794 +0200 |
| 97 |
+--- a/framework/accelerator/Makefile 2014-06-21 20:15:21.019918183 +0200 |
| 98 |
++++ b/framework/accelerator/Makefile 2014-06-21 20:15:44.700471794 +0200 |
| 99 |
@@ -4,7 +4,7 @@ |
| 100 |
$(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o |
| 101 |
|
| 102 |
@@ -108,8 +108,8 @@ |
| 103 |
|
| 104 |
clean:: |
| 105 |
rm -f webmcp_accelerator.so webmcp_accelerator.o |
| 106 |
---- libraries/extos/Makefile.old 2014-06-21 20:18:25.594611956 +0200 |
| 107 |
-+++ libraries/extos/Makefile 2014-06-21 20:18:50.457183029 +0200 |
| 108 |
+--- a/libraries/extos/Makefile 2014-06-21 20:18:25.594611956 +0200 |
| 109 |
++++ b/libraries/extos/Makefile 2014-06-21 20:18:50.457183029 +0200 |
| 110 |
@@ -4,7 +4,7 @@ |
| 111 |
$(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua |
| 112 |
|
| 113 |
@@ -119,8 +119,8 @@ |
| 114 |
|
| 115 |
clean:: |
| 116 |
rm -f extos.so extos.o |
| 117 |
---- libraries/mondelefant/Makefile.old 2014-06-21 20:19:58.218962359 +0200 |
| 118 |
-+++ libraries/mondelefant/Makefile 2014-06-21 20:20:24.527476578 +0200 |
| 119 |
+--- a/libraries/mondelefant/Makefile 2014-06-21 20:19:58.218962359 +0200 |
| 120 |
++++ b/libraries/mondelefant/Makefile 2014-06-21 20:20:24.527476578 +0200 |
| 121 |
@@ -4,7 +4,7 @@ |
| 122 |
$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua |
| 123 |
|
| 124 |
@@ -130,8 +130,8 @@ |
| 125 |
|
| 126 |
test:: mondelefant_native.so mondelefant.lua |
| 127 |
lua -l mondelefant |
| 128 |
---- libraries/multirand/Makefile.old 2014-06-21 20:21:36.950197127 +0200 |
| 129 |
-+++ libraries/multirand/Makefile 2014-06-21 20:22:04.967703944 +0200 |
| 130 |
+--- a/libraries/multirand/Makefile 2014-06-21 20:21:36.950197127 +0200 |
| 131 |
++++ b/libraries/multirand/Makefile 2014-06-21 20:22:04.967703944 +0200 |
| 132 |
@@ -4,7 +4,7 @@ |
| 133 |
$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua |
| 134 |
|
| 135 |
|
| 136 |
diff --git a/www-apps/webmcp/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6.ebuild |
| 137 |
index 8442fcfc0a2..a156ac3bbf9 100644 |
| 138 |
--- a/www-apps/webmcp/webmcp-1.2.6.ebuild |
| 139 |
+++ b/www-apps/webmcp/webmcp-1.2.6.ebuild |
| 140 |
@@ -1,9 +1,9 @@ |
| 141 |
-# Copyright 1999-2015 Gentoo Foundation |
| 142 |
+# Copyright 1999-2020 Gentoo Authors |
| 143 |
# Distributed under the terms of the GNU General Public License v2 |
| 144 |
|
| 145 |
-EAPI=4 |
| 146 |
+EAPI=7 |
| 147 |
|
| 148 |
-inherit eutils toolchain-funcs |
| 149 |
+inherit toolchain-funcs |
| 150 |
|
| 151 |
MY_P=${PN}-v${PV} |
| 152 |
DESCRIPTION="Web application framework written in Lua and C" |
| 153 |
@@ -15,18 +15,16 @@ KEYWORDS="~amd64" |
| 154 |
SLOT=0 |
| 155 |
IUSE="" |
| 156 |
|
| 157 |
-RDEPEND="dev-lang/lua |
| 158 |
- dev-db/postgresql" |
| 159 |
+RDEPEND="dev-lang/lua:= |
| 160 |
+ dev-db/postgresql:=" |
| 161 |
DEPEND="${RDEPEND}" |
| 162 |
|
| 163 |
S="${WORKDIR}"/${MY_P} |
| 164 |
|
| 165 |
-src_prepare() { |
| 166 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
| 167 |
-} |
| 168 |
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 169 |
|
| 170 |
src_compile() { |
| 171 |
- emake CC=$(tc-getCC) LD=$(tc-getCC) |
| 172 |
+ emake CC=$(tc-getCC) LD=$(tc-getCC) MYLDFLAGS="${LDFLAGS}" |
| 173 |
# Dereference symlinks |
| 174 |
cd framework |
| 175 |
mkdir lib.link |
| 176 |
@@ -61,5 +59,6 @@ src_install() { |
| 177 |
doins -r demo-app${subdir} |
| 178 |
done |
| 179 |
dodoc doc/*sample.conf libraries/mondelefant/example.lua |
| 180 |
- dohtml doc/autodoc.html |
| 181 |
+ docinto html |
| 182 |
+ dodoc doc/autodoc.html |
| 183 |
} |
Archives