diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-05-09 14:47:31 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-05-09 15:44:52 -0400 |
| commit | c806f3c116e0bcd4aae79ad074eeec981ee963a9 (patch) | |
| tree | 251b2dd5c26b4da5b7a14941c53f37036c272e73 /sci-geosciences/gpsd | |
| parent | sys-libs/libseccomp: stable arm for bug #581440 (diff) | |
| download | gentoo-c806f3c116e0bcd4aae79ad074eeec981ee963a9.tar.gz gentoo-c806f3c116e0bcd4aae79ad074eeec981ee963a9.tar.bz2 gentoo-c806f3c116e0bcd4aae79ad074eeec981ee963a9.zip | |
sci-geosciences/gpsd: fix parallel build #577432
Diffstat (limited to 'sci-geosciences/gpsd')
| -rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch | 7 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch | 12 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/gpsd-3.15.ebuild | 1 | ||||
| -rw-r--r-- | 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 b8d2cf02ee8b..77ba8a7966f6 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 000000000000..2477d30ce6cc --- /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 e6f317299729..bc6e7eb46be1 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 5928f17d0409..18ad0f640bdd 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 } |