From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alp Aker Newsgroups: gmane.emacs.devel Subject: Re: Patch for build failure on OS X (under review) Date: Tue, 6 May 2014 16:10:38 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=047d7b624e6c6d635204f8c0d734 X-Trace: ger.gmane.org 1399413627 22119 80.91.229.3 (6 May 2014 22:00:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 6 May 2014 22:00:27 +0000 (UTC) Cc: Emacs devel To: Andrew Schwartzmeyer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 07 00:00:23 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WhnOs-00015O-Q3 for ged-emacs-devel@m.gmane.org; Tue, 06 May 2014 23:59:46 +0200 Original-Received: from localhost ([::1]:37122 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhlhR-0007on-IL for ged-emacs-devel@m.gmane.org; Tue, 06 May 2014 16:10:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhlhM-0007oJ-JT for emacs-devel@gnu.org; Tue, 06 May 2014 16:10:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhlhH-0007f2-Hm for emacs-devel@gnu.org; Tue, 06 May 2014 16:10:44 -0400 Original-Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]:58388) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhlhH-0007cT-9F for emacs-devel@gnu.org; Tue, 06 May 2014 16:10:39 -0400 Original-Received: by mail-wg0-f46.google.com with SMTP id n12so7475328wgh.17 for ; Tue, 06 May 2014 13:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=eBN7tp47dOe/V4U8zS5M4tCyLhJfddZzeH+5X8hTWrc=; b=HGdog/w+P14yDbN4NoluDNsaOwChJo1khncp3ZL62wM6Nj+Sh71uxi6EnDm7SNM+z6 HUpMzQMfNsCjBiWhZr11kG6wAR9GozEt9fKXQbmEnsbUHykqZ+KMc0NEsjQSKW2AWk2L co/VuRdpuOtlJtGPHf8IVl134A7xTXZgDhrAoR2EedidUGHg1zfneGoHAqCKPwQG68Ny ce2cVadpp1a0x+tmZM7yx7Bne5t3+CbzVpAvqC64ZHuOaPdYQXCkad5IJileooB/AV4K jvUSEWlSwQyqnNx+J2TwCCjdzTmlEhgON4D+laZKk0it2emf+FPx4AWgpQ0GUmgQGD1s 4kAg== X-Received: by 10.180.198.48 with SMTP id iz16mr22452786wic.29.1399407038513; Tue, 06 May 2014 13:10:38 -0700 (PDT) Original-Received: by 10.216.40.143 with HTTP; Tue, 6 May 2014 13:10:38 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:171703 Archived-At: --047d7b624e6c6d635204f8c0d734 Content-Type: text/plain; charset=UTF-8 [Apologies for the premature send on the previous.] Unfortunately, that's not the correct fix. The code that's causing the error shouldn't be compiled at all on an NS build; it's in a large block that's conditioned on HAVE_PNG, which the NS build expects to be false, as that port supplies its on version of png_load(). The current incorrect configuration behavior appears to have been caused by: revno: 117059 fixes bug: http://debbugs.gnu.org/17339 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-05-04 14:28:08 -0700 message: Consult libpng-config more consistently. This is mainly for simplicity, but it should also avoid some future problems like the ones we recently had with NetBSD. * configure.ac (LIBPNG): Configure after LIBZ. Use libpng-config for cflags, too. Append -lz if we're not already doing that with LIBZ. Do not bother appending -lm, since we always append that. Coalesce some duplicate code. * src/Makefile.in (PNG_CFLAGS): New var. (ALL_CFLAGS): Use it. * src/image.c [HAVE_PNG]: Don't worry about , as CFLAGS now handles this. --047d7b624e6c6d635204f8c0d734 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
[Apologies for the premature send on the previous.]
Unfortunately, that's not the correct fix.=C2=A0 The code that's c= ausing the error shouldn't be compiled at all on an NS build; it's = in a large block that's conditioned on HAVE_PNG, which the NS build exp= ects to be false, as that port supplies its on version of png_load().=C2=A0=

The current incorrect configuration behavior appears to have been cause= d by:

revno: 117059
fixes bug: http://debbugs.gnu.org/17339
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sun 2014-05-04 14:28:08 -0700
message:<= br>=C2=A0 Consult libpng-config more consistently.

=C2=A0 This is ma= inly for simplicity, but it should also avoid
=C2=A0 some future problem= s like the ones we recently had with NetBSD.
=C2=A0 * configure.ac (LIBPNG): Configu= re after LIBZ.=C2=A0 Use libpng-config
=C2=A0 for cflags, too.=C2=A0 App= end -lz if we're not already doing that with
=C2=A0 LIBZ.=C2=A0 Do n= ot bother appending -lm, since we always append that.
=C2=A0 Coalesce some duplicate code.
=C2=A0 * src/Makefile.in (PNG_CFLAG= S): New var.
=C2=A0 (ALL_CFLAGS): Use it.
=C2=A0 * src/image.c [HAVE_= PNG]: Don't worry about <libpng/png.h>, as
=C2=A0 CFLAGS now h= andles this.
--047d7b624e6c6d635204f8c0d734--