From owner-svn-ports-head@freebsd.org Sat Sep 26 21:18:35 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 13A7A3E1217; Sat, 26 Sep 2020 21:18:35 +0000 (UTC) (envelope-from tijl@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BzM8V6QB7z45pm; Sat, 26 Sep 2020 21:18:34 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BB4222A14F; Sat, 26 Sep 2020 21:18:34 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08QLIYS2013506; Sat, 26 Sep 2020 21:18:34 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08QLIYZ4013505; Sat, 26 Sep 2020 21:18:34 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202009262118.08QLIYZ4013505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sat, 26 Sep 2020 21:18:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550227 - head/devel/linux_libusb X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: head/devel/linux_libusb X-SVN-Commit-Revision: 550227 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Sep 2020 21:18:35 -0000 Author: tijl Date: Sat Sep 26 21:18:34 2020 New Revision: 550227 URL: https://svnweb.freebsd.org/changeset/ports/550227 Log: Add a direct build dependency on linux_base instead of relying on devtools to pull it in. This guarantees that the version constraint set in Mk/Uses/linux.mk is taken into account. Compile with --sysroot=${LINUXBASE} such that gcc doesn't pick up headers from /usr. Build the 32 bit library on amd64 with -m32 such that it's actually a 32 bit library. This must have become broken long time ago when 64 bit linux support was added and the compiler became 64 bit. [1] PR: 249516 Reported by: Alex S [1] Modified: head/devel/linux_libusb/Makefile Modified: head/devel/linux_libusb/Makefile ============================================================================== --- head/devel/linux_libusb/Makefile Sat Sep 26 21:12:50 2020 (r550226) +++ head/devel/linux_libusb/Makefile Sat Sep 26 21:18:34 2020 (r550227) @@ -3,7 +3,7 @@ PORTNAME= linux_libusb PORTVERSION= 13.0r${FSVN_REV} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel linux MASTER_SITES= http://www.selasky.org/hans_petter/distfiles/ \ http://home.selasky.org/distfiles/ @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= amd64 i386 USES= linux tar:bzip2 USE_LDCONFIG= yes -USE_LINUX= base devtools:build +USE_LINUX= base:build,run devtools:build USE_LINUX_PREFIX= yes LIBDIR_amd64= lib64 @@ -26,7 +26,7 @@ PLIST_FILES= usr/${LIBDIR_${ARCH}}/libusb.so \ usr/${LIBDIR_${ARCH}}/libusb.so.3 \ usr/${LIBDIR_${ARCH}}/libusb-0.1.so.4 -CC= ${LINUXBASE}/usr/bin/gcc +CC= ${LINUXBASE}/usr/bin/gcc --sysroot=${LINUXBASE} CFLAGS:= ${CFLAGS:N-march=*} CFLAGS+= -I${WRKDIR}/${DISTNAME}/include SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9 @@ -57,9 +57,9 @@ do-build: ${MAKE_ARGS:N${DESTDIRNAME}=*} .if ${ARCH} == amd64 ${MKDIR} ${WRKSRC}/lib - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} MAKEOBJDIR=lib \ - ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} \ - ${MAKE_ARGS:N${DESTDIRNAME}=*} COMPAT_32BIT=yes + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NCC=*} CC="${CC} -m32" \ + MAKEOBJDIR=lib ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ + ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} COMPAT_32BIT=yes .endif do-install: