From patchwork Tue May 14 10:34:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 243659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 178222C00A7 for ; Tue, 14 May 2013 20:34:43 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 45D5D20541; Tue, 14 May 2013 10:34:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7mxibFKQd2Ot; Tue, 14 May 2013 10:34:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6FAD931A13; Tue, 14 May 2013 10:34:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C98BF8F7AC for ; Tue, 14 May 2013 10:34:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5025A8C2E3 for ; Tue, 14 May 2013 10:34:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c10kSQKzcJit for ; Tue, 14 May 2013 10:34:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 09EC98C7F0 for ; Tue, 14 May 2013 10:34:35 +0000 (UTC) Received: by mail-wi0-f169.google.com with SMTP id hn14so1587659wib.2 for ; Tue, 14 May 2013 03:34:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=ar/8KsPOrVEmc3EJjts1cyBTn7NLVug3yyf1d79kiiA=; b=M5klm8FV/jti1qeCmJH0LuDC4pSRqdlsFdYrCu4t8+zJsdUibGoiGlxoamykIsnwXx qIp4EPR3FktdEUgT8sZn06P4zQ2vjUgphUAsgXW4pqIsDIPUty/tWbihTW66icx3apg+ iv10THzK+W3Mp53uzVE7rEDXjU8YI0goyV9nf9v4WDXx837bQ3cS1cfoy0JiF56PkPNb SV79sWp/0URWiyaCRfOEcnGYHI8TvvbKS1G8HblyA6nJuTx9G/a/6mxHFBZ+dOi4J0VV ST+Ep+dq9pOwVe6GZDKcvxP9LGW25d8mHyePy1rkKLdpax+gS9aIrl0aGOwP7TWaVALh OWPw== X-Received: by 10.180.37.229 with SMTP id b5mr5092006wik.29.1368527674480; Tue, 14 May 2013 03:34:34 -0700 (PDT) Received: from localhost.localdomain (host86-134-29-90.range86-134.btcentralplus.com. [86.134.29.90]) by mx.google.com with ESMTPSA id fu14sm18517157wic.8.2013.05.14.03.34.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 May 2013 03:34:33 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Tue, 14 May 2013 11:34:32 +0100 Message-Id: <1368527672-17411-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.8.1.2 Subject: [Buildroot] [PATCH] sconeserver: fix autobuild failures X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson Fix sconeserver autobuild failures such as the following. http://autobuild.buildroot.net/results/58e/58e4886a6ff41e49ac86cbf497bb509fd37f0d68/ The sconeserver version is bumped to a recent revision in which it is possible to pass the paths to Magick++-config, mysql_config and xml2-config to the configure script. Signed-off-by: Simon Dawson --- package/sconeserver/sconeserver.mk | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index ab3d1fc..744f389 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -3,25 +3,23 @@ # sconeserver # ############################################################# + # Release 0.6.0 doesn't build cleanly, so use a recent # Subversion trunk snapshot. -SCONESERVER_VERSION = 183 -SCONESERVER_SITE = \ - https://sconeserver.svn.sourceforge.net/svnroot/sconeserver/trunk +SCONESERVER_VERSION = 211 +SCONESERVER_SITE = svn://svn.code.sf.net/p/sconeserver/code/trunk SCONESERVER_SITE_METHOD = svn - SCONESERVER_LICENSE = GPLv2+ SCONESERVER_LICENSE_FILES = COPYING +SCONESERVER_AUTORECONF = YES SCONESERVER_DEPENDENCIES += pcre SCONESERVER_CONF_OPT += --with-ip --with-local -SCONESERVER_CONF_OPT += CXXFLAGS="$(TARGET_CXXFLAGS) $(SCONESERVER_CXXFLAGS)" -SCONESERVER_CONF_OPT += LDFLAGS="$(TARGET_LDFLAGS) $(SCONESERVER_LDFLAGS)" - # Sconeserver configure script fails to find the libxml2 headers. ifeq ($(BR2_PACKAGE_LIBXML2),y) - SCONESERVER_CXXFLAGS += -I$(STAGING_DIR)/usr/include/libxml2 + SCONESERVER_CONF_OPT += \ + --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" endif ifeq ($(BR2_INET_IPV6),y) @@ -52,16 +50,17 @@ endif ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y) SCONESERVER_DEPENDENCIES += imagemagick host-pkgconf - SCONESERVER_CONF_OPT += --with-sconesite-image + SCONESERVER_CONF_OPT += \ + --with-sconesite-image \ + --with-Magick++-config="$(STAGING_DIR)/usr/bin/Magick++-config" else SCONESERVER_CONF_OPT += --without-sconesite-image endif ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) SCONESERVER_DEPENDENCIES += mysql_client - SCONESERVER_CONF_OPT += --with-mysql - SCONESERVER_CXXFLAGS += -I$(STAGING_DIR)/usr/include/mysql - SCONESERVER_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql + SCONESERVER_CONF_OPT += --with-mysql \ + --with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" else SCONESERVER_CONF_OPT += --without-mysql endif