kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure that SSL support is completely disabled if the user has requested

Browse source 
that we prefer pkgsrc for OpenSSL.  While the latter doesn't actually work
yet, it's better that we are deterministic about this and do not pick up
the system OpenSSL regardless.
This commit is contained in:
jperkin 2012-07-27 14:26:36 +00:00
parent 6a6690253d
commit 2eb9c2ce25
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgtools/pkg_install/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.185 2012/03/01 21:40:00 joerg Exp $ # $NetBSD: Makefile,v 1.186 2012/07/27 14:26:36 jperkin Exp $
# Notes to package maintainers: # Notes to package maintainers:
# #
@ -122,6 +122,12 @@ LDFLAGS+= -L${WRKDIR}/zlib
CPPFLAGS+= -I${WRKDIR}/libarchive/libarchive CPPFLAGS+= -I${WRKDIR}/libarchive/libarchive
LDFLAGS+= -L${WRKDIR}/libarchive/.libs LDFLAGS+= -L${WRKDIR}/libarchive/.libs
# Until we support pkgsrc openssl at bootstrap time, disable it completely
# if asked to avoid the builtin.
.if empty(USE_BUILTIN.openssl:M[Yy][Ee][Ss])
LIBARCHIVE_CONFIGURE_ARGS= --without-openssl
.endif
LIBARCHIVE_LIBS= ${SED} -n -e 's/^Libs://p' -e 's/^Libs.private://p' \ LIBARCHIVE_LIBS= ${SED} -n -e 's/^Libs://p' -e 's/^Libs.private://p' \
${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo ${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo
LIBS+= ${LIBARCHIVE_LIBS:sh} LIBS+= ${LIBARCHIVE_LIBS:sh}
@ -176,7 +182,8 @@ pre-configure:
${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
./configure --disable-shared --disable-bsdtar \ ./configure --disable-shared --disable-bsdtar \
--disable-bsdcpio --without-expat --without-xml2 \ --disable-bsdcpio --without-expat --without-xml2 \
--disable-dependency-tracking --disable-dependency-tracking \
${LIBARCHIVE_CONFIGURE_ARGS}
cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD} cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD}
.endif .endif
cd ${WRKDIR}/libfetch && ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \ cd ${WRKDIR}/libfetch && ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \