1 |
commit: 7070a6dc14c2adb697e05dbe898da461729916b0 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 1 16:47:27 2018 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 1 16:47:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7070a6dc |
7 |
|
8 |
dev-perl/Ace: Fixes for bugs #637102 and #637330 |
9 |
|
10 |
- Use toolchain-funcs for Darwin support ( #637102 ) |
11 |
- Fix 'non-void function should return a value' ( #637330 ) |
12 |
- Migrate sed patches to git-am patches where possible |
13 |
|
14 |
Closes: https://bugs.gentoo.org/637330 |
15 |
Bug: https://bugs.gentoo.org/637102 |
16 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
17 |
|
18 |
dev-perl/Ace/Ace-1.920.0-r3.ebuild | 12 ++++++----- |
19 |
dev-perl/Ace/files/Ace-1.92-gcc-nonvoid.patch | 31 +++++++++++++++++++++++++++ |
20 |
dev-perl/Ace/files/Ace-1.92-glibc26.patch | 29 +++++++++++++++++++++++++ |
21 |
dev-perl/Ace/files/Ace-1.92-rpcxs.patch | 25 +++++++++++++++++++++ |
22 |
4 files changed, 92 insertions(+), 5 deletions(-) |
23 |
|
24 |
diff --git a/dev-perl/Ace/Ace-1.920.0-r3.ebuild b/dev-perl/Ace/Ace-1.920.0-r3.ebuild |
25 |
index c8263c2086b..e46cfba0c5e 100644 |
26 |
--- a/dev-perl/Ace/Ace-1.920.0-r3.ebuild |
27 |
+++ b/dev-perl/Ace/Ace-1.920.0-r3.ebuild |
28 |
@@ -7,7 +7,7 @@ DIST_NAME=AcePerl |
29 |
DIST_AUTHOR=LDS |
30 |
DIST_VERSION=1.92 |
31 |
DIST_EXAMPLES=("examples/*") |
32 |
-inherit perl-module |
33 |
+inherit perl-module toolchain-funcs |
34 |
|
35 |
DESCRIPTION="Object-Oriented Access to ACEDB Databases" |
36 |
|
37 |
@@ -23,18 +23,20 @@ RDEPEND="virtual/perl-Digest-MD5 |
38 |
DEPEND="${RDEPEND}" |
39 |
|
40 |
src_prepare() { |
41 |
- sed -i 's/", "1")/", "3")/' "${S}/Makefile.PL" || die "Can't patch config" |
42 |
+ eapply "${FILESDIR}/${PN}-1.92-rpcxs.patch" |
43 |
+ eapply "${FILESDIR}/${PN}-1.92-gcc-nonvoid.patch" |
44 |
+ |
45 |
cat > "${S}/acelib/wmake/DARWIN_DEF" <<EOF |
46 |
NAME = DARWIN |
47 |
-COMPILER = clang -fwritable-strings -DACEDB4 -DPOSIX |
48 |
-LINKER = clang |
49 |
+COMPILER = $(tc-getCC) -fwritable-strings -DACEDB4 -DPOSIX |
50 |
+LINKER = $(tc-getLD) |
51 |
|
52 |
LIBS = -lm |
53 |
|
54 |
EOF |
55 |
|
56 |
if use elibc_glibc ; then |
57 |
- sed -i -e 's:^USEROPTS=:USEROPTS=-I/usr/include/tirpc :g' -e 's:^LIBS =:LIBS = -ltirpc:g' "${S}/acelib/wmake/LINUX_DEF" |
58 |
+ eapply "${FILESDIR}/${PN}-1.92-glibc26.patch" |
59 |
export LIBS="-ltirpc" |
60 |
fi |
61 |
|
62 |
|
63 |
diff --git a/dev-perl/Ace/files/Ace-1.92-gcc-nonvoid.patch b/dev-perl/Ace/files/Ace-1.92-gcc-nonvoid.patch |
64 |
new file mode 100644 |
65 |
index 00000000000..78c0572ed6f |
66 |
--- /dev/null |
67 |
+++ b/dev-perl/Ace/files/Ace-1.92-gcc-nonvoid.patch |
68 |
@@ -0,0 +1,31 @@ |
69 |
+From c36659030eab65bcf7017e099377bf87a04d1667 Mon Sep 17 00:00:00 2001 |
70 |
+From: Anton Molyboha <anton.stay.connected@×××××.com> |
71 |
+Date: Fri, 10 Nov 2017 17:37:54 -0500 |
72 |
+Subject: Fix compile with newer gcc "non-void function 'constant' should ..." |
73 |
+ |
74 |
+Bug: https://bugs.gentoo.org/637330 |
75 |
+Bug: https://rt.cpan.org/Ticket/Display.html?id=123593 |
76 |
+--- |
77 |
+ RPC/RPC.xs | 6 ------ |
78 |
+ 1 file changed, 6 deletions(-) |
79 |
+ |
80 |
+diff --git a/RPC/RPC.xs b/RPC/RPC.xs |
81 |
+index 3e059c0..cd4f6fa 100644 |
82 |
+--- a/RPC/RPC.xs |
83 |
++++ b/RPC/RPC.xs |
84 |
+@@ -152,12 +152,6 @@ int arg; |
85 |
+ case 'Z': |
86 |
+ break; |
87 |
+ case '_': |
88 |
+- if (strEQ(name, "_ACECLIENT_")) |
89 |
+-#ifdef _ACECLIENT_ |
90 |
+- return _ACECLIENT_; |
91 |
+-#else |
92 |
+- goto not_there; |
93 |
+-#endif |
94 |
+ break; |
95 |
+ } |
96 |
+ errno = EINVAL; |
97 |
+-- |
98 |
+2.16.2 |
99 |
+ |
100 |
|
101 |
diff --git a/dev-perl/Ace/files/Ace-1.92-glibc26.patch b/dev-perl/Ace/files/Ace-1.92-glibc26.patch |
102 |
new file mode 100644 |
103 |
index 00000000000..93913485b2f |
104 |
--- /dev/null |
105 |
+++ b/dev-perl/Ace/files/Ace-1.92-glibc26.patch |
106 |
@@ -0,0 +1,29 @@ |
107 |
+From 79cbe4803f73eab5474e709b20ed570a44071182 Mon Sep 17 00:00:00 2001 |
108 |
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@g.o> |
109 |
+Date: Sat, 31 Mar 2018 08:12:32 +1300 |
110 |
+Subject: Fix building with GlibC 2.26 |
111 |
+ |
112 |
+Bug: https://bugs.gentoo.org/637114 |
113 |
+--- |
114 |
+ acelib/wmake/LINUX_DEF | 4 ++-- |
115 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
116 |
+ |
117 |
+diff --git a/acelib/wmake/LINUX_DEF b/acelib/wmake/LINUX_DEF |
118 |
+index ba96774..bd89334 100644 |
119 |
+--- a/acelib/wmake/LINUX_DEF |
120 |
++++ b/acelib/wmake/LINUX_DEF |
121 |
+@@ -18,9 +18,9 @@ |
122 |
+ NAME = LINUX |
123 |
+ COMPILER = gcc -g -Wall -O2 -DACEDB4 |
124 |
+ LINKER = gcc -g |
125 |
+-USEROPTS=-fPIC |
126 |
++USEROPTS=-I/usr/include/tirpc -fPIC |
127 |
+ |
128 |
+-LIBS = -lm |
129 |
++LIBS = -ltirpc -lm |
130 |
+ Xt_LIBS = -L/usr/X11R6/lib -lXaw -lXt -lXmu -lXext -lX11 |
131 |
+ LEX_LIBS = |
132 |
+ |
133 |
+-- |
134 |
+2.16.2 |
135 |
+ |
136 |
|
137 |
diff --git a/dev-perl/Ace/files/Ace-1.92-rpcxs.patch b/dev-perl/Ace/files/Ace-1.92-rpcxs.patch |
138 |
new file mode 100644 |
139 |
index 00000000000..be67f6fe116 |
140 |
--- /dev/null |
141 |
+++ b/dev-perl/Ace/files/Ace-1.92-rpcxs.patch |
142 |
@@ -0,0 +1,25 @@ |
143 |
+From f44e3b39758057e3a5af7654768d40de2b249ae5 Mon Sep 17 00:00:00 2001 |
144 |
+From: Kent Fredric <kentnl@g.o> |
145 |
+Date: Fri, 13 Oct 2017 17:30:57 +1300 |
146 |
+Subject: Enable RPC and XS support |
147 |
+ |
148 |
+--- |
149 |
+ Makefile.PL | 2 +- |
150 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
151 |
+ |
152 |
+diff --git a/Makefile.PL b/Makefile.PL |
153 |
+index 232bc42..7a312fd 100644 |
154 |
+--- a/Makefile.PL |
155 |
++++ b/Makefile.PL |
156 |
+@@ -10,7 +10,7 @@ while (!$choice) { |
157 |
+ " 1) Interface to Ace socket server and local databases (pure Perl)\n" . |
158 |
+ " 2) The above plus XS optimizations (requires C compiler)\n" . |
159 |
+ " 3) The above plus RPC server interface (requires C compiler)\n\n" . |
160 |
+- "Enter your choice: ", "1"); |
161 |
++ "Enter your choice: ", "3"); |
162 |
+ if ($reply =~ /(\d+)/) { |
163 |
+ $choice = $1; |
164 |
+ die "invalid choice: $choice!" if $choice < 1 || $choice > 3; |
165 |
+-- |
166 |
+2.16.2 |
167 |
+ |