For all our ports that use the pecl module, SHARED_ONLY is always

defined and "c" is always added to WANTLIB.  Remove the check from
the module and add WANTLIB += c to the individual port Makefiles.
No changes in package signature, no other modules affected.
This commit is contained in:
naddy 2016-03-19 21:18:37 +00:00
parent 821e5a3f99
commit 88c5a3338b
18 changed files with 44 additions and 31 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2016/02/01 21:55:38 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2016/03/19 21:18:37 naddy Exp $
COMMENT = PHP support for LZF de/compression
@ -10,6 +10,8 @@ REVISION = 0
# PHP
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c
MODULES = lang/php/pecl
CONFIGURE_STYLE = gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2016/02/01 21:55:38 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP support for rar archives
@ -9,7 +9,7 @@ REVISION= 2
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= m stdc++
WANTLIB= c m stdc++
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2016/03/11 20:28:23 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP interface to redis
@ -10,6 +10,8 @@ CATEGORIES= databases
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2016/03/14 09:11:06 sthen Exp $
# $OpenBSD: Makefile,v 1.29 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP support for the ImageMagick library
@ -9,7 +9,7 @@ CATEGORIES= graphics
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xext Xt
WANTLIB += bz2 djvulibre expat fftw3 fontconfig freetype jbig
WANTLIB += bz2 c djvulibre expat fftw3 fontconfig freetype jbig
WANTLIB += jpeg lcms2 lzma m openjp2 png pthread pthread-stubs
WANTLIB += tiff webp xcb xml2 z

View File

@ -1,9 +1,8 @@
# $OpenBSD: pecl.port.mk,v 1.5 2015/11/14 14:55:47 sthen Exp $
# $OpenBSD: pecl.port.mk,v 1.6 2016/03/19 21:18:38 naddy Exp $
# PHP PECL module
MODULES += lang/php
SHARED_ONLY ?= Yes
CATEGORIES += www
PKGNAME ?= pecl-${DISTNAME:S/pecl-//:S/_/-/:L}
@ -35,7 +34,3 @@ TEST_TARGET = test
TEST_FLAGS = NO_INTERACTION=1
USE_GMAKE ?= Yes
.endif
.if ${SHARED_ONLY:L} == "yes"
WANTLIB += c
.endif

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2016/02/01 21:55:38 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2016/03/19 21:18:38 naddy Exp $
COMMENT = PHP extension for parsing and working with rfc822/MIME mail
@ -11,6 +11,8 @@ MAINTAINER = Stuart Henderson <sthen@openbsd.org>
# PHP
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c
AUTOCONF_VERSION = 2.52
AUTOMAKE_VERSION = 1.4

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2016/02/02 00:51:10 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2016/03/19 21:18:38 naddy Exp $
COMMENT = low-level encryption extension for PHP
@ -13,7 +13,7 @@ MAINTAINER = Stuart Henderson <sthen@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += sodium
WANTLIB += c sodium
MODULES = lang/php/pecl
LIB_DEPENDS = security/libsodium

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2016/02/01 21:55:38 sthen Exp $
# $OpenBSD: Makefile,v 1.22 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP support for chroot(2)
@ -10,6 +10,8 @@ MASTER_SITES= ${MASTER_SITE_BACKUP}
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
# not really PECL but close enough
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2016/03/01 00:07:18 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP support for geocoding IPv4 addresses
@ -8,7 +8,7 @@ REVISION= 1
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GeoIP
WANTLIB += GeoIP c
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2016/02/01 21:55:38 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2016/03/19 21:18:38 naddy Exp $
COMMENT= extended HTTP support
@ -18,7 +18,7 @@ MODULES= lang/php/pecl \
CONFIGURE_STYLE= gnu
WANTLIB+= crypto curl event idn nghttp2 ssl z
WANTLIB+= c crypto curl event idn nghttp2 ssl z
RUN_DEPENDS+= www/pecl-raphf \
www/pecl-propro
TEST_DEPENDS+= ${RUN_DEPENDS}

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.26 2016/02/01 21:55:38 sthen Exp $
# $OpenBSD: Makefile,v 1.27 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP interface to memcached
@ -9,6 +9,8 @@ REVISION= 0
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2016/02/01 21:55:38 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP interface to memcached via libmemcached
@ -8,7 +8,7 @@ REVISION= 2
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += memcached memcachedutil pthread sasl2 z
WANTLIB += c memcached memcachedutil pthread sasl2 z
MODULES= lang/php/pecl
LIB_DEPENDS= devel/libmemcached

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2016/02/01 21:55:39 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP support for setproctitle
@ -8,6 +8,8 @@ REVISION= 2
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2016/02/01 21:55:39 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2016/03/19 21:18:38 naddy Exp $
COMMENT= reusable split of pecl_http's property proxy API#'
@ -8,6 +8,8 @@ REVISION= 3
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2016/02/01 21:55:39 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2016/03/19 21:18:38 naddy Exp $
COMMENT= persistent handle and resource factory API
@ -8,6 +8,8 @@ REVISION= 0
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2016/02/01 21:55:39 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP bindings for the libssh2 library
@ -8,7 +8,7 @@ REVISION= 0
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += crypto ssh2 ssl z
WANTLIB += c crypto ssh2 ssl z
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2016/02/01 21:55:39 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2016/03/19 21:18:38 naddy Exp $
COMMENT = PHP interface to swish-e
@ -8,7 +8,7 @@ REVISION = 2
# PHP
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = m pcre pcreposix swish-e z
WANTLIB = c m pcre pcreposix swish-e z
MODULES = lang/php/pecl
CONFIGURE_STYLE = gnu

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2016/02/01 21:55:39 sthen Exp $
# $OpenBSD: Makefile,v 1.17 2016/03/19 21:18:38 naddy Exp $
COMMENT= PHP upload progress meter
@ -8,6 +8,8 @@ REVISION= 2
# PHP
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
MODULES= lang/php/pecl
CONFIGURE_STYLE= gnu