Группа :: Разработка/Прочее
Пакет: java-1.8.0-openjdk
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: java-1.8.0-openjdk-alt-link.patch
Скачать
Скачать
--- openjdk/jdk/make/lib/Awt2dLibraries.gmk.orig 2021-02-03 21:23:20.416365941 +0300
+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk 2021-02-03 21:25:01.264667945 +0300
@@ -746,7 +746,7 @@
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) -ljpeg, \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS := $(RC_FLAGS) \
-D "JDK_FNAME=jpeg.dll" \
--- openjdk/jdk/make/CompileLaunchers.gmk.orig 2021-02-03 21:23:41.445428909 +0300
+++ openjdk/jdk/make/CompileLaunchers.gmk 2021-02-03 21:26:58.054017692 +0300
@@ -464,7 +464,8 @@
# binary (at least on linux) which causes the size to differ between old and new build.
ifeq ($(USE_EXTERNAL_LIBZ), true)
UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
- UNPACKEXE_ZIPOBJS := -lz
+ UNPACKEXE_ZIPOBJS :=
+ UNPACKEXE_LDFLAGS_SUFFIX := -lz
else
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib
UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
@@ -526,7 +527,7 @@
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_linux := -lc, \
LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
- LDFLAGS_SUFFIX := $(LIBCXX), \
+ LDFLAGS_SUFFIX := $(LIBCXX) $(UNPACKEXE_LDFLAGS_SUFFIX), \
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
PROGRAM := unpack200, \