components/runtime/openjdk-8/patches/0007-patch-common_autoconf_spec.gmk.in.patch

   1 $NetBSD: patch-common_autoconf_spec.gmk.in,v 1.4 2015/06/10 13:29:57 tnn Exp $
   2
   3 --- common/autoconf/spec.gmk.in.orig    2015-06-10 10:29:06.000000000 +0000
   4 +++ common/autoconf/spec.gmk.in
   5 @@ -352,7 +352,8 @@ LD:=@FIXPATH@ @LD@
   6  USING_BROKEN_SUSE_LD:=@USING_BROKEN_SUSE_LD@
   7
   8  # LDFLAGS used to link the jdk native libraries (C-code)
   9 -LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
  10 +# Do not use -Wl,-R here. The build system chokes on "," in LDFLAGS. -Xlinker works.
  11 +LDFLAGS_JDKLIB:=-Xlinker -R\$$$$ORIGIN/server  @LDFLAGS_JDKLIB@
  12  LDFLAGS_JDKLIB_SUFFIX:=@LDFLAGS_JDKLIB_SUFFIX@
  13
  14  # On some platforms the linker cannot be used to create executables, thus
  15 @@ -360,7 +361,7 @@ LDFLAGS_JDKLIB_SUFFIX:=@LDFLAGS_JDKLIB_S
  16  LDEXE:=@FIXPATH@ @LDEXE@
  17
  18  # LDFLAGS used to link the jdk native launchers (C-code)
  19 -LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
  20 +LDFLAGS_JDKEXE:=-Xlinker -R\$$$$ORIGIN/server @LDFLAGS_JDKEXE@
  21  LDFLAGS_JDKEXE_SUFFIX:=@LDFLAGS_JDKEXE_SUFFIX@
  22
  23  # LDFLAGS specific to C++ linking.
  24 @@ -449,7 +450,7 @@ JAVA_SMALL=@FIXPATH@ $(BOOT_JDK)/bin/jav
  25  JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac
  26  # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
  27  # overriding that value by using ?=.
  28 -JAVAC_FLAGS?=@JAVAC_FLAGS@
  29 +JAVAC_FLAGS?=@JAVAC_FLAGS@ -encoding UTF-8 -verbose
  30
  31  JAVAH=@FIXPATH@ $(BOOT_JDK)/bin/javah
  32