From owner-svn-ports-all@FreeBSD.ORG Wed Jul 30 14:19:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A00187E9; Wed, 30 Jul 2014 14:19:37 +0000 (UTC) Received: from smtp-out-02.shaw.ca (smtp-out-02.shaw.ca [64.59.136.138]) by mx1.freebsd.org (Postfix) with ESMTP id C6BC224D2; Wed, 30 Jul 2014 14:19:36 +0000 (UTC) X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=UbGOdjJMTOnDdlSKs4VLEv47Nwxh2hlhayjdFxkzNJk= c=1 sm=1 a=Z5pHEwxCytgA:10 a=zzaxv6dU5mAA:10 a=QrugwKR0C_UA:10 a=wAGQQ9Az6v0A:10 a=BLceEmwcHowA:10 a=ICAaq7hcmGcA:10 a=kj9zAlcOel0A:10 a=IbtKDeXwb2+SRU442/pi3A==:17 a=sol3VE4AAAAA:8 a=6I5d2MoRAAAA:8 a=KC9ug_Y4AAAA:8 a=BWvPGDcYAAAA:8 a=2bDKvDia4loKOqE1DYMA:9 a=CjuIK1q_8ugA:10 a=V7tsTZBp22UA:10 a=SV7veod9ZcQA:10 a=mCzOLww0GrL_d71p:21 a=ijTLld0SWN06Y1ID:21 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO spqr.komquats.com) ([96.50.7.119]) by smtp-out-02.shaw.ca with ESMTP; 30 Jul 2014 08:19:35 -0600 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 656A89BE9; Wed, 30 Jul 2014 07:19:35 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.14.9/8.14.9) with ESMTP id s6UEJYmA031967; Wed, 30 Jul 2014 07:19:34 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.14.9/8.14.8/Submit) with ESMTP id s6UEJYWr031964; Wed, 30 Jul 2014 07:19:34 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Message-Id: <201407301419.s6UEJYWr031964@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.komquats.com/ To: Baptiste Daroussin Subject: Re: svn commit: r363477 - head/sysutils/cfengine36 In-Reply-To: Message from Baptiste Daroussin of "Wed, 30 Jul 2014 15:54:50 +0200." <20140730135450.GJ37672@ivaldir.etoilebsd.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 30 Jul 2014 07:19:34 -0700 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org, Cy Schubert X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jul 2014 14:19:37 -0000 In message <20140730135450.GJ37672@ivaldir.etoilebsd.net>, Baptiste Daroussin w rites: > On Wed, Jul 30, 2014 at 03:21:51PM +0200, Baptiste Daroussin wrote: > > On Wed, Jul 30, 2014 at 01:17:12PM +0000, Cy Schubert wrote: > > > Author: cy > > > Date: Wed Jul 30 13:17:12 2014 > > > New Revision: 363477 > > > URL: http://svnweb.freebsd.org/changeset/ports/363477 > > > QAT: https://qat.redports.org/buildarchive/r363477/ > > >=20 > > > Log: > > > Make poudriere happy. > > >=20 > > > Modified: > > > head/sysutils/cfengine36/Makefile > > >=20 > > > Modified: head/sysutils/cfengine36/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D > > > --- head/sysutils/cfengine36/Makefile Wed Jul 30 13:15:40 2014 > (r363476) > > > +++ head/sysutils/cfengine36/Makefile Wed Jul 30 13:17:12 2014 > (r363477) > > > @@ -42,6 +42,7 @@ CONFIGURE_ARGS=3D --docdir=3D${DOCSDIR} \ > > > --with-lmdb=3D${LOCALBASE} \ > > > --enable-fhs > > > =20 > > > +BUILD_DEPENDS+=3D ${LOCALBASE}/include/pcre.h:${PORTSDIR}/devel/p > cre > > > LIB_DEPENDS+=3D libpcre.so:${PORTSDIR}/devel/pcre \ > > > liblmdb.so:${PORTSDIR}/databases/lmdb > > > =20 > >=20 > > This is 100% noop and changes nothing that won't make poudriere more happ= > y then > > before. > >=20 > > This ports have multiple problem due to patch-m4-strndup.m4 > when building locally it works because you might have autotools installed > locally and configrue automatically run aclocal because the m4 file has cha= > nged. > But that breaks USES=3Dlibtool hence the libexec/cfengine/libpromises.so.3 = > not > being created fixed by your addition of post-install > > on the cluster you are in a clean env so aclocal is not there given you did= > not > asked it to be there. > > You have 2 possibility either remove patch-m4-strndup.m4, add > CPPFLAGS=3D-I${LOCALBASE}/include, remove your new BUILD_DEPENDS and remove= > your > post-install > > or keep your patch-m4-stdndup.m4 and regenerate configure with USE_AUTOTOOLS > macros, add CPPFLAGS=3D-I${LOCALBASE}/include, remove your new BUILD_DEPEND= > S and remove your > post-install > > There is no point in patching m4 macros if you do not regenerate the autoto= > ols > > This patch http://people.freebsd.org/~bapt/cfengine36.diff does the first t= > hing. Try this. Index: Makefile =================================================================== --- Makefile (revision 363480) +++ Makefile (working copy) @@ -68,8 +68,4 @@ LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt .endif -post-install: - @cd ${STAGEDIR}${PREFIX}/libexec/cfengine && \ - ${LN} -s libpromises.so.3.0.6 libpromises.so.3 - .include Index: files/patch-aclocal.m4 =================================================================== --- files/patch-aclocal.m4 (revision 0) +++ files/patch-aclocal.m4 (working copy) @@ -0,0 +1,7 @@ +--- aclocal.m4.orig 2014-07-30 07:15:47.380055000 -0700 ++++ aclocal.m4 2014-07-30 07:16:24.011844671 -0700 +@@ -1118,4 +1118,3 @@ + m4_include([m4/lt~obsolete.m4]) + m4_include([m4/old-autoconf.m4]) + m4_include([m4/snprintf.m4]) +-m4_include([m4/strndup.m4]) Property changes on: files/patch-aclocal.m4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-m4-strndup.m4 =================================================================== --- files/patch-m4-strndup.m4 (revision 363347) +++ files/patch-m4-strndup.m4 (working copy) @@ -1,54 +0,0 @@ ---- /dev/null 2014-07-29 08:00:54.000000000 -0700 -+++ m4/strndup.m4 2014-07-29 08:01:42.499328796 -0700 -@@ -0,0 +1,51 @@ -+# strndup.m4 serial 21 -+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+AC_DEFUN([cf3_FUNC_STRNDUP], -+[ -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles -+ AC_CHECK_DECLS([strndup]) -+ AC_REPLACE_FUNCS([strndup]) -+ if test $ac_cv_have_decl_strndup = no; then -+ HAVE_DECL_STRNDUP=0 -+ fi -+ -+ if test $ac_cv_func_strndup = yes; then -+ HAVE_STRNDUP=1 -+ # AIX 5.3 has a function that tries to copy the entire range specified -+ # by n, instead of just the length of src. -+ AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works], -+ [AC_RUN_IFELSE([ -+ AC_LANG_PROGRAM([[#include -+ #include ]], [[ -+#if !HAVE_DECL_STRNDUP -+ extern -+ #ifdef __cplusplus -+ "C" -+ #endif -+ char *strndup (const char *, size_t); -+#endif -+ char *s; -+ // Will crash if strndup tries to traverse all 2GB. -+ s = strndup ("string", 2000000000); -+ return 0;]])], -+ [cf3_cv_func_strndup_works=yes], -+ [cf3_cv_func_strndup_works=no], -+ [ -+changequote(,)dnl -+ case $host_os in -+ aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";; -+ *) cf3_cv_func_strndup_works="guessing yes";; -+ esac -+changequote([,])dnl -+ ])]) -+ case $cf3_cv_func_strndup_works in -+ *no) AC_LIBOBJ([strndup]) ;; -+ esac -+ else -+ HAVE_STRNDUP=0 -+ fi -+]) Index: pkg-plist =================================================================== --- pkg-plist (revision 363347) +++ pkg-plist (working copy) @@ -1,5 +1,4 @@ libexec/cfengine/libpromises.so -libexec/cfengine/libpromises.so.3 libexec/cfengine/libpromises.so.3.0.6 sbin/cf-agent sbin/cf-execd -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.