From d88a33329aabd68b25b510e0c02fd4bccbdf434d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xerxes=20R=C3=A5nby?= <xerxes@zafena.se>
Date: Wed, 5 Sep 2012 10:29:12 +0200
Subject: [PATCH] Add a non-versioned SONAME to Avian libjvm.so that matches
 the Hotspot Server/Client libjvm.so SONAME, this allow libjava.so in OpenJDK
 7 to find the Avian libjvm.so during ldopen.

---
 makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/makefile b/makefile
index 7782850780..d84cd678e3 100755
--- a/makefile
+++ b/makefile
@@ -223,6 +223,7 @@ build-lflags = -lz -lpthread -ldl
 
 lflags = $(common-lflags) -lpthread -ldl
 
+soname-flag = -Wl,-soname -Wl,$(so-prefix)jvm$(so-suffix)
 version-script-flag = -Wl,--version-script=openjdk.ld
 
 build-system = posix
@@ -1160,7 +1161,8 @@ ifdef msvc
 		-IMPLIB:$(build)/$(name).lib -MANIFESTFILE:$(@).manifest
 	$(mt) -manifest $(@).manifest -outputresource:"$(@);2"
 else
-	$(ld) $(^) $(version-script-flag)	$(shared) $(lflags) $(bootimage-lflags) \
+	$(ld) $(^) $(version-script-flag) $(soname-flag) \
+		$(shared) $(lflags) $(bootimage-lflags) \
 		-o $(@)
 endif
 	$(strip) $(strip-all) $(@)