On 2018-03-29 00:48, Erik Joelsson wrote:
On 2018-03-28 15:35, Vladimir Kozlov wrote:
Based on history it was done for 6307603 in 2010 and reason is the same:
http://hg.openjdk.java.net/jdk/hs/rev/1a5e995a710b
Is next fix correct?:
make/lib/Awt2dLibraries.gmk
@@ -409,8 +409,8 @@
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
- LDFLAGS_solaris :=
/usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \
+ LIBS_solaris := $(LIBM), \
LIBS_linux := $(LIBM), \
LIBS_macosx := $(LIBM), \
LIBS_aix := $(LIBM),\
or
make/lib/Awt2dLibraries.gmk
@@ -409,11 +409,7 @@
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
- LDFLAGS_solaris :=
/usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
- LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \
- LIBS_linux := $(LIBM), \
- LIBS_macosx := $(LIBM), \
- LIBS_aix := $(LIBM),\
+ LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS) $(LIBM), \
LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
))
I would say the second one is better.
Agree. With this, the fix looks good to me too.
/Magnus
Thanks,
/Erik
Thanks,
Vladimir
Maybe you can/should remove that as well?
/Magnus
