From nobody Sun Oct 08 14:52:50 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S3QBW1NkSz4ww8s; Sun, 8 Oct 2023 14:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S3QBW0TXvz3FMm; Sun, 8 Oct 2023 14:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696776771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b5yI6N707LMmW50AEIQAcDLjHg0eRB+yXJ0PxYJN72I=; b=iZI2vpph4jxiLgkxM3O9+L3OHK9L74uExERMkF6bjE2yR3k0hzwzXJNhWxdYOZ5TmZpKCS R6SMjlONs7ERLUxuzQBgRFeitE8nIL/33q950/SyImQ5jkFrYQNnJyvw2l+ik1SHYdb6ef byYrclsezwnOTAXO+PqzWMIUUr10nScqftCcONjDhB67z3b7eamuUSZMq4sJIeE+5f48Mz pvAatmkaRZ83sff9WIW9r5C7gxmgWObDQ2RbvHtL7Bae9mtH2TDsCBgz40Tzxvj3nXIlgq wvX/tjv8hlEGbpPilq9mDMMTcnOmjYiX6NSiPnUJJhOXFkRjcn04990eNJdLwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696776771; a=rsa-sha256; cv=none; b=Z/jzxOqrUXirDIec0aEFm85YkOah8BxnJSVxtrbnjH9k+LPIQDR+cMb7Ox0ZXYzF//O+2d oERJt8n73TT/5ow9aDjX+sVmasu0Qhflr/v+4RtweY3sdnlyFzHUjrv4yoKuD5Jpf6KQ3Q uaVkvm29wdc+v4K1g9+z0ZW+kl7YYTHzNpQteGdv16lSH+k0Bq0ZT6EKqdSKJuipXiroZp pPi/y5/wCUrWMQ8NJ0GdzCTs0eSBCvqewR3/BM27d5aHJFxF2Is5t7WRBu7xgglmzwYp4Y O3sUDDKFGq73R5+sVdJgBVrheKRoexy/0pCeV4As8Cc8pHW6y+FctIuTgKoEjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696776771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b5yI6N707LMmW50AEIQAcDLjHg0eRB+yXJ0PxYJN72I=; b=uvzjgSHoT6E6cgnBge5sKNFxi5WNNXZ7fLZP41g9FlTv+vJ/81SQCLzzbuZBGhYmD6H2s9 +l1O8O2imZAcbqVBxvoHln12OjrBk1lSWBOpy7B6+DDdXNBoZd4qYHYU1fUf2Y3bTOTFxP Vevaex3/AUJvUfsyOHJZLGuaW1NRlYUmiyWRonTkOdU3T5CdvYu7Gq6HeHWeh8iQ4YdbcP o2Mz4FhLYEi9/wFbYacRiu0dKD9S67rlvlzEhXauCh21c2aVOjnn6JmSONmNmAdvHrr7rm iVQSBImJjvq18TFO38ZTlfxQCFcN5wzVgFR9hPW13+JWwDTt5jaskZhIgabXKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S3QBV6g6sz2cj; Sun, 8 Oct 2023 14:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 398EqobM039598; Sun, 8 Oct 2023 14:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 398EqoSA039595; Sun, 8 Oct 2023 14:52:50 GMT (envelope-from git) Date: Sun, 8 Oct 2023 14:52:50 GMT Message-Id: <202310081452.398EqoSA039595@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: d22277621a9d - main - www/h2o-devel: move if..endif block after bsd.port.pre.mk List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d22277621a9d89f2e5ab02a68b40d56c4c37e2b3 Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=d22277621a9d89f2e5ab02a68b40d56c4c37e2b3 commit d22277621a9d89f2e5ab02a68b40d56c4c37e2b3 Author: Dave Cottlehuber AuthorDate: 2023-10-08 14:52:43 +0000 Commit: Dave Cottlehuber CommitDate: 2023-10-08 14:52:43 +0000 www/h2o-devel: move if..endif block after bsd.port.pre.mk Reported by: dvl Fixes: 79b919312ef2ac04ff54f97adb9872a7357bb344 --- www/h2o-devel/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile index 5cf48e420fd0..2300a41d9502 100644 --- a/www/h2o-devel/Makefile +++ b/www/h2o-devel/Makefile @@ -29,9 +29,6 @@ SHEBANG_FILES= share/h2o/start_server CMAKE_ARGS+= -DBUILD_SHARED_LIBS=OFF \ -DWITH_BUNDLED_SSL=OFF -.if ${ARCH} == "i386" -CMAKE_ARGS+= -DWITH_FUSION=OFF -.endif CONFLICTS= h2o @@ -59,6 +56,12 @@ MRUBY_DESC= Build with embedded mruby handler support MRUBY_USES= bison ruby:build MRUBY_CMAKE_BOOL= WITH_MRUBY +.include + +.if ${ARCH} == i386 +CMAKE_ARGS+= -DWITH_FUSION=OFF +.endif + .include post-install: @@ -72,4 +75,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.include +.include