mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
33 lines
1.4 KiB
Plaintext
33 lines
1.4 KiB
Plaintext
$NetBSD: patch-common_autoconf_spec.gmk.in,v 1.4 2015/06/10 13:29:57 tnn Exp $
|
|
|
|
--- common/autoconf/spec.gmk.in.orig 2015-06-10 10:29:06.000000000 +0000
|
|
+++ common/autoconf/spec.gmk.in
|
|
@@ -352,7 +352,8 @@ LD:=@FIXPATH@ @LD@
|
|
USING_BROKEN_SUSE_LD:=@USING_BROKEN_SUSE_LD@
|
|
|
|
# LDFLAGS used to link the jdk native libraries (C-code)
|
|
-LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
|
|
+# Do not use -Wl,-R here. The build system chokes on "," in LDFLAGS. -Xlinker works.
|
|
+LDFLAGS_JDKLIB:=-Xlinker -R@prefix@/java/openjdk8/jre/lib@OPENJDK_TARGET_CPU_LIBDIR@ -Xlinker -R@prefix@/java/openjdk8/jre/lib@OPENJDK_TARGET_CPU_LIBDIR@/server @LDFLAGS_JDKLIB@
|
|
LDFLAGS_JDKLIB_SUFFIX:=@LDFLAGS_JDKLIB_SUFFIX@
|
|
|
|
# On some platforms the linker cannot be used to create executables, thus
|
|
@@ -360,7 +361,7 @@ LDFLAGS_JDKLIB_SUFFIX:=@LDFLAGS_JDKLIB_S
|
|
LDEXE:=@FIXPATH@ @LDEXE@
|
|
|
|
# LDFLAGS used to link the jdk native launchers (C-code)
|
|
-LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
|
|
+LDFLAGS_JDKEXE:=-Xlinker -R@prefix@/java/openjdk8/jre/lib@OPENJDK_TARGET_CPU_LIBDIR@/jli @LDFLAGS_JDKEXE@
|
|
LDFLAGS_JDKEXE_SUFFIX:=@LDFLAGS_JDKEXE_SUFFIX@
|
|
|
|
# LDFLAGS specific to C++ linking.
|
|
@@ -449,7 +450,7 @@ JAVA_SMALL=@FIXPATH@ $(BOOT_JDK)/bin/jav
|
|
JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac
|
|
# Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
|
|
# overriding that value by using ?=.
|
|
-JAVAC_FLAGS?=@JAVAC_FLAGS@
|
|
+JAVAC_FLAGS?=@JAVAC_FLAGS@ -encoding UTF-8 -verbose
|
|
|
|
JAVAH=@FIXPATH@ $(BOOT_JDK)/bin/javah
|
|
|