From patchwork Sun Mar 21 11:47:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1456279 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=WlH/quJK; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F3GC82Vdcz9sRf for ; Sun, 21 Mar 2021 22:49:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 6E24640245; Sun, 21 Mar 2021 11:49:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wrRJ5NOpxXcT; Sun, 21 Mar 2021 11:49:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id B5C7040263; Sun, 21 Mar 2021 11:49:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 9A9641BF291 for ; Sun, 21 Mar 2021 11:49:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 970CC60648 for ; Sun, 21 Mar 2021 11:49:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9bGqJLG8pcTm for ; Sun, 21 Mar 2021 11:49:49 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9C3AC60631 for ; Sun, 21 Mar 2021 11:49:49 +0000 (UTC) Received: by mail-wm1-x32a.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so7650931wmj.2 for ; Sun, 21 Mar 2021 04:49:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t3/y4ysEQ+7O8osT9wJeUjBVGhIvHrBn9OifI3IjGuk=; b=WlH/quJK4oVR4YBECY2C1RCwHTIDXCRPf8cHGQTqbnSfz76SxidtFLoUd7fd9Qv1Bd vQMgjxTsrDheBsbQqIXMR48rv2KhnFykszb+s+MQLkjXSgNA3WYL5gaRv6dRt9UrFeu9 ZeuQ4mvx5G4Ld+3f0LNqSpNhsvF8KVZ5B7Qq1S4vdQB6IF6Q/VhEe+PCkZfpC9oUBJw8 BOI3n6qAwhC5WPke4Ytop9LlNUyluizw2jOdVszScjykYlpfB/Lps5joxbtZmvkMKG76 DA2MdKT+JXbvfcEGuQFMd1KW52l1phuOL2rn1PwwM/YJWLKlSot/w52UJLXTm4wanghC e5dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t3/y4ysEQ+7O8osT9wJeUjBVGhIvHrBn9OifI3IjGuk=; b=ZE5WJRpCnZzZGka0WDXBHKjaTM1mRN7XakUGYGfKkhQPVwiw+jss0nCCHYhkaQLOuM 0a0TOY0uf2RVyYzJXlBYxN9WoBuzug2WZAfbmff2T3xqyfr589SAiN0SUyASa2xxcYYf 7GkosJrT1FiAjXjPkyvgnWX+ZH8+JnimKmFWAqfy6E9qu2PEAj17s7bScSmAb7PBd/LT cchTwzMxuvcFRXbVNkTvJRJ+LyUUgg25KwsVCk5onTVJjvCQ5MLHdNy1bnxjF8uQBcO0 IS8Hs8CmYRxUeNj5LE3Xe5X6KGr5m2uaN/G3kgp4ALx6jeEF95lZTHek8xgTwTiOv9Nf S3kQ== X-Gm-Message-State: AOAM5301Wy0gcMsrK+n8cbBCmhCGpdoeyWFBpZO/nKl59y7XDxhG6gVC 0frMD/Xkl/EaB4S3OwcuOED6FOqMV9M= X-Google-Smtp-Source: ABdhPJyLSMoqx4yrobC2G64SFrXrOT/aYN3zAy/5ekUFP5F4orRVS4hmzSZaLyx/wSRliq8jRfvHnw== X-Received: by 2002:a1c:3c02:: with SMTP id j2mr11566471wma.92.1616327387406; Sun, 21 Mar 2021 04:49:47 -0700 (PDT) Received: from kali.home (lfbn-ren-1-358-30.w2-10.abo.wanadoo.fr. [2.10.19.30]) by smtp.gmail.com with ESMTPSA id j9sm13492292wmi.24.2021.03.21.04.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Mar 2021 04:49:47 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 21 Mar 2021 12:47:12 +0100 Message-Id: <20210321114712.1072879-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/sconeserver: disable image X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Dawson , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Build of http::sconesite::image module was silently broken until commit d3b818c3cf0990117a8b59fcfc6c212f310ae6ec However, sconeserver fails to build with ImageMagick because: - it checks for ImageMagick++.pc instead of ImageMagick.pc - it uses the transform function which has been removed from the public API since version 7.0.1-0 and https://github.com/ImageMagick/ImageMagick/commit/06f590165f0505d42005264893fe14a9e8a79986 As sconeserver does not seem to be maintained anymore, drop BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE and don't had a Config.in.legacy entry because the option was silently broken since a long time Fixes: - http://autobuild.buildroot.org/results/895ab582d1140f7677fc1c6934fa2e0c47c49f20 Signed-off-by: Fabrice Fontaine --- package/sconeserver/Config.in | 8 -------- package/sconeserver/sconeserver.mk | 15 +++++++-------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index 429ac81fe1..d46ba85fbc 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -26,14 +26,6 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE help http::sconesite module for Sconeserver -config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE - bool "http::sconesite::image" - depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE - depends on BR2_USE_MMU # imagemagick - select BR2_PACKAGE_IMAGEMAGICK - help - http::sconesite::image module for Sconeserver - config BR2_PACKAGE_SCONESERVER_MYSQL bool "mysql" depends on BR2_USE_MMU # mysql diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 62cc128d77..17407c29f5 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -14,10 +14,16 @@ SCONESERVER_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_PCRE),pcre) \ zlib +# disable image as it fails to build with ImageMagick # disable markdown module because its git submodule cmark # https://github.com/sconemad/sconeserver/tree/master/markdown # has no cross-compile support provided by the sconeserver build system -SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6 --without-markdown +SCONESERVER_CONF_OPTS += \ + --with-ip \ + --with-local \ + --with-ip6 \ + --without-image \ + --without-markdown # Sconeserver configure script fails to find the libxml2 headers. ifeq ($(BR2_PACKAGE_LIBXML2),y) @@ -45,13 +51,6 @@ else SCONESERVER_CONF_OPTS += --without-sconesite endif -ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y) -SCONESERVER_DEPENDENCIES += imagemagick -SCONESERVER_CONF_OPTS += --with-image -else -SCONESERVER_CONF_OPTS += --without-image -endif - ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) SCONESERVER_DEPENDENCIES += mysql SCONESERVER_CONF_OPTS += \