diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-19 22:13:51 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-19 22:13:51 +0000 |
| commit | 75c6d35b751e3ffd470a051d811541b8fac8df20 (patch) | |
| tree | f0d9ee04668d909f2e2b940a1914689584772536 /java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk | |
| parent | - Remove comment [1] (diff) | |
Do not use static libjli for stable/10 and head. This complements PR193009.
Re-apply r381431 while I am here.
Submitted by: Kurt Miller <kurt@intricatesoftware.com>
Diffstat (limited to '')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk index 569229ba5a28..679ce886e7ad 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk @@ -21,7 +21,7 @@ # Solaris still uses OPENWIN_LIB .. LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread else ifeq ($(OPENJDK_TARGET_OS), bsd) -- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -pthread +- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -liconv -pthread + LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread else # .. all other Unixes can use X_LIBS LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread |