From nobody Sun May 12 10:02:48 2024 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 4VcdTj0Hmnz5JDYt; Sun, 12 May 2024 10:02:49 +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 4VcdTh2TS3z4qlp; Sun, 12 May 2024 10:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715508168; 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=DC/2tZGl6Y+cDcvfEMrXg7YuOtGaVE7VeiTE5Uq4Pkc=; b=tlm279HZ2fdeq7wFMHrMLxYn30VxxnrKm0v9xJ0s58DF2r68Sz61abfK7a7nxUuM/ld/3G JUyXNY3/hoPt7znCrYxosaivWL1AtHL1EHBoBLKErJoE/ttz+DtDoZmOqShz0AQ9IXoqWp UxTf8xf7y38IyVYMUep+saAqYMsdLR4ceHDJNpzyGX10kPSyUBoZnFFjip2Nc8niL/vkrm AsMpBi9OU+txN7jlipTn6CIyhaiB7q/Ax3bP3INMchmY9LJbNCSUDuQK5yyu0QX2VYpCVz 9asvzM3vaHLBPpYvZ59q1sn1ou0yd3v862gHJnqNAO9Y+iMtXUsL/jL1KyR4EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715508168; a=rsa-sha256; cv=none; b=AOXrdif+hJfCrHbDRXThMlKrXeGwPjJZw2+CQhJlV5icb6Y6KwnYCBVQFYoJ8PCRY/o6Ta xE4MVjfWrJ+PfRvwDqfRs/o+p2PYI6SlLOc09GsjHF47JMYiFsA3dT4RIhfsHF/LnLrMHH q7Ly7t1ggy7Ec1UmLlQYnrGZe4hKIATNQcjaB+jfRQ32Z1AkmIVg/i194hTg6Z24r6ay2Y nm0ztvEA4U+892Ix7FJKg7bF9ahgTHSZzZClSrvwi05QrGvSkqCaSIJaoysY/YZ8Xkvxxs 1Oy1LjSYTssk9sbMJ3kBWTNJ2UjNg0uYIeuqDAkmuyPTQ2Gyse3S+Ho0I82qJg== 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=1715508168; 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=DC/2tZGl6Y+cDcvfEMrXg7YuOtGaVE7VeiTE5Uq4Pkc=; b=RDz8HHc7we8H8JbiyWTgZ2RBzSqES2kpw4Wq1eZ54KdMbDRmjV98refsAlnAgnTCMndNkL Mil2nhZJH2VHth7EYmPGFbHYknVDPFyrw1GpaI9rmqT+KDmqEsqYwZXC2HAasKlFQ0uA/f aD0gZBpV2CyI4E1ZApttgJlP+gknrOH7r3v8aYB4agmjt0GkVM7VZ+mQcaztMDiuoJcl53 vLgOwrQogLq63BHrd7LSIKQFehGsUSPeBYGlRwyldnhKrbhy/QuI1SIenQeBbEiWRPksGw J2VTM7VYoPiK5j1yok9IEQ9ZmGgovK57HajADgsBA3sO7zu42J7ZHfCNpzRCBA== 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 4VcdTh1SyYz10rR; Sun, 12 May 2024 10:02:48 +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 44CA2mKd017261; Sun, 12 May 2024 10:02:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44CA2mAZ017258; Sun, 12 May 2024 10:02:48 GMT (envelope-from git) Date: Sun, 12 May 2024 10:02:48 GMT Message-Id: <202405121002.44CA2mAZ017258@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: d43f7e3be299 - main - devel/linux_libusb: Flavorize with c7 and rl9 flavors 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d43f7e3be2993f4293252037a9a177e9faee7d7b Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d43f7e3be2993f4293252037a9a177e9faee7d7b commit d43f7e3be2993f4293252037a9a177e9faee7d7b Author: Dima Panov AuthorDate: 2024-02-13 10:32:49 +0000 Commit: Gleb Popov CommitDate: 2024-05-12 10:01:19 +0000 devel/linux_libusb: Flavorize with c7 and rl9 flavors Sponsored by: Serenity Cybersecurity, LLC --- devel/linux_libusb/Makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/devel/linux_libusb/Makefile b/devel/linux_libusb/Makefile index a594ecc69110..918f78fbd85d 100644 --- a/devel/linux_libusb/Makefile +++ b/devel/linux_libusb/Makefile @@ -1,6 +1,7 @@ PORTNAME= linux_libusb PORTVERSION= 13.1.0 CATEGORIES= devel linux +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= ports@FreeBSD.org COMMENT= Linux-compatibility LibUSB @@ -8,9 +9,14 @@ WWW= https://github.com/hselasky/linux_libusb LICENSE= BSD2CLAUSE -ONLY_FOR_ARCHS= aarch64 amd64 i386 +ONLY_FOR_ARCHS= aarch64 amd64 -USES= linux tar:bzip2 +FLAVORS= c7 rl9 +FLAVOR?= c7 +c7_CONFLICTS_INSTALL= ${PORTNAME}-rl9 +rl9_CONFLICTS_INSTALL= ${PORTNAME}-c7 + +USES= linux:${FLAVOR} tar:bzip2 USE_GITHUB= yes USE_LDCONFIG= yes @@ -40,10 +46,13 @@ MAKE_ENV+= LDADD="-lrt" MAKE_ARGS+= NO_WDATE_TIME=yes -.if ${ARCH} == amd64 +.if ${FLAVOR} == c7 +ONLY_FOR_ARCHS+= i386 +. if ${ARCH} == amd64 PLIST_FILES+= usr/lib/libusb.so.3 \ usr/lib/libusb-0.1.so.4 \ usr/lib/libusb-1.0.so.0 +. endif .endif do-build: @@ -51,7 +60,7 @@ do-build: cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ MAKEOBJDIR=${LIBDIR_${ARCH}} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} -.if ${ARCH} == amd64 +.if ${ARCH} == amd64 && ${FLAVOR} == c7 ${MKDIR} ${WRKSRC}/lib cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV:NCC=*} \ CC="${CC} -m32" MAKEOBJDIR=lib ${MAKE_CMD} ${MAKE_FLAGS} \ @@ -67,7 +76,7 @@ do-install: ${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}/libusb-0.1.so.4 ${LN} -s libusb.so.3 \ ${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}/libusb-1.0.so.0 -.if ${ARCH} == amd64 +.if ${ARCH} == amd64 && ${FLAVOR} == c7 ${MKDIR} ${STAGEDIR}${PREFIX}/usr/lib ${INSTALL_LIB} ${WRKSRC}/lib/libusb.so.3 \ ${STAGEDIR}${PREFIX}/usr/lib