From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9D5B138359 for ; Tue, 6 Oct 2020 20:06:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FADDE09A4; Tue, 6 Oct 2020 20:06:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E58D8E09A4 for ; Tue, 6 Oct 2020 20:06:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48D0C335DC2 for ; Tue, 6 Oct 2020 20:06:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE329334 for ; Tue, 6 Oct 2020 20:06:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1602014756.835ffbd54ca1bad9088c9f1960b7a5339937c5d6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/powersoftplus-libftdi/, dev-embedded/powersoftplus-libftdi/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/powersoftplus-libftdi/files/powersoftplus-libftdi-0.1.8-LDFLAGS.patch dev-embedded/powersoftplus-libftdi/powersoftplus-libftdi-0.1.8-r1.ebuild X-VCS-Directories: dev-embedded/powersoftplus-libftdi/ dev-embedded/powersoftplus-libftdi/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 835ffbd54ca1bad9088c9f1960b7a5339937c5d6 X-VCS-Branch: master Date: Tue, 6 Oct 2020 20:06:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a5969e0e-6e2c-4c1b-8c8f-43a1f4bfafc3 X-Archives-Hash: dc27194a54108f6e67da6f950301631b commit: 835ffbd54ca1bad9088c9f1960b7a5339937c5d6 Author: Sam James gentoo org> AuthorDate: Tue Oct 6 20:05:49 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 6 20:05:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835ffbd5 dev-embedded/powersoftplus-libftdi: port to EAPI 7 Closes: https://bugs.gentoo.org/339701 Closes: https://bugs.gentoo.org/742203 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> .../powersoftplus-libftdi-0.1.8-LDFLAGS.patch | 23 ++++++++++++++++++++++ .../powersoftplus-libftdi-0.1.8-r1.ebuild | 23 +++++++++++++--------- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dev-embedded/powersoftplus-libftdi/files/powersoftplus-libftdi-0.1.8-LDFLAGS.patch b/dev-embedded/powersoftplus-libftdi/files/powersoftplus-libftdi-0.1.8-LDFLAGS.patch new file mode 100644 index 00000000000..642209ea0ea --- /dev/null +++ b/dev-embedded/powersoftplus-libftdi/files/powersoftplus-libftdi-0.1.8-LDFLAGS.patch @@ -0,0 +1,23 @@ +diff --git a/libftdi/lib_table/Makefile b/libftdi/lib_table/Makefile +index cf4316b..dd393b8 100644 +--- a/libftdi/lib_table/Makefile ++++ b/libftdi/lib_table/Makefile +@@ -1,15 +1,15 @@ + # which compiler +-CC = gcc ++CC ?= gcc + + VERSION = _RELEASE + + LIBNAME = libd2xx_table.so + +-CFLAGS = -DLINUX -D$(VERSION) ++CFLAGS += -DLINUX -D$(VERSION) + + $(LIBNAME): ftdi_table.o + +- $(CC) -Wall -shared -fPIC -o $(LIBNAME) ftdi_table.o ++ $(CC) -Wall -shared -fPIC ${LDFLAGS} -o $(LIBNAME) ftdi_table.o + + ftdi_table.o: ftdi_table.c + $(CC) -I. $(CFLAGS) -c -fPIC ftdi_table.c diff --git a/dev-embedded/powersoftplus-libftdi/powersoftplus-libftdi-0.1.8-r1.ebuild b/dev-embedded/powersoftplus-libftdi/powersoftplus-libftdi-0.1.8-r1.ebuild index 13da6435290..6a6b23ad072 100644 --- a/dev-embedded/powersoftplus-libftdi/powersoftplus-libftdi-0.1.8-r1.ebuild +++ b/dev-embedded/powersoftplus-libftdi/powersoftplus-libftdi-0.1.8-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit multilib toolchain-funcs +EAPI=7 + +inherit autotools toolchain-funcs MY_PN="${PN/-libftdi/}" MY_P="${MY_PN}-${PV}" @@ -13,23 +14,27 @@ TABFILEDIR="libftdi/lib_table" DESCRIPTION="Library which includes a table of VIDs and PIDs of Ever UPS devices" HOMEPAGE="http://www.ever.com.pl" SRC_URI="http://www.ever.com.pl/pl/pliki/${MY_P}-x86.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~x86" -IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-0.1.8-LDFLAGS.patch" +) -S="${WORKDIR}/${MY_P}" +src_prepare() { + default + eautoreconf +} src_compile() { - cd "${TABFILEDIR}" + cd "${TABFILEDIR}" || die # Wipe out precompiled binary emake clean - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() {