From owner-svn-ports-all@freebsd.org Fri Jan 3 10:05:22 2020 Return-Path: Delivered-To: svn-ports-all@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 C82651ECFE6; Fri, 3 Jan 2020 10:05:22 +0000 (UTC) (envelope-from antoine@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) server-signature RSA-PSS (4096 bits) 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 47q0ry40Vtz4dhZ; Fri, 3 Jan 2020 10:05:22 +0000 (UTC) (envelope-from antoine@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 6C2842A643; Fri, 3 Jan 2020 10:05:22 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 003A5MtA030718; Fri, 3 Jan 2020 10:05:22 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 003A5MFj030717; Fri, 3 Jan 2020 10:05:22 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <202001031005.003A5MFj030717@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 3 Jan 2020 10:05:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r521920 - branches/2020Q1/devel/linux_libusb X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2020Q1/devel/linux_libusb X-SVN-Commit-Revision: 521920 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2020 10:05:22 -0000 Author: antoine Date: Fri Jan 3 10:05:21 2020 New Revision: 521920 URL: https://svnweb.freebsd.org/changeset/ports/521920 Log: MFH: r521828 Attempt to fix build after removal of Linux c6. - Replace build dependency on linux-c7-devtools with USE_LINUX=devtools:build so it takes into account LINUX_DEFAULT. - Install libusb.so.3 which is the SONAME of the library. - Disable -Werror. - Don't build profiling library. It's not installed and -pg and -fstack-protector are incompatible. - Don't let the build make parse /etc/make.conf because this may redefine *FLAGS. The file is already handled by the ports tree. - Create symbolic links instead of hard links. Modified: branches/2020Q1/devel/linux_libusb/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/linux_libusb/Makefile ============================================================================== --- branches/2020Q1/devel/linux_libusb/Makefile Fri Jan 3 09:34:08 2020 (r521919) +++ branches/2020Q1/devel/linux_libusb/Makefile Fri Jan 3 10:05:21 2020 (r521920) @@ -3,27 +3,30 @@ PORTNAME= linux_libusb PORTVERSION= 11.0r${FSVN_REV} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel linux MASTER_SITES= LOCAL/nox MAINTAINER= emulation@FreeBSD.org COMMENT= Linux-compatibility libusb -BUILD_DEPENDS= ${LINUXBASE}/usr/bin/gcc:devel/linux-c7-devtools - -USES= tar:bzip2 +USES= linux tar:bzip2 ONLY_FOR_ARCHS= i386 amd64 USE_LDCONFIG= yes +USE_LINUX= devtools:build USE_LINUX_PREFIX= yes PLIST_FILES= usr/lib/libusb.so \ + usr/lib/libusb.so.3 \ usr/lib/libusb-0.1.so.4 CC= ${LINUXBASE}/usr/bin/gcc CFLAGS+= -I${WRKDIR}/sys SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9 MAKE_ARGS+= LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h MAKE_ARGS+= PTHREAD_LIBS="-lpthread -lrt" +MAKE_ARGS+= NO_WERROR=yes +MAKE_ARGS+= WITHOUT_PROFILE=yes MAKE_ARGS+= WITHOUT_SSP=yes +MAKE_ARGS+= __MAKE_CONF="" # XXX ${LINUXBASE}/usr/bin/ld is a broken link with gentoo atm? #MAKE_ENV+= COMPILER_PATH=/usr/i486-pc-linux-gnu/binutils-bin/2.22 @@ -56,14 +59,12 @@ post-patch: ${MKDIR} ${WRKDIR}/sys ${LN} -s ${SRC_BASE}/sys/compat ${SRC_BASE}/sys/dev ${WRKDIR}/sys -# XXX: Due to problems with ports/ infrastructure, we don't seem to be able -# to symlink files. I provide hardlink instead. If fixed, remember to remove -# link name from PLIST_FILES. do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/usr/lib - ${INSTALL_DATA} ${WRKSRC}/libusb.so ${STAGEDIR}${PREFIX}/usr/lib + ${INSTALL_LIB} ${WRKSRC}/libusb.so.3 ${STAGEDIR}${PREFIX}/usr/lib + ${LN} -s libusb.so.3 ${STAGEDIR}${PREFIX}/usr/lib/libusb.so # Xilinx ISE requirement. - ${LN} -f ${STAGEDIR}${PREFIX}/usr/lib/libusb.so ${STAGEDIR}${PREFIX}/usr/lib/libusb-0.1.so.4 + ${LN} -s libusb.so.3 ${STAGEDIR}${PREFIX}/usr/lib/libusb-0.1.so.4 .if defined(BOOTSTRAP) || defined(SVN_FETCH) #FETCH_DEPENDS+= svn:devel/subversion