Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Aaron Swenson <titanofold@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/, dev-db/pgpool2/files/
Date: Fri, 03 Aug 2018 13:27:14
Message-Id: 1533302811.079ff486c23fdb326e5d58df1433b854ca900e94.titanofold@gentoo
1 commit: 079ff486c23fdb326e5d58df1433b854ca900e94
2 Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 3 13:26:51 2018 +0000
4 Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 3 13:26:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079ff486
7
8 dev-db/pgpool2: Bump to 3.7.5
9
10 Add a couple patches to fix a few options in
11 configure.ac. --without-pam no longer acts as if --with-pam was
12 given. Now uses pkg-config to get any special settings for
13 libmemcached rather than using fixed sub-directories
14 (${user_provided_path}/{include,lib,…}). Lastly, introduced AX_PTHREAD
15 to link in the appropriate threading library to fix bug 616302.
16
17 If libmemcached was built with USE=sasl which builds against
18 cyrus-sasl. cyrus-sasl builds against a threading library which
19 necessitates including the same threading in pgpool2 despite pgpool2
20 not being a threaded program.
21
22 pgpool2 is now able to build against LibreSSL as well as OpenSSL. The
23 ebuild now reflects this fact
24
25 Bug: https://bugs.gentoo.org/616302
26 Bug: https://bugs.gentoo.org/646888
27 Package-Manager: Portage-2.3.40, Repoman-2.3.9
28
29 dev-db/pgpool2/Manifest | 1 +
30 .../pgpool2/files/pgpool-configure-memcached.patch | 64 ++++++++++++++++++++++
31 dev-db/pgpool2/files/pgpool-configure-pam.patch | 25 +++++++++
32 .../pgpool2/files/pgpool-configure-pthread.patch | 13 +++++
33 dev-db/pgpool2/files/pgpool2.initd | 14 ++---
34 .../{pgpool2-9999.ebuild => pgpool2-3.7.5.ebuild} | 45 ++++++++-------
35 dev-db/pgpool2/pgpool2-9999.ebuild | 42 ++++++++------
36 ...gpool2-9999.ebuild => pgpool2-9999.ebuild.orig} | 35 +++++++-----
37 8 files changed, 182 insertions(+), 57 deletions(-)
38
39 diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
40 index e81a23c8628..120a39ebe5b 100644
41 --- a/dev-db/pgpool2/Manifest
42 +++ b/dev-db/pgpool2/Manifest
43 @@ -1,3 +1,4 @@
44 DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
45 DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac SHA512 2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef
46 DIST pgpool-II-3.7.3.tar.gz 3259752 BLAKE2B 398257b2a647039a634d52b0e23ab1584aaa67f58d6f234f03bf2e99380b346b4ff51647f876d0789c484e88fc149a2af5a5b1b8fd3aa48323aada064ea3421d SHA512 c7fea570f11dfc348b0099fde074f61a15e6979b6f16526d24d73b26d723edfdbadbcf10e90c2111aeb72599970718d3cda4abed3e99e8a711cf03b715c29624
47 +DIST pgpool-II-3.7.5.tar.gz 3276279 BLAKE2B d9c52684985e0a74ef115792f79a71305fbcc5f44663971e5fee41d543c7c290999091c387f5da6c73c88466880a24b21d469046de7981983d9984a606ae357e SHA512 4840047f11b5e176803c03073d1ef6ef54f9d0be3d9bd622fedc9fd0ad4f835090fbf671bfd71cda0d994af6ea9a1658b0d5e5d09ec317b345c41fb0fa4b7b70
48
49 diff --git a/dev-db/pgpool2/files/pgpool-configure-memcached.patch b/dev-db/pgpool2/files/pgpool-configure-memcached.patch
50 new file mode 100644
51 index 00000000000..7b983dba02e
52 --- /dev/null
53 +++ b/dev-db/pgpool2/files/pgpool-configure-memcached.patch
54 @@ -0,0 +1,64 @@
55 +--- a/configure.ac
56 ++++ b/configure.ac
57 +@@ -338,37 +338,24 @@
58 + [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
59 + fi
60 +
61 +-AC_ARG_WITH(memcached,
62 +- [ --with-memcached=DIR site header files for libmemcached in DIR],
63 +- [
64 +- case "$withval" in
65 +- "" | y | ye | yes | n | no)
66 +- AC_MSG_ERROR([*** You must supply an argument to the --with-memcached option.])
67 +- ;;
68 +- *)
69 +-
70 +- MEMCACHED_INCLUDE_DIR="$withval"/include
71 +- MEMCACHED_LIB_DIR="$withval"/lib
72 +- OLD_CFLAGS="$CFLAGS"
73 +- CFLAGS="$CFLAGS -I$MEMCACHED_INCLUDE_DIR"
74 +- AC_CHECK_HEADERS(
75 +- [libmemcached/memcached.h],
76 +- [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])],
77 +- [AC_MSG_ERROR([header file <libmemcached/memcached.h> is required for memcached support])])
78 +- CFLAGS=$OLD_CFLAGS
79 +- AC_CHECK_LIB(memcached, memcached_create, [], [AC_MSG_ERROR(libmemcached is not installed)])
80 +- MEMCACHED_INCLUDE_OPT="-I $MEMCACHED_INCLUDE_DIR"
81 +- MEMCACHED_LINK_OPT="-L$MEMCACHED_LIB_DIR"
82 +- MEMCACHED_RPATH_OPT="-rpath $MEMCACHED_LIB_DIR"
83 +- ;;
84 +- esac
85 +- ])
86 ++AC_ARG_WITH([memcached],
87 ++ AS_HELP_STRING([--with-memcached], [Build with memcached support]))
88 +
89 +-CFLAGS="$CFLAGS -fno-strict-aliasing"
90 ++AS_IF([test "x$with_memcached" = "xyes"], [
91 ++ PKG_CHECK_MODULES([MEMCACHED], [libmemcached])
92 ++ CFLAGS="$CFLAGS $MEMCACHED_CFLAGS"
93 ++ LIBS="$LIBS $MEMCACHED_LIBS"
94 ++
95 ++ AC_CHECK_HEADERS(
96 ++ [libmemcached/memcached.h],
97 ++ [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])],
98 ++ [AC_MSG_ERROR([Couldn't find <libmemcached/memcached.h>])])
99 ++
100 ++ AC_SEARCH_LIBS(memcached_create, [], [],
101 ++ [AC_MSG_ERROR(libmemcached is not installed)])
102 ++])
103 +
104 +-AC_SUBST(MEMCACHED_INCLUDE_OPT)
105 +-AC_SUBST(MEMCACHED_LINK_OPT)
106 +-AC_SUBST(MEMCACHED_RPATH_OPT)
107 ++CFLAGS="$CFLAGS -fno-strict-aliasing"
108 +
109 + OLD_LDFLAGS="$LDFLAGS"
110 + LDFLAGS="-L$PGSQL_LIB_DIR"
111 +@@ -380,7 +367,6 @@
112 +
113 + AC_SUBST(PGSQL_INCLUDE_DIR)
114 + AC_SUBST(PGSQL_LIB_DIR)
115 +-AC_SUBST(MEMCACHED_DIR)
116 +
117 + # --enable(disable)-rpath option
118 + AC_ARG_ENABLE(rpath,
119
120 diff --git a/dev-db/pgpool2/files/pgpool-configure-pam.patch b/dev-db/pgpool2/files/pgpool-configure-pam.patch
121 new file mode 100644
122 index 00000000000..3a8e89dde30
123 --- /dev/null
124 +++ b/dev-db/pgpool2/files/pgpool-configure-pam.patch
125 @@ -0,0 +1,25 @@
126 +--- a/configure.ac
127 ++++ b/configure.ac
128 +@@ -330,11 +330,13 @@
129 +
130 +-AC_ARG_WITH(pam,
131 +- [ --with-pam build with PAM support],
132 +- [AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support. (--with-pam)])])
133 +-if test "$with_pam" = yes ; then
134 +- AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
135 +- AC_CHECK_HEADERS(security/pam_appl.h, [],
136 +- [AC_CHECK_HEADERS(pam/pam_appl.h, [],
137 +- [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
138 +-fi
139 ++AC_ARG_WITH([pam], AS_HELP_STRING([--with-pam], [Build with PAM support]))
140 ++
141 ++AS_IF([test "x$with_pam" = "xyes"], [
142 ++ AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support])
143 ++ AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
144 ++ AC_CHECK_HEADERS(security/pam_appl.h,
145 ++ [],
146 ++ [AC_CHECK_HEADERS(pam/pam_appl.h, [],
147 ++ [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
148 ++
149 ++])
150 +
151
152 diff --git a/dev-db/pgpool2/files/pgpool-configure-pthread.patch b/dev-db/pgpool2/files/pgpool-configure-pthread.patch
153 new file mode 100644
154 index 00000000000..50b18fab6fc
155 --- /dev/null
156 +++ b/dev-db/pgpool2/files/pgpool-configure-pthread.patch
157 @@ -0,0 +1,13 @@
158 +--- a/configure.ac
159 ++++ b/configure.ac
160 +@@ -3,6 +3,10 @@
161 +
162 + dnl Checks for programs.
163 + AC_PROG_CC
164 ++AX_PTHREAD
165 ++LIBS="$PTHREAD_LIBS $LIBS"
166 ++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
167 ++CC="$PTHREAD_CC"
168 +
169 + AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects])
170 +
171
172 diff --git a/dev-db/pgpool2/files/pgpool2.initd b/dev-db/pgpool2/files/pgpool2.initd
173 index c9ffb0cf161..73db4dd8b3c 100644
174 --- a/dev-db/pgpool2/files/pgpool2.initd
175 +++ b/dev-db/pgpool2/files/pgpool2.initd
176 @@ -1,5 +1,5 @@
177 #!/sbin/openrc-run
178 -# Copyright 1999-2012 Gentoo Foundation
179 +# Copyright 1999-2018 Gentoo Foundation
180 # Distributed under the terms of the GNU General Public License v2
181
182 extra_started_commands="reload"
183 @@ -23,24 +23,22 @@ get_config() {
184 PIDFILE="$(get_config pid_file_name)"
185 : ${PIDFILE:='/run/pgpool/pgpool.pid'}
186
187 -prep() {
188 +start_pre() {
189 # $logdir contains status file(s), not log files.
190 local logdir=$(get_config logdir)
191 local socket_dir=$(get_config socket_dir)
192 local pcp_socket_dir=$(get_config pcp_socket_dir)
193
194 checkpath -o pgpool:postgres -m 0770 -d $(dirname ${PIDFILE}) || return 1
195 - checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/run/pgpool'} || return 1
196 + checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/var/lib/pgpool'} || return 1
197 checkpath -o pgpool:postgres -m 0660 -f ${LOGFILE} || return 1
198 - checkpath -o postgres:postgres -m 0770 \
199 + checkpath -o root:postgres -m 1775 \
200 -d ${socket_dir:-'/run/postgresql'} || return 1
201 - checkpath -o postgres:postgres -m 0770 \
202 - -d ${pcp_socket_dir:-'/run/postgresql'} || return 1
203 + checkpath -o pgpool:postgres -m 0770 \
204 + -d ${pcp_socket_dir:-'/run/postgresql/pgpool'} || return 1
205 }
206
207 start() {
208 - prep || return 1
209 -
210 ebegin "Starting pgpool2"
211
212 start-stop-daemon --start \
213
214 diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-3.7.5.ebuild
215 similarity index 72%
216 copy from dev-db/pgpool2/pgpool2-9999.ebuild
217 copy to dev-db/pgpool2/pgpool2-3.7.5.ebuild
218 index b0b43a07e37..adab103e02f 100644
219 --- a/dev-db/pgpool2/pgpool2-9999.ebuild
220 +++ b/dev-db/pgpool2/pgpool2-3.7.5.ebuild
221 @@ -3,34 +3,40 @@
222
223 EAPI=6
224
225 -EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
226 +POSTGRES_COMPAT=( 9.{3..6} {10..11} )
227
228 -POSTGRES_COMPAT=( 9.{3..6} 10 )
229 +inherit autotools postgres-multi
230
231 -inherit git-r3 postgres-multi
232 +MY_P="${PN/2/-II}-${PV}"
233
234 DESCRIPTION="Connection pool server for PostgreSQL"
235 HOMEPAGE="http://www.pgpool.net/"
236 -SRC_URI=""
237 +SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
238 LICENSE="BSD"
239 SLOT="0"
240
241 -KEYWORDS=""
242 +KEYWORDS="~amd64 ~x86"
243
244 -IUSE="doc memcached pam ssl static-libs"
245 +IUSE="doc libressl memcached pam ssl static-libs"
246
247 RDEPEND="
248 ${POSTGRES_DEP}
249 net-libs/libnsl:0=
250 memcached? ( dev-libs/libmemcached )
251 pam? ( sys-auth/pambase )
252 - ssl? ( dev-libs/openssl:* )
253 + ssl? (
254 + !libressl? ( dev-libs/openssl:* )
255 + libressl? ( dev-libs/libressl:= )
256 + )
257 "
258 DEPEND="${RDEPEND}
259 - sys-devel/bison
260 !!dev-db/pgpool
261 + sys-devel/bison
262 + virtual/pkgconfig
263 "
264
265 +S=${WORKDIR}/${MY_P}
266 +
267 pkg_setup() {
268 postgres_new_user pgpool
269
270 @@ -38,25 +44,27 @@ pkg_setup() {
271 }
272
273 src_prepare() {
274 - eapply "${FILESDIR}/pgpool_run_paths-9999.patch"
275 + eapply \
276 + "${FILESDIR}/pgpool-configure-memcached.patch" \
277 + "${FILESDIR}/pgpool-configure-pam.patch" \
278 + "${FILESDIR}/pgpool-configure-pthread.patch" \
279 + "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
280 +
281 + eautoreconf
282
283 postgres-multi_src_prepare
284 }
285
286 src_configure() {
287 - local myconf
288 - use memcached && \
289 - myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
290 - use pam && myconf+=' --with-pam'
291 -
292 postgres-multi_foreach econf \
293 --disable-rpath \
294 --sysconfdir="${EROOT%/}/etc/${PN}" \
295 --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
296 --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
297 - $(use_with ssl openssl) \
298 $(use_enable static-libs static) \
299 - ${myconf}
300 + $(use_with memcached) \
301 + $(use_with pam) \
302 + $(use_with ssl openssl)
303 }
304
305 src_compile() {
306 @@ -79,9 +87,8 @@ src_install() {
307
308 # Documentation!
309 dodoc NEWS TODO
310 - if use doc ; then
311 - postgres-multi_forbest emake DESTDIR="${D}" -C doc install
312 - fi
313 + doman doc/src/sgml/man{1,8}/*
314 + use doc && dodoc -r doc/src/sgml/html
315
316 # Examples and extras
317 # mv some files that get installed to /usr/share/pgpool-II so that
318
319 diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
320 index b0b43a07e37..b565c24cfbe 100644
321 --- a/dev-db/pgpool2/pgpool2-9999.ebuild
322 +++ b/dev-db/pgpool2/pgpool2-9999.ebuild
323 @@ -5,9 +5,9 @@ EAPI=6
324
325 EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
326
327 -POSTGRES_COMPAT=( 9.{3..6} 10 )
328 +POSTGRES_COMPAT=( 9.{3..6} {10..11} )
329
330 -inherit git-r3 postgres-multi
331 +inherit autotools git-r3 postgres-multi
332
333 DESCRIPTION="Connection pool server for PostgreSQL"
334 HOMEPAGE="http://www.pgpool.net/"
335 @@ -17,18 +17,27 @@ SLOT="0"
336
337 KEYWORDS=""
338
339 -IUSE="doc memcached pam ssl static-libs"
340 +IUSE="doc libressl memcached pam ssl static-libs"
341
342 RDEPEND="
343 ${POSTGRES_DEP}
344 net-libs/libnsl:0=
345 memcached? ( dev-libs/libmemcached )
346 pam? ( sys-auth/pambase )
347 - ssl? ( dev-libs/openssl:* )
348 + ssl? (
349 + !libressl? ( dev-libs/openssl:* )
350 + libressl? ( dev-libs/libressl:= )
351 + )
352 "
353 DEPEND="${RDEPEND}
354 - sys-devel/bison
355 !!dev-db/pgpool
356 + sys-devel/bison
357 + virtual/pkgconfig
358 + doc? (
359 + app-text/openjade
360 + dev-libs/libxml2
361 + dev-libs/libxslt
362 + )
363 "
364
365 pkg_setup() {
366 @@ -38,25 +47,27 @@ pkg_setup() {
367 }
368
369 src_prepare() {
370 - eapply "${FILESDIR}/pgpool_run_paths-9999.patch"
371 + eapply \
372 + "${FILESDIR}/pgpool-configure-memcached.patch" \
373 + "${FILESDIR}/pgpool-configure-pam.patch" \
374 + "${FILESDIR}/pgpool-configure-pthread.patch" \
375 + "${FILESDIR}/pgpool_run_paths-9999.patch"
376 +
377 + eautoreconf
378
379 postgres-multi_src_prepare
380 }
381
382 src_configure() {
383 - local myconf
384 - use memcached && \
385 - myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
386 - use pam && myconf+=' --with-pam'
387 -
388 postgres-multi_foreach econf \
389 --disable-rpath \
390 --sysconfdir="${EROOT%/}/etc/${PN}" \
391 --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
392 --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
393 - $(use_with ssl openssl) \
394 $(use_enable static-libs static) \
395 - ${myconf}
396 + $(use_with memcached) \
397 + $(use_with pam) \
398 + $(use_with ssl openssl)
399 }
400
401 src_compile() {
402 @@ -65,6 +76,7 @@ src_compile() {
403 # of that directory built, too.
404 postgres-multi_foreach emake
405 postgres-multi_foreach emake -C src/sql
406 + use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc
407 }
408
409 src_install() {
410 @@ -79,9 +91,7 @@ src_install() {
411
412 # Documentation!
413 dodoc NEWS TODO
414 - if use doc ; then
415 - postgres-multi_forbest emake DESTDIR="${D}" -C doc install
416 - fi
417 + use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
418
419 # Examples and extras
420 # mv some files that get installed to /usr/share/pgpool-II so that
421
422 diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild.orig
423 similarity index 77%
424 copy from dev-db/pgpool2/pgpool2-9999.ebuild
425 copy to dev-db/pgpool2/pgpool2-9999.ebuild.orig
426 index b0b43a07e37..5881c059c51 100644
427 --- a/dev-db/pgpool2/pgpool2-9999.ebuild
428 +++ b/dev-db/pgpool2/pgpool2-9999.ebuild.orig
429 @@ -5,9 +5,9 @@ EAPI=6
430
431 EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
432
433 -POSTGRES_COMPAT=( 9.{3..6} 10 )
434 +POSTGRES_COMPAT=( 9.{3..6} {10..11} )
435
436 -inherit git-r3 postgres-multi
437 +inherit autotools git-r3 postgres-multi
438
439 DESCRIPTION="Connection pool server for PostgreSQL"
440 HOMEPAGE="http://www.pgpool.net/"
441 @@ -27,8 +27,14 @@ RDEPEND="
442 ssl? ( dev-libs/openssl:* )
443 "
444 DEPEND="${RDEPEND}
445 - sys-devel/bison
446 !!dev-db/pgpool
447 + sys-devel/bison
448 + virtual/pkgconfig
449 + doc? (
450 + app-text/openjade
451 + dev-libs/libxml2
452 + dev-libs/libxslt
453 + )
454 "
455
456 pkg_setup() {
457 @@ -38,25 +44,27 @@ pkg_setup() {
458 }
459
460 src_prepare() {
461 - eapply "${FILESDIR}/pgpool_run_paths-9999.patch"
462 + eapply \
463 + "${FILESDIR}/pgpool-configure-memcached.patch" \
464 + "${FILESDIR}/pgpool-configure-pam.patch" \
465 + "${FILESDIR}/pgpool-configure-pthread.patch" \
466 + "${FILESDIR}/pgpool_run_paths-9999.patch"
467 +
468 + eautoreconf
469
470 postgres-multi_src_prepare
471 }
472
473 src_configure() {
474 - local myconf
475 - use memcached && \
476 - myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
477 - use pam && myconf+=' --with-pam'
478 -
479 postgres-multi_foreach econf \
480 --disable-rpath \
481 --sysconfdir="${EROOT%/}/etc/${PN}" \
482 --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
483 --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
484 - $(use_with ssl openssl) \
485 $(use_enable static-libs static) \
486 - ${myconf}
487 + $(use_with memcached) \
488 + $(use_with pam) \
489 + $(use_with ssl openssl)
490 }
491
492 src_compile() {
493 @@ -65,6 +73,7 @@ src_compile() {
494 # of that directory built, too.
495 postgres-multi_foreach emake
496 postgres-multi_foreach emake -C src/sql
497 + use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc
498 }
499
500 src_install() {
501 @@ -79,9 +88,7 @@ src_install() {
502
503 # Documentation!
504 dodoc NEWS TODO
505 - if use doc ; then
506 - postgres-multi_forbest emake DESTDIR="${D}" -C doc install
507 - fi
508 + use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
509
510 # Examples and extras
511 # mv some files that get installed to /usr/share/pgpool-II so that
Report Message
Find on MARC Find on Google Groups