From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EFB8E138252 for ; Mon, 9 May 2016 19:45:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7EA2E0870; Mon, 9 May 2016 19:45:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69493E0870 for ; Mon, 9 May 2016 19:45:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 202F43408A6 for ; Mon, 9 May 2016 19:45:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0F7F331 for ; Mon, 9 May 2016 19:45:10 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1462823092.c806f3c116e0bcd4aae79ad074eeec981ee963a9.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch sci-geosciences/gpsd/gpsd-3.15.ebuild sci-geosciences/gpsd/gpsd-3.16.ebuild X-VCS-Directories: sci-geosciences/gpsd/files/ sci-geosciences/gpsd/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: c806f3c116e0bcd4aae79ad074eeec981ee963a9 X-VCS-Branch: master Date: Mon, 9 May 2016 19:45:10 +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-Archives-Salt: 7a6e56ab-8915-4b8f-9b37-757769bc69e1 X-Archives-Hash: 6f4a4b0c5b4aebb3c5318d2918a27d9e commit: c806f3c116e0bcd4aae79ad074eeec981ee963a9 Author: Mike Frysinger gentoo org> AuthorDate: Mon May 9 18:47:31 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon May 9 19:44:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c806f3c1 sci-geosciences/gpsd: fix parallel build #577432 sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch | 7 ++++--- sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch | 12 ++++++++++++ sci-geosciences/gpsd/gpsd-3.15.ebuild | 1 + sci-geosciences/gpsd/gpsd-3.16.ebuild | 3 +-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch index b8d2cf0..77ba8a7 100644 --- a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch +++ b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch @@ -24,7 +24,7 @@ index a050f38..53f697d 100644 else: obj_list.append(s) return env.SharedLibrary(target=target, -@@ -925,9 +925,11 @@ static_gpslib = env.StaticLibrary("gps_static", +@@ -925,9 +925,12 @@ static_gpslib = env.StaticLibrary("gps_static", [env.StaticObject(s) for s in libgps_sources], rtlibs) @@ -36,6 +36,7 @@ index a050f38..53f697d 100644 + sources=libgpsd_sources, + version=libgps_version, + parse_flags=usbflags + rtlibs + bluezflags + ["-lgps"]) ++env.Depends(compiled_gpsdlib, [compiled_gpslib]) libraries = [compiled_gpslib, compiled_gpsdlib] @@ -58,12 +59,12 @@ index a050f38..53f697d 100644 gpsctl = env.Program('gpsctl', ['gpsctl.c'], LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs) -env.Depends(gpsctl, [compiled_gpslib]) -+env.Depends(gpsctl, [compiled_gpslib, compiled_gpslib]) ++env.Depends(gpsctl, [compiled_gpsdlib, compiled_gpslib]) gpsmon = env.Program('gpsmon', gpsmon_sources, LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs + ncurseslibs) -env.Depends(gpsmon, [compiled_gpslib]) -+env.Depends(gpsmon, [compiled_gpslib, compiled_gpslib]) ++env.Depends(gpsmon, [compiled_gpsdlib, compiled_gpslib]) gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs) env.Depends(gpsdctl, compiled_gpslib) diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch b/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch new file mode 100644 index 0000000..2477d30 --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch @@ -0,0 +1,12 @@ +don't always rebuild this header as it won't change between compile & install + +--- a/SConstruct ++++ b/SConstruct +@@ -1174,7 +1174,6 @@ + f.close() + timebase = env.Command(target="timebase.h", + source=["leapseconds.cache"], action=timebase_h) +-env.AlwaysBuild(timebase) + + env.Textfile(target="gpsd_config.h", source=confdefs) + env.Textfile(target="gpsd.h", source=[File("gpsd.h-head"), File("gpsd_config.h"), File("gpsd.h-tail")]) diff --git a/sci-geosciences/gpsd/gpsd-3.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild index e6f3172..bc6e7eb 100644 --- a/sci-geosciences/gpsd/gpsd-3.15.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.15.ebuild @@ -73,6 +73,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch + epatch "${FILESDIR}"/${PN}-3.15-timebase.patch epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740 # Avoid useless -L paths to the install dir diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild index 5928f17..18ad0f6 100644 --- a/sci-geosciences/gpsd/gpsd-3.16.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild @@ -73,6 +73,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch + epatch "${FILESDIR}"/${PN}-3.15-timebase.patch epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740 # Avoid useless -L paths to the install dir @@ -82,8 +83,6 @@ src_prepare() { sed -e 's:libusb.h:libusb-1.0/libusb.h:' -i driver_garmin.c || die - eapply_user - use python && distutils-r1_src_prepare }