From owner-freebsd-ports@FreeBSD.ORG Wed Aug 27 13:42:00 2014 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D11FF68B for ; Wed, 27 Aug 2014 13:42:00 +0000 (UTC) Received: from mail.egr.msu.edu (boomhauer.egr.msu.edu [35.9.37.167]) by mx1.freebsd.org (Postfix) with ESMTP id A79F03350 for ; Wed, 27 Aug 2014 13:42:00 +0000 (UTC) Received: from boomhauer (localhost [127.0.0.1]) by mail.egr.msu.edu (Postfix) with ESMTP id 9BA0D4CF81 for ; Wed, 27 Aug 2014 09:41:53 -0400 (EDT) X-Virus-Scanned: amavisd-new at egr.msu.edu Received: from mail.egr.msu.edu ([127.0.0.1]) by boomhauer (boomhauer.egr.msu.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F4QuMeojjGrG for ; Wed, 27 Aug 2014 09:41:53 -0400 (EDT) Received: from EGR authenticated sender Message-ID: <53FDE021.5030108@egr.msu.edu> Date: Wed, 27 Aug 2014 09:41:53 -0400 From: Adam McDougall User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: Building subversion-1.8.10 under poudriere References: <53FDCBD8.4060306@digiware.nl> <7C47458A-8B41-47FB-8091-00CA301DDA5B@FreeBSD.org> <53FDD88A.9030001@digiware.nl> In-Reply-To: <53FDD88A.9030001@digiware.nl> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 13:42:00 -0000 On 08/27/2014 09:09, Willem Jan Withagen wrote: > On 2014-08-27 14:41, Dimitry Andric wrote: >> >> This is a problem in the devel/apr1 port. It checks for modf(), finds >> it in libc, then assumes isnan() also comes from libc. However, that >> does not work for static linking. >> >> Please apply the attached patch for apr1, which I have been using for >> some time now. > > Hi Dimitry, > > So this is due to me wanting to link things static? > Then I'll reconfig subversion to dynamic linking. > Because I don't have a clue (yet) as to how to get (and keep) custom > patches in a poudriere environment. > > Thanx for the reply, > --WjW > I keep custom patches this way: /usr/local/etc/poudriere.d/my-appropriate-make.conf: .if ${.CURDIR:M*/mail/mutt} EXTRA_PATCHES+= /distfiles/mypatches/patch-mail-mutt-fix-imap-append .endif You may also be interested in things like: .if ${.CURDIR:M*/security/krb5} CONFIGURE_ARGS+= --localstatedir=/var/db WITH_OPENSSL_PORT=yes .endif I suggest using this method in poudriere's make.conf for port building options: DEFAULT_VERSIONS= perl5=5.16 php=5.4 mysql=5.5 apache=2.2 pgsql=8.4 # Global port options OPTIONS_UNSET+=AVAHI BONJOUR CUPS MDNS PULSEAUDIO # specific port options: mail_dovecot_SET=GSSAPI mail_dovecot_UNSET=MANAGESIEVE That way you only change the options you desire and aren't hardcoding any of the other port options in case the default changes in the future, possibly in a critical way (threading for example). The path to the patch must be a proper path within port building jails and I believe poudriere mounts it's distfiles directory on /distfiles. It has to be a path that is available within port building jails. I picked distfiles because it is available. One thing I like about EXTRA_PATCHES is it will cause a port build to fail if the file is not found, so if that happens I will know to correct the problem rather than produce unpatched packages. I add my "mypatches" directory to my standard server backups so it is easy to restore if needed. Beware running poudriere distclean since it will wipe out unreferenced files in distfiles.