diff options
| author |   Sam James <sam@gentoo.org> | 2021-11-26 04:46:55 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-11-26 05:11:24 +0000 |
| commit | 413d7d28cfa04ff1d59688563ffeb432b7e5d381 (patch) | |
| tree | c4924be6293763bda3549b4bf5d6d9776edc97ab /media-radio/direwolf | |
| parent | sci-libs/indilib: backport test skip to 1.9.2 (diff) | |
| download | gentoo-413d7d28cfa04ff1d59688563ffeb432b7e5d381.tar.gz gentoo-413d7d28cfa04ff1d59688563ffeb432b7e5d381.tar.bz2 gentoo-413d7d28cfa04ff1d59688563ffeb432b7e5d381.zip | |
media-radio/direwolf: respect AR, CC, and LDFLAGS
Bug: https://bugs.gentoo.org/807664
Closes: https://bugs.gentoo.org/750911
Closes: https://bugs.gentoo.org/750914
Closes: https://bugs.gentoo.org/750935
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-radio/direwolf')
| -rw-r--r-- | media-radio/direwolf/direwolf-1.5-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-radio/direwolf/files/direwolf-1.5-respect-AR.patch | 22 | ||||
| -rw-r--r-- | media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch | 22 |
3 files changed, 48 insertions, 0 deletions
diff --git a/media-radio/direwolf/direwolf-1.5-r1.ebuild b/media-radio/direwolf/direwolf-1.5-r1.ebuild index ee2fa3ecbbd6..deef4a8a736a 100644 --- a/media-radio/direwolf/direwolf-1.5-r1.ebuild +++ b/media-radio/direwolf/direwolf-1.5-r1.ebuild @@ -30,6 +30,8 @@ INSTALLDIR="${D}" src_prepare() { eapply "${FILESDIR}/${PV}-makefile.patch" eapply "${FILESDIR}/direwolf-gpsd-API-9.patch" + eapply "${FILESDIR}/direwolf-1.5-respect-LDFLAGS.patch" + eapply "${FILESDIR}/direwolf-1.5-respect-AR.patch" eapply_user @@ -47,6 +49,8 @@ src_prepare() { } src_compile() { + tc-export AR CC + emake PKG_CONFIG="$(tc-getPKG_CONFIG)" } diff --git a/media-radio/direwolf/files/direwolf-1.5-respect-AR.patch b/media-radio/direwolf/files/direwolf-1.5-respect-AR.patch new file mode 100644 index 000000000000..1a833cc06ba8 --- /dev/null +++ b/media-radio/direwolf/files/direwolf-1.5-respect-AR.patch @@ -0,0 +1,22 @@ +diff --git a/Makefile.linux b/Makefile.linux +index 3d433bd..bf8ed3d 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -474,7 +474,7 @@ ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a + # UTM, USNG, MGRS conversions. + + geotranz.a : error_string.o mgrs.o polarst.o tranmerc.o ups.o usng.o utm.o +- ar -cr $@ $^ ++ $(AR) -cr $@ $^ + + error_string.o : geotranz/error_string.c + $(CC) $(CFLAGS) -c -o $@ $^ +@@ -502,7 +502,7 @@ utm.o : geotranz/utm.c + # We don't need the others in that same directory. + + misc.a : strlcpy.o strlcat.o +- ar -cr $@ $^ ++ $(AR) -cr $@ $^ + + strlcpy.o : misc/strlcpy.c + $(CC) $(CFLAGS) -I. -c -o $@ $^ diff --git a/media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch b/media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch new file mode 100644 index 000000000000..38dddcc281fd --- /dev/null +++ b/media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch @@ -0,0 +1,22 @@ +diff --git a/Makefile.linux b/Makefile.linux +index 7418a63..3d433bd 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -447,7 +447,7 @@ atest : atest.c demod.o demod_afsk.o demod_psk.o demod_9600.o \ + # Multiple AGWPE network or serial port clients to test TNCs side by side. + + aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.o misc.a +- $(CC) $(CFLAGS) -g -o $@ $^ ++ $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) + + + # Talk to a KISS TNC. +@@ -466,7 +466,7 @@ cm108 : cm108.c textcolor.o misc.a + # Touch Tone to Speech sample application. + + ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a +- $(CC) $(CFLAGS) -g -o $@ $^ ++ $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) + + + # ----------------------------------------- Libraries -------------------------------------------- |