1 |
commit: b64dfb87139e61279882f7a0c1d498bcdaf88919 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 30 14:26:43 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 30 14:26:43 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64dfb87 |
7 |
|
8 |
dev-db/qdbm: fix build |
9 |
|
10 |
Gentoo-Bug: 584998 |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
|
14 |
dev-db/qdbm/files/qdbm-configure.patch | 108 +++++++++++++++++++++++++++++++++ |
15 |
dev-db/qdbm/qdbm-1.8.78-r1.ebuild | 14 ++++- |
16 |
2 files changed, 121 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/dev-db/qdbm/files/qdbm-configure.patch b/dev-db/qdbm/files/qdbm-configure.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..364c5c9f653 |
21 |
--- /dev/null |
22 |
+++ b/dev-db/qdbm/files/qdbm-configure.patch |
23 |
@@ -0,0 +1,108 @@ |
24 |
+--- a/cgi/configure.in |
25 |
++++ b/cgi/configure.in |
26 |
+@@ -13,15 +13,6 @@ |
27 |
+ # Export variables |
28 |
+ TARGETS="all" |
29 |
+ |
30 |
+-# Building paths |
31 |
+-pathtmp="$PATH" |
32 |
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" |
33 |
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" |
34 |
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" |
35 |
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" |
36 |
+-CPATH="$HOME/include:/usr/local/include:$CPATH" |
37 |
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH |
38 |
+- |
39 |
+ |
40 |
+ |
41 |
+ #================================================================ |
42 |
+--- a/configure.in |
43 |
++++ b/configure.in |
44 |
+@@ -20,15 +20,6 @@ |
45 |
+ LD="ld" |
46 |
+ AR="ar" |
47 |
+ |
48 |
+-# Building paths |
49 |
+-pathtmp="$PATH" |
50 |
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" |
51 |
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" |
52 |
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" |
53 |
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" |
54 |
+-CPATH="$HOME/include:/usr/local/include:$CPATH" |
55 |
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH |
56 |
+- |
57 |
+ |
58 |
+ |
59 |
+ #================================================================ |
60 |
+--- a/java/configure.in |
61 |
++++ b/java/configure.in |
62 |
+@@ -25,15 +25,6 @@ |
63 |
+ MYOPTS="" |
64 |
+ LD="ld" |
65 |
+ |
66 |
+-# Building paths |
67 |
+-pathtmp="$PATH" |
68 |
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" |
69 |
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" |
70 |
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" |
71 |
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" |
72 |
+-CPATH="$HOME/include:/usr/local/include:$CPATH" |
73 |
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH |
74 |
+- |
75 |
+ |
76 |
+ |
77 |
+ #================================================================ |
78 |
+--- a/perl/configure.in |
79 |
++++ b/perl/configure.in |
80 |
+@@ -5,15 +5,6 @@ |
81 |
+ # Targets |
82 |
+ AC_INIT(qdbm-perl, 1.0.0) |
83 |
+ |
84 |
+-# Building paths |
85 |
+-pathtmp="$PATH" |
86 |
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" |
87 |
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" |
88 |
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" |
89 |
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" |
90 |
+-CPATH="$HOME/include:/usr/local/include:$CPATH" |
91 |
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH |
92 |
+- |
93 |
+ # Setting the default prefix |
94 |
+ if test "$prefix" = NONE |
95 |
+ then |
96 |
+--- a/plus/configure.in |
97 |
++++ b/plus/configure.in |
98 |
+@@ -19,15 +19,6 @@ |
99 |
+ LD="ld" |
100 |
+ AR="ar" |
101 |
+ |
102 |
+-# Building paths |
103 |
+-pathtmp="$PATH" |
104 |
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" |
105 |
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" |
106 |
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" |
107 |
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" |
108 |
+-CPATH="$HOME/include:/usr/local/include:$CPATH" |
109 |
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH |
110 |
+- |
111 |
+ |
112 |
+ |
113 |
+ #================================================================ |
114 |
+--- a/ruby/configure.in |
115 |
++++ b/ruby/configure.in |
116 |
+@@ -5,15 +5,6 @@ |
117 |
+ # Targets |
118 |
+ AC_INIT(qdbm-ruby, 1.0.0) |
119 |
+ |
120 |
+-# Building paths |
121 |
+-pathtmp="$PATH" |
122 |
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" |
123 |
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" |
124 |
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" |
125 |
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" |
126 |
+-CPATH="$HOME/include:/usr/local/include:$CPATH" |
127 |
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH |
128 |
+- |
129 |
+ # Setting the default prefix |
130 |
+ if test "$prefix" = NONE |
131 |
+ then |
132 |
|
133 |
diff --git a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild |
134 |
index 6f6bd6fc00d..cbde7564d40 100644 |
135 |
--- a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild |
136 |
+++ b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild |
137 |
@@ -3,7 +3,7 @@ |
138 |
|
139 |
EAPI="6" |
140 |
|
141 |
-inherit java-pkg-opt-2 perl-functions |
142 |
+inherit autotools java-pkg-opt-2 perl-functions |
143 |
|
144 |
DESCRIPTION="Quick Database Manager" |
145 |
HOMEPAGE="http://fallabs.com/qdbm/" |
146 |
@@ -24,12 +24,15 @@ DEPEND="${RDEPEND} |
147 |
java? ( >=virtual/jdk-1.4:* )" |
148 |
|
149 |
PATCHES=( |
150 |
+ "${FILESDIR}"/${PN}-configure.patch |
151 |
"${FILESDIR}"/${PN}-perl.patch |
152 |
"${FILESDIR}"/${PN}-ruby19.patch |
153 |
"${FILESDIR}"/${PN}-runpath.patch |
154 |
) |
155 |
HTML_DOCS=( doc/. ) |
156 |
|
157 |
+AT_NOELIBTOOLIZE="yes" |
158 |
+ |
159 |
qdbm_foreach_api() { |
160 |
local u |
161 |
for u in cxx java perl ruby; do |
162 |
@@ -42,6 +45,10 @@ qdbm_foreach_api() { |
163 |
fi |
164 |
cd "${u}" |
165 |
case "${EBUILD_PHASE}" in |
166 |
+ prepare) |
167 |
+ mv configure.{in,ac} |
168 |
+ eautoreconf |
169 |
+ ;; |
170 |
configure) |
171 |
case "${u}" in |
172 |
cgi|java|plus) |
173 |
@@ -75,8 +82,13 @@ src_prepare() { |
174 |
-e "/^CXXFLAGS/s|$| ${CXXFLAGS}|" \ |
175 |
-e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \ |
176 |
-e 's/make\( \|$\)/$(MAKE)\1/g' \ |
177 |
+ -e '/^debug/,/^$/s/LDFLAGS="[^"]*" //' \ |
178 |
Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in |
179 |
find -name "*~" -delete |
180 |
+ |
181 |
+ mv configure.{in,ac} |
182 |
+ eautoreconf |
183 |
+ qdbm_foreach_api |
184 |
} |
185 |
|
186 |
src_configure() { |