From nobody Fri Jan 14 08:10:41 2022 X-Original-To: dev-commits-ports-main@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 D224D18E190D; Fri, 14 Jan 2022 08:10:41 +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 4JZvB93MQ1z4bPm; Fri, 14 Jan 2022 08:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642147841; 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=2GXgW1GhdwzpcylC4PQ54+cxo7GyjuMx5QL6zFuOXpk=; b=S8zz1MWXXP9BVVGo1hL/AowOHPeBUjjSEewRcDVDRFrrhheYFEYmbouqsJd6soGBpgEPe3 L6+Eoi748LzEwilveWOPBLgPzJY7iRy0QkySyI4A24/o7+HVsM/TD+YUoczzmXJ3IfBPK/ 0aswJUQociBKV5HRFE80KQD8xiElIE7T/sVpkFhluM93z32i14O0gwstA1/O1RQ3sk6ZcD 86UjDFzlEKOQKJYRQ9dxjMAznI8QvZffmTcry3fMujIQEWMUjdh1fRg09HtdI7NtHguj2S WFVqRXUyfNX/bTnHQdG6NWNEaiVzkcHkyWAuxnSqabWd0AmcTmsG1XR+B5ADFw== 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 3911D10737; Fri, 14 Jan 2022 08:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20E8AfbD092825; Fri, 14 Jan 2022 08:10:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20E8Afhr092824; Fri, 14 Jan 2022 08:10:41 GMT (envelope-from git) Date: Fri, 14 Jan 2022 08:10:41 GMT Message-Id: <202201140810.20E8Afhr092824@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Sivachenko Subject: git: 598b7625b04e - main - net/haproxy: fix build with static pcre. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: demon X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 598b7625b04e0c0107c99dec5f66129c975916c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642147841; 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=2GXgW1GhdwzpcylC4PQ54+cxo7GyjuMx5QL6zFuOXpk=; b=RTiSee7ZvMEdNDVxVfCoVUbiMF2aLlS8Ueh7pUKc9OULGj05QUHUjDDcIGkOqzX1t84YxJ zUp1DmpaFMqv/1ZoP5ke+z5PLKenUIcN1wKErzpCA+fUu8cEuLbxouPiwce1amdhx8G5yT G7BKWHuKvwJrk+yLVpnndLYjtWR9EpOPwbNDaH9jkHTrpvUUA1ZZSuuJJR10HSRUCzGker ZER4tzTSMPnbbupS3wY5r6GX/ZvCzHfkCBsgpapkmzdRuh8/PDnlDzlYnm4O3lSiYJoYg+ C6tSnA4961f/rsJDwEGVJGHg35YfESOdBMPIn/heacDJQjIA0761+1PTVOFrRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642147841; a=rsa-sha256; cv=none; b=i3wrH+gdofk284c143iM2UDFitJMH6SzQFytdwnYAAboA9o7fgluuL+pnBE7JsV8+i/aRr RslElCyBWAWgmgyaUAXABfycPNp5KNxfto9iUhCTeLMM2WqmpGowDAfl0/1WYkK2E045S1 LlVLijcrAOVd3e1+noW6Hsv4U6KHTJ1KvncHANgEpP2cbNkanYwKHaXXtQvcVpnx7IqQKL WnN4Ks4RpDdhgMOaaoWFF31zClJb6Ht6J6mUeFU4lXkHW/o/HI+05V5OYLnvxvYdJ/4XF/ 3fQ25ikhJC5DWoebCQ3pDeRY3LpCSz7vHhYafYs+KuVIDWopiYkQw6TGbg91ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by demon: URL: https://cgit.FreeBSD.org/ports/commit/?id=598b7625b04e0c0107c99dec5f66129c975916c1 commit 598b7625b04e0c0107c99dec5f66129c975916c1 Author: Dmitry Sivachenko AuthorDate: 2022-01-14 08:09:07 +0000 Commit: Dmitry Sivachenko CommitDate: 2022-01-14 08:10:34 +0000 net/haproxy: fix build with static pcre. Pointed out by: Kirill Varnakov --- net/haproxy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 205da80f720e..60bfb36e3e9b 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -47,9 +47,9 @@ DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1 DPCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 DPCRE2_MAKE_ARGS= USE_PCRE2=1 USE_PCRE2_JIT=1 -SPCRE_LIB_DEPENDS= libpcre.a:devel/pcre +SPCRE_BUILD_DEPENDS= ${LOCALBASE}/lib/libpcre.a:devel/pcre SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1 -SPCRE2_LIB_DEPENDS= libpcre2-8.a:devel/pcre2 +SPCRE2_BUILD_DEPENDS= ${LOCALBASE}/lib/libpcre2-8.a:devel/pcre2 SPCRE2_MAKE_ARGS= USE_PCRE2=1 USE_STATIC_PCRE2=1 USE_PCRE2_JIT=1 DEVICEATLAS_LIB_DEPENDS= libda.so:net/deviceatlas-enterprise-c DEVICEATLAS_MAKE_ARGS= USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include