logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

icedtea-jdk-fix-build.patch (2150B)

    

  1. Fixes three issues:
  2.  - so's should not be linked to -ljvm as dlopen(/abs/name) is
  3.    used by the launcher to load libjvm.so; it is thus not available
  4.    (musl/uclibc) ld.so to satisfy NEEDED dependency inserted by
  5.    -ljvm. Fix to not link against -ljvm, and disable -z defs so
  6.    undefined symbols are allowed in sos
  7.  - the previous makes ldd generate errors on unresolved symbols (musl)
  8.    remove it altogether as it's used for informative purposes only
  9.    (display things - not check anything useful)
  10.  - Don't delete the generated directory $(GENCSEXT), this can
  11.    confuse make in highly parallel builds with:
  12.    make[6]: *** INTERNAL: readdir: No such file or directory.  Stop.               
  13.    make[6]: Leaving directory '.../openjdk-boot/jdk/make/sun/nio/cs'     
  15. --- openjdk.orig/jdk/make/common/Defs-linux.gmk
  16. +++ openjdk/jdk/make/common/Defs-linux.gmk
  17. @@ -350,7 +350,7 @@
  18.  
  19.  EXTRA_LIBS += -lc
  20.  
  21. -LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
  22. +LDFLAGS_DEFS_OPTION  =
  23.  LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
  24.  
  25.  #
  26. @@ -407,7 +407,7 @@
  27.  # the library itself should not.
  28.  #
  29.  VM_NAME         = server
  30. -JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
  31. +JVMLIB          =
  32.  JAVALIB         = -ljava $(JVMLIB)
  33.  
  34.  #
  35. --- openjdk.orig/jdk/make/sun/nio/cs/Makefile
  36. +++ openjdk/jdk/make/sun/nio/cs/Makefile
  37. @@ -107,7 +107,7 @@
  38.  		$(GENCSDATASRC)/DoubleByte-X.java.template \
  39.  		$(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs
  40.  	@$(prep-target)
  41. -	$(RM) -r $(GENCSEXT)
  42. +	$(RM) -f "$(GENCSEXT)"/*
  43.  	$(MKDIR) -p $(GENCSEXT)
  44.  	$(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE)	$(GENCSDATASRC) $(GENCSEXT) extsbcs
  45.  	$(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) euctw \
  46. --- openjdk.orig/jdk/make/common/shared/Defs-linux.gmk
  47. +++ openjdk/jdk/make/common/shared/Defs-linux.gmk
  48. @@ -207,8 +207,6 @@
  49.    if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
  50.      $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
  51.    fi && \
  52. -  $(ECHO) "Library loads for: $1" && \
  53. -  $(LDD) $1 && \
  54.    $(ECHO) "RUNPATH for: $1" && \
  55.    ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
  56.  )