diff -r c25ebb5bc2d6 -r 1a5e995a710b jdk/make/sun/xawt/Makefile --- a/jdk/make/sun/xawt/Makefile Thu May 27 08:53:45 2010 -0700 +++ b/jdk/make/sun/xawt/Makefile Fri May 28 11:37:44 2010 -0700 @@ -49,6 +49,11 @@ LDFLAGS += -L$(OPENWIN_LIB) +# For Xrender extension. +ifeq ($(PLATFORM), solaris) +LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR) +endif + ifeq ($(PLATFORM), linux) LDFLAGS += -lpthread dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) @@ -88,7 +93,7 @@ vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 -OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ +OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender -ldl \ $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi ifeq ($(PLATFORM), solaris) @@ -122,7 +127,7 @@ -I$(PLATFORM_SRC)/native/sun/awt/medialib \ -I$(PLATFORM_SRC)/native/sun/font \ -I$(SHARE_SRC)/native/sun/awt \ - -I$(PLATFORM_SRC)/native/sun/awt + -I$(PLATFORM_SRC)/native/sun/awt ifeq ($(PLATFORM), linux) # Allows for builds on Debian GNU Linux, X11 is in a different place