pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Do not mess with the VCC_CC var, fixes at least SunOS/x86_64.



Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Thu Mar 16 13:36:08 2017 +0000
Changeset:	751cabcab9a8e7ef544f57feb6438878e746dfe5

Modified Files:
	varnish/Makefile.common

Log Message:
Do not mess with the VCC_CC var, fixes at least SunOS/x86_64.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=751cabcab9a8e7ef544f57feb6438878e746dfe5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 varnish/Makefile.common | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diffs:
diff --git a/varnish/Makefile.common b/varnish/Makefile.common
index 5127915d14..75fe9529ec 100644
--- a/varnish/Makefile.common
+++ b/varnish/Makefile.common
@@ -49,21 +49,16 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
 CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
 
-.if ${OPSYS} == "SunOS"
 # Explicitly disable epoll on illumos, provided for Linux compat only.
-CONFIGURE_ENV+=		ac_cv_func_epoll_ctl=no
-.  if !empty(PKGSRC_COMPILER:Msunpro)
-CONFIGURE_ENV+=		VCC_CC="cc ${_COMPILER_ABI_FLAG.${ABI}} -Kpic -G -o %o %s"
-.  else
-CONFIGURE_ENV+=		VCC_CC="gcc ${_COMPILER_ABI_FLAG.${ABI}} -fpic -shared -o %o %s"
-.  endif
-.endif
+CONFIGURE_ARGS.SunOS+=	--disable-epoll
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/varnish
 
 # not signed/unsigned char safe
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
+PKGCONFIG_OVERRIDE+=	varnishapi.pc.in
+
 RCD_SCRIPTS=		varnishd varnishlog varnishncsa
 
 TEST_TARGET=		check


Home | Main Index | Thread Index | Old Index