trivial NO_SHARED_ARCHS and PROPERTIES:Mno_shared removal

This commit is contained in:
naddy 2016-03-12 23:23:38 +00:00
parent 7a321e73de
commit 40d1d04cdd
3 changed files with 3 additions and 16 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.145 2016/03/07 07:33:37 benoit Exp $ # $OpenBSD: Makefile,v 1.146 2016/03/12 23:23:38 naddy Exp $
COMMENT-main = GIT - Tree History Storage Tool COMMENT-main = GIT - Tree History Storage Tool
COMMENT-svn = GIT - subversion interoperability tools COMMENT-svn = GIT - subversion interoperability tools
@ -76,14 +76,6 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" \
DIFF=diff TAR=tar DIFF=diff TAR=tar
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mno_shared}
CONFIGURE_ENV += ac_cv_lib_curl_curl_global_init=yes
MAKE_FLAGS += NEEDS_CRYPTO_WITH_SSL=YesPlease \
NEEDS_SSL_WITH_CURL=YesPlease \
NEEDS_LIBINTL_BEFORE_LIBICONV=YesPlease
.endif
USE_GMAKE = Yes USE_GMAKE = Yes
USE_GROFF = Yes USE_GROFF = Yes

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.145 2016/03/11 20:28:25 naddy Exp $ # $OpenBSD: Makefile,v 1.146 2016/03/12 23:23:38 naddy Exp $
COMMENT-main= subversion revision control system COMMENT-main= subversion revision control system
COMMENT-perl= perl interface to subversion COMMENT-perl= perl interface to subversion
@ -91,10 +91,6 @@ WANTLIB-ap2 += ${_lib}>=${SO_VERSION}
.endfor .endfor
RUN_DEPENDS-ap2= www/apache-httpd RUN_DEPENDS-ap2= www/apache-httpd
NOT_FOR_ARCHS-perl = ${NO_SHARED_ARCHS}
NOT_FOR_ARCHS-python = ${NO_SHARED_ARCHS}
NOT_FOR_ARCHS-ruby = ${NO_SHARED_ARCHS}
WANTLIB-perl= ${WANTLIB} apr-1 aprutil-1 sqlite3 WANTLIB-perl= ${WANTLIB} apr-1 aprutil-1 sqlite3
RUN_DEPENDS-perl= ${MODGETTEXT_RUN_DEPENDS} RUN_DEPENDS-perl= ${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-perl= ${MODGETTEXT_LIB_DEPENDS} ${MAINSPEC} LIB_DEPENDS-perl= ${MODGETTEXT_LIB_DEPENDS} ${MAINSPEC}

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.38 2015/03/19 20:25:27 naddy Exp $ # $OpenBSD: Makefile,v 1.39 2016/03/12 23:23:38 naddy Exp $
# XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated) # XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated)
CFLAGS += "-DG_CONST_RETURN=const" CFLAGS += "-DG_CONST_RETURN=const"
@ -30,7 +30,6 @@ PERMIT_PACKAGE_CDROM= Yes
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -python MULTI_PACKAGES= -main -python
NOT_FOR_ARCHS-python = ${NO_SHARED_ARCHS}
PSEUDO_FLAVORS= no_python PSEUDO_FLAVORS= no_python
FLAVOR?= FLAVOR?=