From 8044e3ede91508ddd75d0656e7d17e096e399aa3 Mon Sep 17 00:00:00 2001 From: erikj Date: Thu, 13 Jun 2013 14:04:54 +0200 Subject: [PATCH] 8014231: --with-alsa configuration options don't add include or lib directories to proper flags Reviewed-by: tbell --- makefiles/CompileNativeLibraries.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibraries.gmk index 6197baa91..eb2d2648a 100644 --- a/makefiles/CompileNativeLibraries.gmk +++ b/makefiles/CompileNativeLibraries.gmk @@ -2916,7 +2916,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA,\ PLATFORM_API_LinuxOS_ALSA_Ports.c,\ LANG:=C,\ OPTIMIZATION:=LOW, \ - CFLAGS:=$(CFLAGS_JDKLIB) \ + CFLAGS:=$(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \ $(LIBJSOUND_CFLAGS) \ -DUSE_DAUDIO=TRUE \ -DUSE_PORTS=TRUE \ @@ -2925,7 +2925,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA,\ MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \ LDFLAGS:=$(LDFLAGS_JDKLIB)\ $(call SET_SHARED_LIBRARY_ORIGIN),\ - LDFLAGS_SUFFIX:=-lasound -ljava -ljvm,\ + LDFLAGS_SUFFIX:=$(ALSA_LIBS) -ljava -ljvm,\ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundalsa,\ DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) -- GitLab