From patchwork Sun May 19 00:19:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Walkes X-Patchwork-Id: 1101493 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=none (p=none dis=none) header.from=trellis-logic.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=trellis-logic-com.20150623.gappssmtp.com header.i=@trellis-logic-com.20150623.gappssmtp.com header.b="KlLJGF8+"; 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 4562rZ27zWz9sBK for ; Sun, 19 May 2019 10:26:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8931785F68; Sun, 19 May 2019 00:26:15 +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 ZxR6OXgX1LGP; Sun, 19 May 2019 00:26:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C01B885D94; Sun, 19 May 2019 00:26:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 404F61BF852 for ; Sun, 19 May 2019 00:26:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 39E1A8670F for ; Sun, 19 May 2019 00:26:11 +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 xXEB7vGHQD1D for ; Sun, 19 May 2019 00:26:10 +0000 (UTC) X-Greylist: delayed 00:05:48 by SQLgrey-1.7.6 Received: from mail-it1-f195.google.com (mail-it1-f195.google.com [209.85.166.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 259ED8627E for ; Sun, 19 May 2019 00:26:10 +0000 (UTC) Received: by mail-it1-f195.google.com with SMTP id m3so13848850itl.1 for ; Sat, 18 May 2019 17:26:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trellis-logic-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=TrIL8nzf8PNwrq+ziFyrmCWs7VEjLZdulrVxZe0kUqU=; b=KlLJGF8+5YM0YNVzHavxC8GSCLSbla7lRpUW78E8k2O8cJCdeekbgPkkFq0vuvAA+f q7bbwkPc0TEI4U6unRfwtJbU2bd55bXMXoZG6mK/UFSjJ3SepsgvI2Z+9XNHMjOkRT3e pYb9MSgHY3SnEf7pVvkz8+aaqnWTP2esxhDTQKavbEGx7tJEjJy0ZBCQvgkNJ9ieq1EJ V1jZRPW0FFdh6jOXvwOu7JVeeg/Zp0VIIeMBlb8/NzmKM59W2h1clih+CVFkW4DyzqtW 5ZxKOR1H9lOC8VWFXoPNR5j1Xi09LX4WFRy+g4NWTBDmUy9qXpc7LJpMSI4rX8gyeOSw mCXg== 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; bh=TrIL8nzf8PNwrq+ziFyrmCWs7VEjLZdulrVxZe0kUqU=; b=R62NDMIRn8pQRK1iuQt4ypziMAmEjkOHvJUjmYwcffDTG0dWcAa+cogCCESqtwtx4C km/SpMU795lmGLkz2Fl8dJmRc5gYrDFkY9Zva3XML3gi6y+Vudn+67RwQhj3j18dG6fp PHg6YY1R/Vw/zG4IHGA3/OI4XyqL37hApfEuQXvM7lQ0AQHBOkSHL7zsZI+MS4LB2Tg7 4NxEnDnLnzPiyRNLBDFhYFL6kz/U1wLPvIB/t1BZkvNjCgzjhOFOoXrJUWOi5MpsGSky z1Db3iO/FLUotzPUN2YKjRqhp4kxS0Q+m/UY8ZJPHPt3mhteWi70Ijd+Jy2p/gxnDfGh Q3yg== X-Gm-Message-State: APjAAAUcNwxYsSd2ZkYbZZJAv1VXJ2TFoa5g8mQx3hVkLu8kzvsilbdL hOZ0wSnW3Y0Rs5PpVrwGEmCef07GTTKSag== X-Google-Smtp-Source: APXvYqzGPxhkhzc8Re3J9/rCli0+6Njkxb9f5rMXzRTUG4ivbx1bWxh+CONL9pRSvOmjX69xAFEnKg== X-Received: by 2002:a24:7c04:: with SMTP id a4mr16359716itd.138.1558225221790; Sat, 18 May 2019 17:20:21 -0700 (PDT) Received: from dan-ubuntu.hsd1.co.comcast.net ([2601:285:8200:953:35c1:c007:d95b:9fd3]) by smtp.gmail.com with ESMTPSA id k18sm1019126itb.0.2019.05.18.17.20.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 May 2019 17:20:20 -0700 (PDT) From: Dan Walkes To: buildroot@buildroot.org Date: Sat, 18 May 2019 18:19:42 -0600 Message-Id: <1558225183-10288-1-git-send-email-danwalkes@trellis-logic.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH] package/php: support --with-config-file-scan-dir 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: Dan Walkes , Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" To support using multiple php configuration files, allow setting of a config file scan director via menuconfig. For php option details see link at [1]. [1] https://www.php.net/manual/en/configuration.file.php Signed-off-by: Dan Walkes --- package/php/Config.in | 5 +++++ package/php/php.mk | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/package/php/Config.in b/package/php/Config.in index 2469573..6157d4a 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -45,6 +45,11 @@ config BR2_PACKAGE_PHP_SAPI_FPM help PHP-FPM (FastCGI Process Manager) +config BR2_PACKAGE_PHP_WITH_CONFIG_FILE_SCAN_DIR + string "Specify --with-config-file-scan-dir" + help + An additional directory containing php.ini files (e.g. /etc/php.d) + source "package/php/Config.ext" endif diff --git a/package/php/php.mk b/package/php/php.mk index ed71c96..24499e8 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -318,6 +318,10 @@ PHP_CONF_OPTS += \ PHP_DEPENDENCIES += jpeg libpng freetype endif +ifneq ($(call qstrip,$(BR2_PACKAGE_PHP_WITH_CONFIG_FILE_SCAN_DIR)),) +PHP_CONF_OPTS += --with-config-file-scan-dir=$(BR2_PACKAGE_PHP_WITH_CONFIG_FILE_SCAN_DIR) +endif + ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y) define PHP_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(@D)/sapi/fpm/init.d.php-fpm \