Home Explore Help
Sign In
ableton-dir
/
openadk
forked from oss/openadk
1
0
Fork 0
Files
Tree: fabbb1de0c
Branches Tags
openadk
/
package
/
openjdk7
/
patches
/
openadk.patch

openadk.patch 29 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703 
  1. diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in
    2. 

  2. --- icedtea-2.4.7.orig/Makefile.in	2014-04-16 06:20:44.689988653 +0200
    3. 

  3. +++ icedtea-2.4.7/Makefile.in	2014-05-01 13:34:58.421434811 +0200
    4. 

  4. @@ -712,7 +712,7 @@
    5. 

  5.  	$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
    6. 

  6.  
    7. 

  7.  # Bootstrapping patches
    8. 

  8. -ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
    9. 

  9. +ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \
    10. 

  10.  	patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
    11. 

  11.  	patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
    12. 

  12.  	patches/boot/demos.patch patches/boot/fphexconstants.patch \
    13. 

  13. diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk.patch
    14. 

  14. --- icedtea-2.4.7.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
    15. 

  15. +++ icedtea-2.4.7/patches/openadk.patch	2014-05-01 20:04:14.470603940 +0200
    16. 

  16. @@ -0,0 +1,687 @@
    17. 

  17. +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
    18. 

  18. +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2014-01-28 18:58:08.000000000 +0100
    19. 

  19. ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2014-02-10 11:31:48.000000000 +0100
    20. 

  20. +@@ -112,7 +112,6 @@
    21. 

  21. + # include <string.h>
    22. 

  22. + # include <syscall.h>
    23. 

  23. + # include <sys/sysinfo.h>
    24. 

  24. +-# include <gnu/libc-version.h>
    25. 

  25. + # include <sys/ipc.h>
    26. 

  26. + # include <sys/shm.h>
    27. 

  27. + # include <link.h>
    28. 

  28. +@@ -650,9 +649,7 @@
    29. 

  29. +      os::Linux::set_glibc_version(str);
    30. 

  30. +   } else {
    31. 

  31. +      // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
    32. 

  32. +-     static char _gnu_libc_version[32];
    33. 

  33. +-     jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
    34. 

  34. +-              "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
    35. 

  35. ++     static char _gnu_libc_version[32] = "2.9";
    36. 

  36. +      os::Linux::set_glibc_version(_gnu_libc_version);
    37. 

  37. +   }
    38. 

  38. + 
    39. 

  39. +@@ -2951,10 +2948,7 @@
    40. 

  40. + // If we are running with earlier version, which did not have symbol versions,
    41. 

  41. + // we should use the base version.
    42. 

  42. + void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
    43. 

  43. +-  void *f = dlvsym(handle, name, "libnuma_1.1");
    44. 

  44. +-  if (f == NULL) {
    45. 

  45. +-    f = dlsym(handle, name);
    46. 

  46. +-  }
    47. 

  47. ++  void *f = dlsym(handle, name);
    48. 

  48. +   return f;
    49. 

  49. + }
    50. 

  50. + 
    51. 

  51. +@@ -5312,7 +5306,21 @@
    52. 

  52. + // Linux doesn't yet have a (official) notion of processor sets,
    53. 

  53. + // so just return the system wide load average.
    54. 

  54. + int os::loadavg(double loadavg[], int nelem) {
    55. 

  55. +-  return ::getloadavg(loadavg, nelem);
    56. 

  56. ++ FILE *LOADAVG;
    57. 

  57. ++ double avg[3] = { 0.0, 0.0, 0.0 };
    58. 

  58. ++ int i, res = -1;;
    59. 

  59. ++
    60. 

  60. ++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
    61. 

  61. ++ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
    62. 

  62. ++ res = 0;
    63. 

  63. ++ fclose(LOADAVG);
    64. 

  64. ++ }
    65. 

  65. ++
    66. 

  66. ++ for (i = 0; (i < nelem) && (i < 3); i++) {
    67. 

  67. ++ loadavg[i] = avg[i];
    68. 

  68. ++ }
    69. 

  69. ++
    70. 

  70. ++ return res;
    71. 

  71. + }
    72. 

  72. + 
    73. 

  73. + void os::pause() {
    74. 

  74. +diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
    75. 

  75. +--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2014-01-28 18:58:08.000000000 +0100
    76. 

  76. ++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2014-02-10 11:31:48.000000000 +0100
    77. 

  77. +@@ -253,7 +253,7 @@
    78. 

  78. + #elif defined(__APPLE__)
    79. 

  79. + inline int g_isnan(double f) { return isnan(f); }
    80. 

  80. + #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
    81. 

  81. +-inline int g_isnan(float  f) { return isnanf(f); }
    82. 

  82. ++inline int g_isnan(float  f) { return __isnanf(f); }
    83. 

  83. + inline int g_isnan(double f) { return isnan(f); }
    84. 

  84. + #else
    85. 

  85. + #error "missing platform-specific definition here"
    86. 

  86. +@@ -267,8 +267,8 @@
    87. 

  87. + 
    88. 

  88. + // Checking for finiteness
    89. 

  89. + 
    90. 

  90. +-inline int g_isfinite(jfloat  f)                 { return finite(f); }
    91. 

  91. +-inline int g_isfinite(jdouble f)                 { return finite(f); }
    92. 

  92. ++inline int g_isfinite(jfloat  f)                 { return isfinite(f); }
    93. 

  93. ++inline int g_isfinite(jdouble f)                 { return isfinite(f); }
    94. 

  94. + 
    95. 

  95. + 
    96. 

  96. + // Wide characters
    97. 

  97. +diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
    98. 

  98. +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2014-01-28 19:02:26.000000000 +0100
    99. 

  99. ++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2014-02-10 11:31:48.000000000 +0100
    100. 

  100. +@@ -79,7 +79,7 @@
    101. 

  101. +   OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
    102. 

  102. +  endif
    103. 

  103. + else
    104. 

  104. +-  OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
    105. 

  105. ++  CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
    106. 

  106. +   OTHER_LDLIBS += $(JVMLIB)
    107. 

  107. + endif
    108. 

  108. + 
    109. 

  109. +diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
    110. 

  110. +--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile	2014-01-28 19:02:26.000000000 +0100
    111. 

  111. ++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile	2014-02-10 11:31:48.000000000 +0100
    112. 

  112. +@@ -64,7 +64,7 @@
    113. 

  113. + COMPILER_WARNINGS_FATAL=true
    114. 

  114. + endif
    115. 

  115. + #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
    116. 

  116. +-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
    117. 

  117. ++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -ldl
    118. 

  118. + endif
    119. 

  119. + ifeq ($(PLATFORM), solaris)
    120. 

  120. + #LIBSCTP = -lsctp
    121. 

  121. +diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
    122. 

  122. +--- openjdk.orig/jdk/make/common/Defs.gmk	2014-01-28 19:02:26.000000000 +0100
    123. 

  123. ++++ openjdk/jdk/make/common/Defs.gmk	2014-02-10 11:31:48.000000000 +0100
    124. 

  124. +@@ -204,7 +204,7 @@
    125. 

  125. +       ifeq ($(PLATFORM), macosx)
    126. 

  126. +         FREETYPE_HEADERS_PATH = /usr/X11R6/include
    127. 

  127. +       else
    128. 

  128. +-        FREETYPE_HEADERS_PATH = /usr/include
    129. 

  129. ++        FREETYPE_HEADERS_PATH = /usr/include/disabled
    130. 

  130. +       endif
    131. 

  131. +     endif
    132. 

  132. +   endif
    133. 

  133. +diff -Nur openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk
    134. 

  134. +--- openjdk.orig/jdk/make/common/Sanity.gmk	2014-01-28 19:02:26.000000000 +0100
    135. 

  135. ++++ openjdk/jdk/make/common/Sanity.gmk	2014-02-12 12:28:47.000000000 +0100
    136. 

  136. +@@ -91,8 +91,7 @@
    137. 

  137. +     sane-ld_run_path \
    138. 

  138. +     sane-alt_bootdir \
    139. 

  139. +     sane-bootdir \
    140. 

  140. +-    sane-local-bootdir \
    141. 

  141. +-    sane-alsa-headers
    142. 

  142. ++    sane-local-bootdir
    143. 

  143. + 
    144. 

  144. + ifdef OPENJDK
    145. 

  145. + sanity-all:: sane-freetype 
    146. 

  146. +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
    147. 

  147. +--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2014-01-28 19:02:26.000000000 +0100
    148. 

  148. ++++ openjdk/jdk/make/common/shared/Platform.gmk	2014-02-10 11:32:16.000000000 +0100
    149. 

  149. +@@ -160,9 +160,6 @@
    150. 

  150. +   else
    151. 

  151. +     mach := $(shell uname -m)
    152. 

  152. +   endif
    153. 

  153. +-  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
    154. 

  154. +-    mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/')
    155. 

  155. +-  endif
    156. 

  156. +   archExpr = case "$(mach)" in \
    157. 

  157. +                 i[3-9]86) \
    158. 

  158. +                     echo i586 \
    159. 

  159. +diff -Nur openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
    160. 

  160. +--- openjdk.orig/jdk/make/common/shared/Sanity.gmk	2014-01-28 19:02:26.000000000 +0100
    161. 

  161. ++++ openjdk/jdk/make/common/shared/Sanity.gmk	2014-02-12 12:31:12.000000000 +0100
    162. 

  162. +@@ -114,11 +114,6 @@
    163. 

  163. +     elif [ -f /etc/lsb-release ] ; then \
    164. 

  164. +       $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
    165. 

  165. +     fi)
    166. 

  166. +-  ALSA_INCLUDE=/usr/include/alsa/version.h
    167. 

  167. +-  ALSA_LIBRARY=/usr/lib/libasound.so
    168. 

  168. +-  _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
    169. 

  169. +-           $(SED) -e 's@.*"\(.*\)".*@\1@' )
    170. 

  170. +-  ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
    171. 

  171. + endif
    172. 

  172. + 
    173. 

  173. + ifeq ($(PLATFORM), macosx)
    174. 

  174. +@@ -225,7 +220,6 @@
    175. 

  175. + 	sane-compiler \
    176. 

  176. + 	sane-link \
    177. 

  177. + 	sane-cacerts \
    178. 

  178. +-	sane-alsa-headers \
    179. 

  179. + 	sane-ant_version \
    180. 

  180. + 	sane-zip_version \
    181. 

  181. + 	sane-unzip_version \
    182. 

  182. +@@ -1381,34 +1375,6 @@
    183. 

  183. +   endif
    184. 

  184. + endif
    185. 

  185. + 
    186. 

  186. +-######################################################
    187. 

  187. +-# Check that ALSA headers and libs are installed and 
    188. 

  188. +-# that the header has the right version. We only
    189. 

  189. +-# need /usr/include/alsa/version.h and /usr/lib/libasound.so
    190. 

  190. +-######################################################
    191. 

  191. +-
    192. 

  192. +-ifdef REQUIRED_ALSA_VERSION
    193. 

  193. +-  ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
    194. 

  194. +-endif
    195. 

  195. +-sane-alsa-headers:
    196. 

  196. +-ifdef REQUIRED_ALSA_VERSION
    197. 

  197. +-	@if [ "$(ALSA_CHECK)" != "missing" ] ; then \
    198. 

  198. +-	    if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer"  ] ; then \
    199. 

  199. +-		$(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \
    200. 

  200. +-		"      You have the following ALSA version installed: $${alsa_version} \n" \
    201. 

  201. +-		"      Please reinstall ALSA (drivers and lib). You can download \n" \
    202. 

  202. +-		"      the source distribution from http://www.alsa-project.org \n" \
    203. 

  203. +-		"      or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
    204. 

  204. +-		"" >> $(ERROR_FILE) ; \
    205. 

  205. +-	    fi ; \
    206. 

  206. +-	else \
    207. 

  207. +-	    $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \
    208. 

  208. +-	    "      Please install ALSA (drivers and lib). You can download the \n" \
    209. 

  209. +-	    "      source distribution from http://www.alsa-project.org or go to \n" \
    210. 

  210. +-	    "      http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
    211. 

  211. +-	    "" >> $(ERROR_FILE) ; \
    212. 

  212. +-	fi
    213. 

  213. +-endif
    214. 

  214. + 
    215. 

  215. + # If a sanity file doesn't exist, just make sure it's dir exists
    216. 

  216. + $(SANITY_FILES):
    217. 

  217. +diff -Nur openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile
    218. 

  218. +--- openjdk.orig/jdk/make/java/instrument/Makefile	2014-01-28 19:02:26.000000000 +0100
    219. 

  219. ++++ openjdk/jdk/make/java/instrument/Makefile	2014-02-10 11:31:49.000000000 +0100
    220. 

  220. +@@ -140,6 +140,8 @@
    221. 

  221. + # We don't want to link against -ljava
    222. 

  222. + JAVALIB=
    223. 

  223. + 
    224. 

  224. ++OTHER_LDLIBS += -liconv
    225. 

  225. ++
    226. 

  226. + #
    227. 

  227. + # Add to ambient vpath so we pick up the library files
    228. 

  228. + #
    229. 

  229. +diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
    230. 

  230. +--- openjdk.orig/jdk/make/java/net/Makefile	2014-01-28 19:02:26.000000000 +0100
    231. 

  231. ++++ openjdk/jdk/make/java/net/Makefile	2014-02-10 11:31:49.000000000 +0100
    232. 

  232. +@@ -25,7 +25,7 @@
    233. 

  233. + 
    234. 

  234. + BUILDDIR = ../..
    235. 

  235. + PACKAGE = java.net
    236. 

  236. +-LIBRARY = net
    237. 

  237. ++LIBRARY = javanet
    238. 

  238. + PRODUCT = sun
    239. 

  239. + include $(BUILDDIR)/common/Defs.gmk
    240. 

  240. + 
    241. 

  241. +diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
    242. 

  242. +--- openjdk.orig/jdk/make/java/nio/Makefile	2014-01-28 19:02:26.000000000 +0100
    243. 

  243. ++++ openjdk/jdk/make/java/nio/Makefile	2014-02-10 11:31:49.000000000 +0100
    244. 

  244. +@@ -373,7 +373,7 @@
    245. 

  245. + endif
    246. 

  246. + 
    247. 

  247. + ifeq ($(PLATFORM), linux)
    248. 

  248. +-  OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
    249. 

  249. ++  OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread $(LIBDL)
    250. 

  250. +   ifdef USE_SYSTEM_GIO
    251. 

  251. +     OTHER_LDLIBS += $(GIO_LIBS)
    252. 

  252. +     OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
    253. 

  253. +@@ -927,7 +927,7 @@
    254. 

  254. + 
    255. 

  255. + $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
    256. 

  256. + 	$(prep-target)
    257. 

  257. +-	($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \
    258. 

  258. ++	($(CD) $(TEMPDIR); $(HOST_CC) $(CPPFLAGS_FOR_BUILD) $(LDDFLAGS) \
    259. 

  259. + 	   -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
    260. 

  260. + 
    261. 

  261. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    262. 

  262. +@@ -963,7 +963,7 @@
    263. 

  263. + 
    264. 

  264. + $(GENUC_EXE) : $(GENUC_SRC)
    265. 

  265. + 	$(prep-target)
    266. 

  266. +-	$(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
    267. 

  267. ++	$(HOST_CC) $(CPPFLAGS_FOR_BUILD) -o $@ $(GENUC_SRC)
    268. 

  268. + 
    269. 

  269. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    270. 

  270. + $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
    271. 

  271. +diff -Nur openjdk.orig/jdk/make/java/npt/Makefile openjdk/jdk/make/java/npt/Makefile
    272. 

  272. +--- openjdk.orig/jdk/make/java/npt/Makefile	2014-01-28 19:02:26.000000000 +0100
    273. 

  273. ++++ openjdk/jdk/make/java/npt/Makefile	2014-02-10 11:31:49.000000000 +0100
    274. 

  274. +@@ -64,6 +64,8 @@
    275. 

  275. + # We don't want to link against -ljava
    276. 

  276. + JAVALIB=
    277. 

  277. + 
    278. 

  278. ++OTHER_LDLIBS += -liconv
    279. 

  279. ++
    280. 

  280. + # Add -export options to explicitly spell exported symbols
    281. 

  281. + ifeq ($(PLATFORM), windows)
    282. 

  282. +   OTHER_LCF += -export:nptInitialize -export:nptTerminate
    283. 

  283. +diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
    284. 

  284. +--- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2014-01-28 19:02:26.000000000 +0100
    285. 

  285. ++++ openjdk/jdk/make/sun/awt/mawt.gmk	2014-02-10 11:31:49.000000000 +0100
    286. 

  286. +@@ -151,22 +151,6 @@
    287. 

  287. + #endif
    288. 

  288. + 
    289. 

  289. + LIBXTST = -lXtst
    290. 

  290. +-ifeq ($(PLATFORM), linux)
    291. 

  291. +-   ifeq ($(ARCH_DATA_MODEL), 64)
    292. 

  292. +-   # XXX what about the rest of them?
    293. 

  293. +-        LIBXT = -lXt
    294. 

  294. +-    else
    295. 

  295. +-    # Allows for builds on Debian GNU Linux, X11 is in a different place 
    296. 

  296. +-       LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
    297. 

  297. +-                        $(wildcard /usr/lib/libXt.a))
    298. 

  298. +-       LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
    299. 

  299. +-                        $(wildcard /usr/lib/libSM.a))
    300. 

  300. +-       LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
    301. 

  301. +-                         $(wildcard /usr/lib/libICE.a))
    302. 

  302. +-       LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
    303. 

  303. +-                         $(wildcard /usr/lib/libXtst.a))
    304. 

  304. +-   endif
    305. 

  305. +-endif
    306. 

  306. + 
    307. 

  307. + # Use -lXmu for EditRes support
    308. 

  308. + LIBXMU_DBG	= -lXmu
    309. 

  309. +@@ -181,7 +165,7 @@
    310. 

  310. + OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
    311. 

  311. + # XXX what is this define below? Isn't it motif-related?
    312. 

  312. + OTHER_CFLAGS += -DXMSTRINGDEFINES=1
    313. 

  313. +-OTHER_LDLIBS =  $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
    314. 

  314. ++OTHER_LDLIBS =  $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lX11 -lXi
    315. 

  315. + endif
    316. 

  316. + 
    317. 

  317. + endif
    318. 

  318. +@@ -230,11 +214,6 @@
    319. 

  319. +   CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
    320. 

  320. + endif
    321. 

  321. + 
    322. 

  322. +-ifndef HEADLESS
    323. 

  323. +-CPPFLAGS += -I$(OPENWIN_HOME)/include 
    324. 

  324. +-LDFLAGS  += -L$(OPENWIN_LIB)
    325. 

  325. +-
    326. 

  326. +-endif # !HEADLESS
    327. 

  327. + 
    328. 

  328. + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
    329. 

  329. +             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
    330. 

  330. +@@ -269,11 +248,6 @@
    331. 

  331. + endif # !HEADLESS
    332. 

  332. + endif # PLATFORM
    333. 

  333. + 
    334. 

  334. +-ifeq ($(PLATFORM), linux)
    335. 

  335. +-  # Checking for the X11/extensions headers at the additional location
    336. 

  336. +-  CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
    337. 

  337. +-                        $(wildcard /usr/include/X11/extensions))
    338. 

  338. +-endif
    339. 

  339. + 
    340. 

  340. + ifeq ($(PLATFORM), macosx))
    341. 

  341. +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
    342. 

  342. +diff -Nur openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
    343. 

  343. +--- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2014-01-28 19:02:26.000000000 +0100
    344. 

  344. ++++ openjdk/jdk/make/sun/splashscreen/Makefile	2014-02-10 11:31:50.000000000 +0100
    345. 

  345. +@@ -55,6 +55,8 @@
    346. 

  346. + 
    347. 

  347. + JAVALIB=
    348. 

  348. + 
    349. 

  349. ++OTHER_LDLIBS += -liconv
    350. 

  350. ++
    351. 

  351. + #
    352. 

  352. + # C Flags
    353. 

  353. + #
    354. 

  354. +diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
    355. 

  355. +--- openjdk.orig/jdk/make/sun/xawt/Makefile	2014-01-28 19:02:26.000000000 +0100
    356. 

  356. ++++ openjdk/jdk/make/sun/xawt/Makefile	2014-02-10 11:31:50.000000000 +0100
    357. 

  357. +@@ -292,16 +292,10 @@
    358. 

  358. + SIZERS = $(SIZER).32
    359. 

  359. + SIZERS_C = $(SIZER_32_C)
    360. 

  360. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
    361. 

  361. +-ifdef CROSS_COMPILE_ARCH
    362. 

  362. +-CFLAGS_32 = -m32
    363. 

  363. +-endif
    364. 

  364. + else # !32
    365. 

  365. + SIZERS = $(SIZER).64
    366. 

  366. + SIZERS_C = $(SIZER_64_C)
    367. 

  367. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
    368. 

  368. +-ifdef CROSS_COMPILE_ARCH
    369. 

  369. +-CFLAGS_64 = -m64
    370. 

  370. +-endif
    371. 

  371. + endif # 32
    372. 

  372. + endif # !macosx
    373. 

  373. + endif # solaris
    374. 

  374. +@@ -337,11 +331,7 @@
    375. 

  375. + WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
    376. 

  376. + XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
    377. 

  377. + 
    378. 

  378. +-ifndef CROSS_COMPILE_ARCH
    379. 

  379. +-SIZERS_CC = $(CC)
    380. 

  380. +-else
    381. 

  381. +-SIZERS_CC = $(HOST_CC)
    382. 

  382. +-endif
    383. 

  383. ++SIZERS_CC = $(CC) -static
    384. 

  384. + 
    385. 

  385. + $(SIZERS): $(SIZERS_C) 
    386. 

  386. + 	$(prep-target)
    387. 

  387. +@@ -364,7 +354,7 @@
    388. 

  388. + 	    $(CHMOD) +w $@;\
    389. 

  389. + 	else	\
    390. 

  390. + 	    $(ECHO) GENERATING $@; \
    391. 

  391. +-	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    392. 

  392. ++	    $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    393. 

  393. + 	fi
    394. 

  394. + 	@if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
    395. 

  395. + 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
    396. 

  396. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
    397. 

  397. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2014-01-28 19:02:26.000000000 +0100
    398. 

  398. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2014-02-10 11:31:50.000000000 +0100
    399. 

  399. +@@ -69,7 +69,7 @@
    400. 

  400. +      */
    401. 

  401. +     static {
    402. 

  402. +         java.security.AccessController.doPrivileged(
    403. 

  403. +-                  new sun.security.action.LoadLibraryAction("net"));
    404. 

  404. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    405. 

  405. +     }
    406. 

  406. + 
    407. 

  407. +     /**
    408. 

  408. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
    409. 

  409. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2014-01-28 19:02:26.000000000 +0100
    410. 

  410. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2014-02-10 11:31:50.000000000 +0100
    411. 

  411. +@@ -78,7 +78,7 @@
    412. 

  412. +      */
    413. 

  413. +     static {
    414. 

  414. +         java.security.AccessController.doPrivileged(
    415. 

  415. +-                  new sun.security.action.LoadLibraryAction("net"));
    416. 

  416. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    417. 

  417. +     }
    418. 

  418. + 
    419. 

  419. +     /**
    420. 

  420. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
    421. 

  421. +--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java	2014-01-28 19:02:26.000000000 +0100
    422. 

  422. ++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java	2014-02-10 11:31:50.000000000 +0100
    423. 

  423. +@@ -47,7 +47,7 @@
    424. 

  424. +      */
    425. 

  425. +     static {
    426. 

  426. +         java.security.AccessController.doPrivileged(
    427. 

  427. +-                  new sun.security.action.LoadLibraryAction("net"));
    428. 

  428. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    429. 

  429. +         init();
    430. 

  430. +     }
    431. 

  431. + 
    432. 

  432. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
    433. 

  433. +--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java	2014-01-28 19:02:26.000000000 +0100
    434. 

  434. ++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java	2014-02-10 11:31:50.000000000 +0100
    435. 

  435. +@@ -267,7 +267,7 @@
    436. 

  436. +     static {
    437. 

  437. +         preferIPv6Address = java.security.AccessController.doPrivileged(
    438. 

  438. +             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
    439. 

  439. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    440. 

  440. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    441. 

  441. +         init();
    442. 

  442. +     }
    443. 

  443. + 
    444. 

  444. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
    445. 

  445. +--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java	2014-01-28 19:02:26.000000000 +0100
    446. 

  446. ++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java	2014-02-10 11:31:50.000000000 +0100
    447. 

  447. +@@ -53,7 +53,7 @@
    448. 

  448. +     private static final int defaultIndex; /* index of defaultInterface */
    449. 

  449. + 
    450. 

  450. +     static {
    451. 

  451. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    452. 

  452. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    453. 

  453. +         init();
    454. 

  454. +         defaultInterface = DefaultInterface.getDefault();
    455. 

  455. +         if (defaultInterface != null) {
    456. 

  456. +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
    457. 

  457. +--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2014-01-28 19:02:26.000000000 +0100
    458. 

  458. ++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2014-02-10 11:31:50.000000000 +0100
    459. 

  459. +@@ -76,6 +76,6 @@
    460. 

  460. + 
    461. 

  461. +     static {
    462. 

  462. +         AccessController.doPrivileged(
    463. 

  463. +-            new sun.security.action.LoadLibraryAction("net"));
    464. 

  464. ++            new sun.security.action.LoadLibraryAction("javanet"));
    465. 

  465. +     }
    466. 

  466. + }
    467. 

  467. +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
    468. 

  468. +--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2014-01-28 19:02:26.000000000 +0100
    469. 

  469. ++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2014-02-10 11:31:50.000000000 +0100
    470. 

  470. +@@ -95,7 +95,7 @@
    471. 

  471. +                 }});
    472. 

  472. +         if (b != null && b.booleanValue()) {
    473. 

  473. +             java.security.AccessController.doPrivileged(
    474. 

  474. +-                      new sun.security.action.LoadLibraryAction("net"));
    475. 

  475. ++                      new sun.security.action.LoadLibraryAction("javanet"));
    476. 

  476. +             hasSystemProxies = init();
    477. 

  477. +         }
    478. 

  478. +     }
    479. 

  479. +diff -Nur openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
    480. 

  480. +--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java	2014-01-28 19:02:26.000000000 +0100
    481. 

  481. ++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java	2014-02-10 11:31:50.000000000 +0100
    482. 

  482. +@@ -483,7 +483,7 @@
    483. 

  483. +                 return;
    484. 

  484. +             loaded = true;
    485. 

  485. +             java.security.AccessController
    486. 

  486. +-                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
    487. 

  487. ++                .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
    488. 

  488. +             java.security.AccessController
    489. 

  489. +                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
    490. 

  490. +             // IOUtil must be initialized; Its native methods are called from
    491. 

  491. +diff -Nur openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
    492. 

  492. +--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-01-28 19:02:26.000000000 +0100
    493. 

  493. ++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-02-10 11:31:50.000000000 +0100
    494. 

  494. +@@ -247,7 +247,7 @@
    495. 

  495. + 
    496. 

  496. +     static {
    497. 

  497. +         java.security.AccessController.doPrivileged(
    498. 

  498. +-            new sun.security.action.LoadLibraryAction("net"));
    499. 

  499. ++            new sun.security.action.LoadLibraryAction("javanet"));
    500. 

  500. +     }
    501. 

  501. + 
    502. 

  502. + }
    503. 

  503. +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c
    504. 

  504. +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2014-01-28 19:02:26.000000000 +0100
    505. 

  505. ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2014-02-10 11:31:50.000000000 +0100
    506. 

  506. +@@ -246,7 +246,8 @@
    507. 

  507. +     if (wcs == NULL)
    508. 

  508. +         return NULL;
    509. 

  509. + 
    510. 

  510. +-    n = len*MB_CUR_MAX + 1;
    511. 

  511. ++    //evil hack for uclibc
    512. 

  512. ++    n = len*1 + 1;
    513. 

  513. + 
    514. 

  514. +     mbs = (char *) malloc(n * sizeof(char));
    515. 

  515. +     if (mbs == NULL) {
    516. 

  516. +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
    517. 

  517. +--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2014-01-28 19:02:26.000000000 +0100
    518. 

  518. ++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c	2014-02-10 11:31:50.000000000 +0100
    519. 

  519. +@@ -27,9 +27,6 @@
    520. 

  520. + #include <X11/Xutil.h>
    521. 

  521. + #include <X11/Xos.h>
    522. 

  522. + #include <X11/Xatom.h>
    523. 

  523. +-#ifdef __linux__
    524. 

  524. +-#include <execinfo.h>
    525. 

  525. +-#endif
    526. 

  526. + 
    527. 

  527. + #include <jvm.h>
    528. 

  528. + #include <jni.h>
    529. 

  529. +@@ -785,25 +782,6 @@
    530. 

  530. +     return ret;
    531. 

  531. + }
    532. 

  532. + 
    533. 

  533. +-#ifdef __linux__
    534. 

  534. +-void print_stack(void)
    535. 

  535. +-{
    536. 

  536. +-  void *array[10];
    537. 

  537. +-  size_t size;
    538. 

  538. +-  char **strings;
    539. 

  539. +-  size_t i;
    540. 

  540. +-
    541. 

  541. +-  size = backtrace (array, 10);
    542. 

  542. +-  strings = backtrace_symbols (array, size);
    543. 

  543. +-
    544. 

  544. +-  fprintf (stderr, "Obtained %zd stack frames.\n", size);
    545. 

  545. +-
    546. 

  546. +-  for (i = 0; i < size; i++)
    547. 

  547. +-     fprintf (stderr, "%s\n", strings[i]);
    548. 

  548. +-
    549. 

  549. +-  free (strings);
    550. 

  550. +-}
    551. 

  551. +-#endif
    552. 

  552. + 
    553. 

  553. + Window get_xawt_root_shell(JNIEnv *env) {
    554. 

  554. +   static jclass classXRootWindow = NULL;
    555. 

  555. +diff -Nur openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
    556. 

  556. +--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-01-28 19:02:26.000000000 +0100
    557. 

  557. ++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-02-10 11:31:50.000000000 +0100
    558. 

  558. +@@ -159,7 +159,7 @@
    559. 

  559. + 
    560. 

  560. +     static {
    561. 

  561. +         java.security.AccessController.doPrivileged(
    562. 

  562. +-            new sun.security.action.LoadLibraryAction("net"));
    563. 

  563. ++            new sun.security.action.LoadLibraryAction("javanet"));
    564. 

  564. +         init0();
    565. 

  565. + 
    566. 

  566. +         // start the address listener thread
    567. 

  567. +diff -Nur openjdk.orig/Makefile openjdk/Makefile
    568. 

  568. +--- openjdk.orig/Makefile	2014-01-17 21:22:44.000000000 +0100
    569. 

  569. ++++ openjdk/Makefile	2014-02-10 11:31:50.000000000 +0100
    570. 

  570. +@@ -53,9 +53,7 @@
    571. 

  571. + REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
    572. 

  572. + REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
    573. 

  573. + 
    574. 

  574. +-ifndef TOPDIR
    575. 

  575. +-  TOPDIR:=.
    576. 

  576. +-endif
    577. 

  577. ++TOPDIR:=.
    578. 

  578. + 
    579. 

  579. + ifndef JDK_TOPDIR
    580. 

  580. +   JDK_TOPDIR=$(TOPDIR)/jdk
    581. 

  581. +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make
    582. 

  582. +--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make	2014-02-20 19:51:45.000000000 +0100
    583. 

  583. ++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make	2014-05-01 20:03:03.677930438 +0200
    584. 

  584. +@@ -288,7 +288,7 @@
    585. 

  585. +   LIBS_VM                  += $(LIBS)
    586. 

  586. + endif
    587. 

  587. + ifeq ($(JVM_VARIANT_ZEROSHARK), true)
    588. 

  588. +-  LIBS_VM   += $(LIBFFI_LIBS) $(LLVM_LIBS)
    589. 

  589. ++  LIBS_VM   += $(LLVM_LIBS)
    590. 

  590. +   LFLAGS_VM += $(LLVM_LDFLAGS)
    591. 

  591. + endif
    592. 

  592. + 
    593. 

  593. +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make openjdk-boot/hotspot/make/linux/makefiles/zero.make
    594. 

  594. +--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make	2014-02-20 19:51:45.000000000 +0100
    595. 

  595. ++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make	2014-05-01 20:03:03.677930438 +0200
    596. 

  596. +@@ -33,4 +33,4 @@
    597. 

  597. + 
    598. 

  598. + # Make sure libffi is included
    599. 

  599. + CFLAGS += $(LIBFFI_CFLAGS)
    600. 

  600. +-LIBS_VM += $(LIBFFI_LIBS)
    601. 

  601. ++LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
    602. 

  602. +diff -Nur openjdk-boot.orig/jdk/make/common/Sanity.gmk openjdk-boot/jdk/make/common/Sanity.gmk
    603. 

  603. +--- openjdk-boot.orig/jdk/make/common/Sanity.gmk	2014-04-12 01:23:06.000000000 +0200
    604. 

  604. ++++ openjdk-boot/jdk/make/common/Sanity.gmk	2014-05-01 20:03:03.677930438 +0200
    605. 

  605. +@@ -91,8 +91,7 @@
    606. 

  606. +     sane-ld_run_path \
    607. 

  607. +     sane-alt_bootdir \
    608. 

  608. +     sane-bootdir \
    609. 

  609. +-    sane-local-bootdir \
    610. 

  610. +-    sane-alsa-headers
    611. 

  611. ++    sane-local-bootdir
    612. 

  612. + 
    613. 

  613. + ifdef OPENJDK
    614. 

  614. + sanity-all:: sane-freetype 
    615. 

  615. +diff -Nur openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk openjdk-boot/jdk/make/common/shared/Sanity.gmk
    616. 

  616. +--- openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk	2014-04-12 01:23:06.000000000 +0200
    617. 

  617. ++++ openjdk-boot/jdk/make/common/shared/Sanity.gmk	2014-05-01 20:03:03.681930476 +0200
    618. 

  618. +@@ -114,11 +114,6 @@
    619. 

  619. +     elif [ -f /etc/lsb-release ] ; then \
    620. 

  620. +       $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
    621. 

  621. +     fi)
    622. 

  622. +-  ALSA_INCLUDE=/usr/include/alsa/version.h
    623. 

  623. +-  ALSA_LIBRARY=/usr/lib/libasound.so
    624. 

  624. +-  _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
    625. 

  625. +-           $(SED) -e 's@.*"\(.*\)".*@\1@' )
    626. 

  626. +-  ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
    627. 

  627. + endif
    628. 

  628. + 
    629. 

  629. + ifeq ($(PLATFORM), macosx)
    630. 

  630. +@@ -225,7 +220,6 @@
    631. 

  631. + 	sane-compiler \
    632. 

  632. + 	sane-link \
    633. 

  633. + 	sane-cacerts \
    634. 

  634. +-	sane-alsa-headers \
    635. 

  635. + 	sane-ant_version \
    636. 

  636. + 	sane-zip_version \
    637. 

  637. + 	sane-unzip_version \
    638. 

  638. +@@ -1381,35 +1375,6 @@
    639. 

  639. +   endif
    640. 

  640. + endif
    641. 

  641. + 
    642. 

  642. +-######################################################
    643. 

  643. +-# Check that ALSA headers and libs are installed and 
    644. 

  644. +-# that the header has the right version. We only
    645. 

  645. +-# need /usr/include/alsa/version.h and /usr/lib/libasound.so
    646. 

  646. +-######################################################
    647. 

  647. +-
    648. 

  648. +-ifdef REQUIRED_ALSA_VERSION
    649. 

  649. +-  ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
    650. 

  650. +-endif
    651. 

  651. +-sane-alsa-headers:
    652. 

  652. +-ifdef REQUIRED_ALSA_VERSION
    653. 

  653. +-	@if [ "$(ALSA_CHECK)" != "missing" ] ; then \
    654. 

  654. +-	    if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer"  ] ; then \
    655. 

  655. +-		$(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \
    656. 

  656. +-		"      You have the following ALSA version installed: $${alsa_version} \n" \
    657. 

  657. +-		"      Please reinstall ALSA (drivers and lib). You can download \n" \
    658. 

  658. +-		"      the source distribution from http://www.alsa-project.org \n" \
    659. 

  659. +-		"      or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
    660. 

  660. +-		"" >> $(ERROR_FILE) ; \
    661. 

  661. +-	    fi ; \
    662. 

  662. +-	else \
    663. 

  663. +-	    $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \
    664. 

  664. +-	    "      Please install ALSA (drivers and lib). You can download the \n" \
    665. 

  665. +-	    "      source distribution from http://www.alsa-project.org or go to \n" \
    666. 

  666. +-	    "      http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
    667. 

  667. +-	    "" >> $(ERROR_FILE) ; \
    668. 

  668. +-	fi
    669. 

  669. +-endif
    670. 

  670. +-
    671. 

  671. + # If a sanity file doesn't exist, just make sure it's dir exists
    672. 

  672. + $(SANITY_FILES):
    673. 

  673. + 	-@$(prep-target)
    674. 

  674. +diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk
    675. 

  675. +--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk	2014-04-12 01:23:06.000000000 +0200
    676. 

  676. ++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk	2014-05-01 20:03:03.681930476 +0200
    677. 

  677. +@@ -270,12 +270,6 @@
    678. 

  678. + endif # !HEADLESS
    679. 

  679. + endif # PLATFORM
    680. 

  680. + 
    681. 

  681. +-ifeq ($(PLATFORM), linux)
    682. 

  682. +-  # Checking for the X11/extensions headers at the additional location
    683. 

  683. +-  CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
    684. 

  684. +-                        $(wildcard /usr/include/X11/extensions))
    685. 

  685. +-endif
    686. 

  686. +-
    687. 

  687. + ifeq ($(PLATFORM), macosx))
    688. 

  688. +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
    689. 

  689. +               -I$(OPENWIN_HOME)/include 
    690. 

  690. +diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile
    691. 

  691. +--- openjdk-boot.orig/Makefile	2014-04-04 19:44:40.000000000 +0200
    692. 

  692. ++++ openjdk-boot/Makefile	2014-05-01 20:02:54.549843414 +0200
    693. 

  693. +@@ -53,9 +53,7 @@
    694. 

  694. + REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
    695. 

  695. + REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
    696. 

  696. + 
    697. 

  697. +-ifndef TOPDIR
    698. 

  698. +-  TOPDIR:=.
    699. 

  699. +-endif
    700. 

  700. ++TOPDIR:=.
    701. 

  701. + 
    702. 

  702. + ifndef JDK_TOPDIR
    703. 

  703. +   JDK_TOPDIR=$(TOPDIR)/jdk
    704.