From patchwork Sun Mar 15 10:21:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1254984 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=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=Wj0qabik; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48gFmj63Czz9sQx for ; Sun, 15 Mar 2020 21:20:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0AC2B87F0A; Sun, 15 Mar 2020 10:20:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EQa8G0wCkZ9Y; Sun, 15 Mar 2020 10:20:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6B73487FAE; Sun, 15 Mar 2020 10:20:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 845FA1BF577 for ; Sun, 15 Mar 2020 10:20:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8164587FAE for ; Sun, 15 Mar 2020 10:20:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e-_jZUIj39Dw for ; Sun, 15 Mar 2020 10:19:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5802587F0A for ; Sun, 15 Mar 2020 10:19:59 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id 6so17528037wre.4 for ; Sun, 15 Mar 2020 03:19:59 -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=5aBaoaqwchOMau8DfR7aHwskYfIxqy1s8gWZV6Y6BWM=; b=Wj0qabikfRtaPKIKXgcSehQuW1Py4QOhtui+2swmrhmNJQpWU+jXSm3n5Qi5pquYQG eclNdQPHj3OHZHQg4L4SSNQtKWf7gNQA9rGZbzfFjGoOdZTNJd53h8J7Q23V2y+9Ku7C twezWw4Fb6waG2K6havxm+jGH4QlumatrXHI5bpRpliE6sbRTljxi1wp3/uBtk8ll7Ue SMcoL1ESod0kgtTcQADP4bt8fcmhAYmF25cB4Q6NbqpigtjthZptRB5RiAXf5Yut8DO4 NeyRy8X9UiAKvTUDwvkJ/uaAoM3WHHG0T6saYBISlBK+to3OpaKSX0zNZWLfuEkNcEmQ Tyig== 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=5aBaoaqwchOMau8DfR7aHwskYfIxqy1s8gWZV6Y6BWM=; b=iCwmEwdfNCqN1Fb5+VpF785RbecoGtcFirnR11O+2XDmBlawdj2Cvw1w/B4krEZU8S UagyuO+1fZk60K/8fEgOghIBvTrR+hcK4m4PExSxVKpwmktlYiZfE6U+y+QWnE5VdnT0 vh23Xn/WEpmMWBflu6QEfwOyC6pi/xHWgY1RdQ/RrKUjNKsEwYl/CfaX+hvsed4YJxOp HyNHHCiFljAqzjheqe52HSJgc7Uqstrek5PtjjGm2UQqY2Kwzyb3HbLOtl0hnAf78Q+U G7kEAhpybvN1HBR2WTIvadc+dW3nBScITk0gqQWAMBNAehNIbE2XzzG9NQ91KFwqZJGg ZWLA== X-Gm-Message-State: ANhLgQ3dG4O9dO/i2+BFI4YTvMGlRZ/sCqh+fuxVqmR/3cWp4UkFEwa9 tnlgn+n9J4oLJQZ6zoPlrCL498cA X-Google-Smtp-Source: ADFU+vugsYmClOlktTViRFTTbqCZD9i7Oq0+s1O1MYja9WKabmI2nq212qXMcCEKEsG5lt2psDYEMg== X-Received: by 2002:adf:f148:: with SMTP id y8mr28976169wro.322.1584267597526; Sun, 15 Mar 2020 03:19:57 -0700 (PDT) Received: from kali.home (lfbn-ren-1-403-35.w2-10.abo.wanadoo.fr. [2.10.23.35]) by smtp.gmail.com with ESMTPSA id a73sm8936488wme.47.2020.03.15.03.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 03:19:56 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 15 Mar 2020 11:21:11 +0100 Message-Id: <20200315102111.2731422-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/owfs: enable back php 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: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" owfs supports PHP7 since version 3.2p3 and https://github.com/owfs/owfs/commit/a9a79b330e334ba80c305905b51e8886b40772d9 Signed-off-by: Fabrice Fontaine --- package/owfs/owfs.mk | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index ffc0b3098d..4e9a3f5c28 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -14,10 +14,6 @@ OWFS_LICENSE = GPL-2.0+, LGPL-2.0 (owtcl) OWFS_LICENSE_FILES = COPYING COPYING.LIB OWFS_INSTALL_STAGING = YES -# owfs PHP support is not PHP 7 compliant -# https://sourceforge.net/p/owfs/support-requests/32/ -OWFS_CONF_OPTS += --disable-owphp --without-php - # Skip man pages processing OWFS_CONF_ENV += ac_cv_path_SOELIM=true @@ -67,6 +63,27 @@ else OWFS_CONF_OPTS += --disable-avahi endif +ifeq ($(BR2_PACKAGE_PHP),y) +OWFS_CONF_OPTS += \ + --enable-owphp \ + --with-php \ + --with-phpconfig=$(STAGING_DIR)/usr/bin/php-config +OWFS_DEPENDENCIES += php host-swig + +# $(libdir) is set to $(EXTENSION_DIR) which is patched in php.mk to add +# $(TARGET_DIR) so remove $(DESTDIR) to avoid an install failure +define OWFS_PHP_EXTENSION_FIXUP + $(SED) 's/$$(DESTDIR)$$(libdir)/$$(libdir)/g' \ + $(@D)/module/swig/php/Makefile +endef + +OWFS_POST_CONFIGURE_HOOKS += OWFS_PHP_EXTENSION_FIXUP +else +OWFS_CONF_OPTS += \ + --disable-owphp \ + --without-php +endif + # setup.py isn't python3 compliant ifeq ($(BR2_PACKAGE_PYTHON),y) OWFS_CONF_OPTS += \