From 3ec939e915210b5db455bccd595b51eb61eec3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 30 Oct 2018 19:28:25 +0100 Subject: [PATCH] bristol: Fix crosscompile QA warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../bristol/bristol_0.60.11.bb | 1 + .../0004-Avoid-crosscompile-warnings.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 recipes-misc/recipes-multimedia/bristol/files/0004-Avoid-crosscompile-warnings.patch diff --git a/recipes-misc/recipes-multimedia/bristol/bristol_0.60.11.bb b/recipes-misc/recipes-multimedia/bristol/bristol_0.60.11.bb index d681481f..102693f0 100644 --- a/recipes-misc/recipes-multimedia/bristol/bristol_0.60.11.bb +++ b/recipes-misc/recipes-multimedia/bristol/bristol_0.60.11.bb @@ -18,6 +18,7 @@ SRC_URI = " \ file://0001-Do-not-force-sse.patch \ file://0002-Do-not-include-alsa-iatomic.h.patch \ file://0003-bristoljackstats-do-not-overwrite-LDFLAGS.patch \ + file://0004-Avoid-crosscompile-warnings.patch \ " SRC_URI[md5sum] = "9ea4dacdac0dba3048156e2f6a5ee4d6" SRC_URI[sha256sum] = "7d1f0bbd0d7d303fc77c6b9549b61708d7a83b4dc007818011b1f55d1fa922ba" diff --git a/recipes-misc/recipes-multimedia/bristol/files/0004-Avoid-crosscompile-warnings.patch b/recipes-misc/recipes-multimedia/bristol/files/0004-Avoid-crosscompile-warnings.patch new file mode 100644 index 00000000..be4199c0 --- /dev/null +++ b/recipes-misc/recipes-multimedia/bristol/files/0004-Avoid-crosscompile-warnings.patch @@ -0,0 +1,33 @@ +From f767f062beeedc014584e0d9d0aa70090b774941 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 30 Oct 2018 11:24:13 +0100 +Subject: [PATCH] Avoid crosscompile warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| ld: warning: library search path "/usr/X11R6/lib" is unsafe for cross-compilation + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + brighton/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/brighton/Makefile.am b/brighton/Makefile.am +index 274adc2..e900c62 100755 +--- a/brighton/Makefile.am ++++ b/brighton/Makefile.am +@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign + AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRIGHTON_HAS_X11@ -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ + + bin_PROGRAMS = brighton +-brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L/usr/X11R6/lib -L../libbvg ++brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L../libbvg + brighton_LDADD = -lbrighton -lbvg @BRIGHTON_LIBB11@ @BRIGHTON_LIBX11@ @BRIGHTON_LIBXEXT@ -lbristolmidi @ALSA_LIBS@ -lm -lpthread + + brighton_SOURCES = brightonArp2600.c brightonAxxe.c brighton.c brightonControllers.c brightonDX.c brightonExplorer.c brightonHammondB3.c brightonHammond.c brightonJuno.c brightonMemoryMoog.c brightonMini.c brightonMixer.c brightonMixerMemory.c brightonMixerMenu.c brightonMS20.c brightonOBXa.c brightonOBX.c brightonOdyssey.c brightonPoly6.c brightonPoly.c brightonProphet10.c brightonProphet52.c brightonProphet.c brightonRhodesBass.c brightonRhodes.c brightonRoutines.c brightonSAks.c brightonVox.c brightonKeyboards.h brightonKeys.h brightonMini.h brightonMixer.h brightonMixerMemory.h brightonhelp.h brightonSolina.c brightonRoadRunner.c brightonGranular.c brightonRealistic.c brightonVoxM2.c brightonJupiter.c brightonBitOne.c brightonMaster.c brightonCS80.c brightonProOne.c brightonVoyager.c brightonSonic6.c brightonTrilogy.c brightonStratus.c brightonPoly800.c brightonBME700.c brightonBassMaker.c brightonSID.c brightonSID2.c brightonSID2.h brightonreadme.h brightonCLI.c brightonVImages.h +-- +2.14.5 +