From nobody Thu Jun 13 09:42:52 2024 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 4W0HWw3QzJz5NKWf; Thu, 13 Jun 2024 09:42:52 +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 4W0HWw2Bbkz4kM8; Thu, 13 Jun 2024 09:42:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718271772; 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=yXg9uIirUY9jw6pIH+GkWBYX5BVR3aL+bsc6stNjl5Q=; b=XpiAe4K7bcP+SHKjw92nOMWIFgOgV3bqVnsQSukdzOAIeLaWxsKr8+2/VND/EAfRpDl8BF 7EMpK37BQwgU4Jnpg+kdYL5GlMvEPzsYPICRB5s6RWgRoTk3935SRCTM++i3/ZKx+Z54Gz nCRfeSxo7+WJCQujzen5Sjtn7e+d5jkSo7zLKd7uSDtHMyj8BPvgmC4dFCgN39+BzjC8bI uMwc5iwVOePamU7Ep6qJWp5E+GOuM0d3H4CPT1gUp4J2X30uPYgp0sAU2q4OpNTkR+qhms eXhAZQBO1ni3Weks/rBJJcjI40XRKIqdWyj5/OTpiCm11URbq0HG/EjQsVN/1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718271772; a=rsa-sha256; cv=none; b=XZN+Nuac3blPlri+baCYM2vS2PedF+9+fpE7hlf7aPZmFYzks1AYc0TmFGuEqcu4lSqd6G LQaaASChcP+qR9/xM93YfpmKbeIxJ2StsGqJ/kHEjCtQxZhgdVLLw/v9Q5BDHIg2bcyJLb m20h2CSHlXYZMRHUjN1PNqNaXiNQvztKiXejTFmCnRCu9Nr2p13/3ctnPYTx2vBu0NaGwt lSqKKilvdc5RIUYZ4iIQFmnufFhpqK4Wb0zAtxs+uLly6i2MRloJJeSA9k0cocprtNpUj2 Xoi79eRn7jSHzHfFo4ZUOK/8jmdvkcqWchiQONb+yFkuVebBlJ4VSolsD7Q/iA== 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=1718271772; 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=yXg9uIirUY9jw6pIH+GkWBYX5BVR3aL+bsc6stNjl5Q=; b=RhR969Sv2pyaSPZnOK5yB3Qq7efGKLaGarpJP314xO/41q6KDEWW/kaUxveefsN58XkTGj u/vjacMZPME9pEmG8O2c0E/Due0wgOgGL/GpXg8T69sUNtFrVzCzB6ozfKhKiHVLhPL07R HU3yYeNGdc+o9ELIWn+MQn8V1jHErVWaX7iTiK1/qhI4Bkh06xfiirBgKtA+kVbSnSw2vk NKVVyMFEtcZYo+FBd4yQc453588SRFLkT8FTgECSvXh6f3QR2lG8fOvvBCNLCNYYUDfEh9 JVu8T+Emb88asjwHoTzNzsfvGUk+jT8pWTiq7T0Yio8swQ5z15itIpZek/IGNA== 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 4W0HWw1pGqzXDK; Thu, 13 Jun 2024 09:42:52 +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 45D9gqhI076365; Thu, 13 Jun 2024 09:42:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45D9gqj5076362; Thu, 13 Jun 2024 09:42:52 GMT (envelope-from git) Date: Thu, 13 Jun 2024 09:42:52 GMT Message-Id: <202406130942.45D9gqj5076362@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: df65ca710c5f - main - sysutils/u-boot: Allow building with different openssl 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df65ca710c5f3a2ab709549607ea169015fc9bb4 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=df65ca710c5f3a2ab709549607ea169015fc9bb4 commit df65ca710c5f3a2ab709549607ea169015fc9bb4 Author: Naram Qashat AuthorDate: 2024-06-13 08:44:10 +0000 Commit: Emmanuel Vadot CommitDate: 2024-06-13 09:42:08 +0000 sysutils/u-boot: Allow building with different openssl Add ssl to USES and export the needed variables so u-boot can be built with openssl from ports. PR: 279531 --- sysutils/u-boot-master/Makefile | 8 +++++--- sysutils/u-boot-tools/Makefile | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index bf867cdca70d..03e3df082d81 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -27,7 +27,8 @@ BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER} BUILD_DEPENDS+= e2fsprogs-libuuid>=0:misc/e2fsprogs-libuuid \ gnutls>=0:security/gnutls -USES= bison gmake python:build pkgconfig shebangfix tar:bz2 +USES= bison compiler:c11 gmake python:build pkgconfig shebangfix ssl \ + tar:bz2 BINARY_ALIAS= bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed python3=${PYTHON_CMD} SHEBANG_FILES= tools/binman/binman @@ -36,8 +37,9 @@ UBOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} INST= ${PREFIX}/${UBOOT_DIR} DESCR?= ${.CURDIR}/pkg-descr -MAKE_ENV+= V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} CC=clang -MAKE_ARGS+= ${ARCHFLAGS} +MAKE_ENV+= CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} +MAKE_ARGS+= ${ARCHFLAGS} V=1 HOSTCFLAGS="${CFLAGS} -I${OPENSSLINC}" \ + HOSTLDFLAGS="${LDFLAGS} -L${OPENSSLLIB}" NO_ARCH= yes diff --git a/sysutils/u-boot-tools/Makefile b/sysutils/u-boot-tools/Makefile index c4debfd500c7..0bca20f9d0d7 100644 --- a/sysutils/u-boot-tools/Makefile +++ b/sysutils/u-boot-tools/Makefile @@ -22,6 +22,8 @@ MAKE_ARGS= ARCH=sandbox \ HOSTCC="${CC}" \ KBUILD_VERBOSE=1 \ NOSTDINC_FLAGS="" \ + HOSTCFLAGS="${CFLAGS} -I${OPENSSLINC}" \ + HOSTLDFLAGS="${LDFLAGS} -L${OPENSSLLIB}" PLIST_FILES= bin/mkimage bin/mkenvimage bin/dumpimage bin/fit_info