From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Korsgaard Date: Sun, 26 Nov 2017 22:29:16 +0100 Subject: [Buildroot] [git commit branch/2017.08.x] mesa3d: fix build with BR2_SHARED_STATIC_LIBS Message-ID: <20171126213856.C49D1802C8@busybox.osuosl.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net commit: https://git.buildroot.net/buildroot/commit/?id=362b716f8f88a9e8ca8e4f529b9a3bfe35de9175 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2017.08.x mesa3d does not allow to enable both static and shared libraries so if BR2_SHARED_STATIC_LIBS is set, disable static Fixes https://bugs.busybox.net/show_bug.cgi?id=10326 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit dd09d500aa6972808b2549e4b8c7fa4e396ca91f) Signed-off-by: Peter Korsgaard --- package/mesa3d/mesa3d.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 1654046..3b2858b 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -26,6 +26,12 @@ MESA3D_DEPENDENCIES = \ # Disable assembly usage. MESA3D_CONF_OPTS = --disable-asm +# Disable static, otherwise configure will fail with: "Cannot enable both static +# and shared." +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +MESA3D_CONF_OPTS += --disable-static +endif + # The Sourcery MIPS toolchain has a special (non-upstream) feature to # have "compact exception handling", which unfortunately breaks with # mesa3d, so we disable it here by passing -mno-compact-eh.