Home Explore Help
Register Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 0 Pull Requests 0 Wiki
Tree: ef62e6ef5d
Branches Tags
openadk
/
package
/
openjdk7
/
patches
/
openadk.patch

openadk.patch 28 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678 
  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-06-23 12:10:50.943660624 +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-06-23 14:30:09.703379765 +0200
    16. 

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

  17. +diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
    18. 

  18. +--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make	2014-02-20 19:51:45.000000000 +0100
    19. 

  19. ++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make	2014-06-17 17:39:28.697018938 +0200
    20. 

  20. +@@ -39,20 +39,20 @@
    21. 

  21. + 
    22. 

  22. + offsets_arm.s:	mkoffsets
    23. 

  23. + 	@echo Generating assembler offsets
    24. 

  24. +-	./mkoffsets > $@
    25. 

  25. ++	$(QEMU) ./mkoffsets > $@
    26. 

  26. + 
    27. 

  27. + bytecodes_arm.s: bytecodes_arm.def mkbc
    28. 

  28. + 	@echo Generating ARM assembler bytecode sequences
    29. 

  29. +-	$(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
    30. 

  30. ++	$(CXX_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE)
    31. 

  31. + 
    32. 

  32. + mkbc:	$(GAMMADIR)/tools/mkbc.c
    33. 

  33. + 	@echo Compiling mkbc tool
    34. 

  34. +-	$(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
    35. 

  35. ++	$(CC_COMPILE) -static -o $@ $< $(COMPILE_DONE)
    36. 

  36. + 
    37. 

  37. + mkoffsets:	asm_helper.cpp
    38. 

  38. + 	@echo Compiling offset generator
    39. 

  39. + 	$(QUIETLY) $(REMOVE_TARGET)
    40. 

  40. +-	$(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
    41. 

  41. ++	$(CXX_COMPILE) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
    42. 

  42. + 
    43. 

  43. + endif
    44. 

  44. + endif
    45. 

  45. +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
    46. 

  46. +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2014-02-20 19:51:45.000000000 +0100
    47. 

  47. ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2014-06-17 17:39:28.701018968 +0200
    48. 

  48. +@@ -112,7 +112,6 @@
    49. 

  49. + # include <string.h>
    50. 

  50. + # include <syscall.h>
    51. 

  51. + # include <sys/sysinfo.h>
    52. 

  52. +-# include <gnu/libc-version.h>
    53. 

  53. + # include <sys/ipc.h>
    54. 

  54. + # include <sys/shm.h>
    55. 

  55. + # include <link.h>
    56. 

  56. +@@ -650,9 +649,7 @@
    57. 

  57. +      os::Linux::set_glibc_version(str);
    58. 

  58. +   } else {
    59. 

  59. +      // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
    60. 

  60. +-     static char _gnu_libc_version[32];
    61. 

  61. +-     jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
    62. 

  62. +-              "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
    63. 

  63. ++     static char _gnu_libc_version[32] = "2.9";
    64. 

  64. +      os::Linux::set_glibc_version(_gnu_libc_version);
    65. 

  65. +   }
    66. 

  66. + 
    67. 

  67. +@@ -2951,10 +2948,7 @@
    68. 

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

  69. + // we should use the base version.
    70. 

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

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

  72. +-  if (f == NULL) {
    73. 

  73. +-    f = dlsym(handle, name);
    74. 

  74. +-  }
    75. 

  75. ++  void *f = dlsym(handle, name);
    76. 

  76. +   return f;
    77. 

  77. + }
    78. 

  78. + 
    79. 

  79. +@@ -5329,7 +5323,21 @@
    80. 

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

  81. + // so just return the system wide load average.
    82. 

  82. + int os::loadavg(double loadavg[], int nelem) {
    83. 

  83. +-  return ::getloadavg(loadavg, nelem);
    84. 

  84. ++ FILE *LOADAVG;
    85. 

  85. ++ double avg[3] = { 0.0, 0.0, 0.0 };
    86. 

  86. ++ int i, res = -1;;
    87. 

  87. ++
    88. 

  88. ++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
    89. 

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

  90. ++ res = 0;
    91. 

  91. ++ fclose(LOADAVG);
    92. 

  92. ++ }
    93. 

  93. ++
    94. 

  94. ++ for (i = 0; (i < nelem) && (i < 3); i++) {
    95. 

  95. ++ loadavg[i] = avg[i];
    96. 

  96. ++ }
    97. 

  97. ++
    98. 

  98. ++ return res;
    99. 

  99. + }
    100. 

  100. + 
    101. 

  101. + void os::pause() {
    102. 

  102. +diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
    103. 

  103. +--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2014-02-20 19:51:45.000000000 +0100
    104. 

  104. ++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2014-06-17 17:39:28.705018998 +0200
    105. 

  105. +@@ -253,7 +253,7 @@
    106. 

  106. + #elif defined(__APPLE__)
    107. 

  107. + inline int g_isnan(double f) { return isnan(f); }
    108. 

  108. + #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
    109. 

  109. +-inline int g_isnan(float  f) { return isnanf(f); }
    110. 

  110. ++inline int g_isnan(float  f) { return __isnanf(f); }
    111. 

  111. + inline int g_isnan(double f) { return isnan(f); }
    112. 

  112. + #else
    113. 

  113. + #error "missing platform-specific definition here"
    114. 

  114. +@@ -267,8 +267,8 @@
    115. 

  115. + 
    116. 

  116. + // Checking for finiteness
    117. 

  117. + 
    118. 

  118. +-inline int g_isfinite(jfloat  f)                 { return finite(f); }
    119. 

  119. +-inline int g_isfinite(jdouble f)                 { return finite(f); }
    120. 

  120. ++inline int g_isfinite(jfloat  f)                 { return isfinite(f); }
    121. 

  121. ++inline int g_isfinite(jdouble f)                 { return isfinite(f); }
    122. 

  122. + 
    123. 

  123. + 
    124. 

  124. + // Wide characters
    125. 

  125. +diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
    126. 

  126. +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2014-04-12 01:23:06.000000000 +0200
    127. 

  127. ++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2014-06-17 17:39:28.705018998 +0200
    128. 

  128. +@@ -79,7 +79,7 @@
    129. 

  129. +   OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
    130. 

  130. +  endif
    131. 

  131. + else
    132. 

  132. +-  OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
    133. 

  133. ++  CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
    134. 

  134. +   OTHER_LDLIBS += $(JVMLIB)
    135. 

  135. + endif
    136. 

  136. + 
    137. 

  137. +diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
    138. 

  138. +--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile	2014-04-12 01:23:06.000000000 +0200
    139. 

  139. ++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile	2014-06-17 17:39:28.705018998 +0200
    140. 

  140. +@@ -64,7 +64,7 @@
    141. 

  141. + COMPILER_WARNINGS_FATAL=true
    142. 

  142. + endif
    143. 

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

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

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

  146. + endif
    147. 

  147. + ifeq ($(PLATFORM), solaris)
    148. 

  148. + #LIBSCTP = -lsctp
    149. 

  149. +diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
    150. 

  150. +--- openjdk.orig/jdk/make/common/Defs.gmk	2014-04-12 01:23:06.000000000 +0200
    151. 

  151. ++++ openjdk/jdk/make/common/Defs.gmk	2014-06-17 17:39:28.705018998 +0200
    152. 

  152. +@@ -204,7 +204,7 @@
    153. 

  153. +       ifeq ($(PLATFORM), macosx)
    154. 

  154. +         FREETYPE_HEADERS_PATH = /usr/X11R6/include
    155. 

  155. +       else
    156. 

  156. +-        FREETYPE_HEADERS_PATH = /usr/include
    157. 

  157. ++        FREETYPE_HEADERS_PATH = /usr/include/disabled
    158. 

  158. +       endif
    159. 

  159. +     endif
    160. 

  160. +   endif
    161. 

  161. +diff -Nur openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk
    162. 

  162. +--- openjdk.orig/jdk/make/common/Sanity.gmk	2014-04-12 01:23:06.000000000 +0200
    163. 

  163. ++++ openjdk/jdk/make/common/Sanity.gmk	2014-06-17 17:39:28.705018998 +0200
    164. 

  164. +@@ -91,8 +91,7 @@
    165. 

  165. +     sane-ld_run_path \
    166. 

  166. +     sane-alt_bootdir \
    167. 

  167. +     sane-bootdir \
    168. 

  168. +-    sane-local-bootdir \
    169. 

  169. +-    sane-alsa-headers
    170. 

  170. ++    sane-local-bootdir
    171. 

  171. + 
    172. 

  172. + ifdef OPENJDK
    173. 

  173. + sanity-all:: sane-freetype 
    174. 

  174. +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
    175. 

  175. +--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2014-04-12 01:23:06.000000000 +0200
    176. 

  176. ++++ openjdk/jdk/make/common/shared/Platform.gmk	2014-06-17 17:39:28.705018998 +0200
    177. 

  177. +@@ -160,9 +160,6 @@
    178. 

  178. +   else
    179. 

  179. +     mach := $(shell uname -m)
    180. 

  180. +   endif
    181. 

  181. +-  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
    182. 

  182. +-    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/')
    183. 

  183. +-  endif
    184. 

  184. +   archExpr = case "$(mach)" in \
    185. 

  185. +                 i[3-9]86) \
    186. 

  186. +                     echo i586 \
    187. 

  187. +diff -Nur openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
    188. 

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

  189. ++++ openjdk/jdk/make/common/shared/Sanity.gmk	2014-06-17 17:39:28.705018998 +0200
    190. 

  190. +@@ -114,11 +114,6 @@
    191. 

  191. +     elif [ -f /etc/lsb-release ] ; then \
    192. 

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

  193. +     fi)
    194. 

  194. +-  ALSA_INCLUDE=/usr/include/alsa/version.h
    195. 

  195. +-  ALSA_LIBRARY=/usr/lib/libasound.so
    196. 

  196. +-  _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
    197. 

  197. +-           $(SED) -e 's@.*"\(.*\)".*@\1@' )
    198. 

  198. +-  ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
    199. 

  199. + endif
    200. 

  200. + 
    201. 

  201. + ifeq ($(PLATFORM), macosx)
    202. 

  202. +@@ -225,7 +220,6 @@
    203. 

  203. + 	sane-compiler \
    204. 

  204. + 	sane-link \
    205. 

  205. + 	sane-cacerts \
    206. 

  206. +-	sane-alsa-headers \
    207. 

  207. + 	sane-ant_version \
    208. 

  208. + 	sane-zip_version \
    209. 

  209. + 	sane-unzip_version \
    210. 

  210. +@@ -1381,34 +1375,6 @@
    211. 

  211. +   endif
    212. 

  212. + endif
    213. 

  213. + 
    214. 

  214. +-######################################################
    215. 

  215. +-# Check that ALSA headers and libs are installed and 
    216. 

  216. +-# that the header has the right version. We only
    217. 

  217. +-# need /usr/include/alsa/version.h and /usr/lib/libasound.so
    218. 

  218. +-######################################################
    219. 

  219. +-
    220. 

  220. +-ifdef REQUIRED_ALSA_VERSION
    221. 

  221. +-  ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
    222. 

  222. +-endif
    223. 

  223. +-sane-alsa-headers:
    224. 

  224. +-ifdef REQUIRED_ALSA_VERSION
    225. 

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

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

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

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

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

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

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

  232. +-		"" >> $(ERROR_FILE) ; \
    233. 

  233. +-	    fi ; \
    234. 

  234. +-	else \
    235. 

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

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

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

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

  239. +-	    "" >> $(ERROR_FILE) ; \
    240. 

  240. +-	fi
    241. 

  241. +-endif
    242. 

  242. + 
    243. 

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

  244. + $(SANITY_FILES):
    245. 

  245. +diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
    246. 

  246. +--- openjdk.orig/jdk/make/java/net/Makefile	2014-04-12 01:23:06.000000000 +0200
    247. 

  247. ++++ openjdk/jdk/make/java/net/Makefile	2014-06-17 17:39:28.709019029 +0200
    248. 

  248. +@@ -25,7 +25,7 @@
    249. 

  249. + 
    250. 

  250. + BUILDDIR = ../..
    251. 

  251. + PACKAGE = java.net
    252. 

  252. +-LIBRARY = net
    253. 

  253. ++LIBRARY = javanet
    254. 

  254. + PRODUCT = sun
    255. 

  255. + include $(BUILDDIR)/common/Defs.gmk
    256. 

  256. + 
    257. 

  257. +diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
    258. 

  258. +--- openjdk.orig/jdk/make/java/nio/Makefile	2014-04-12 01:23:06.000000000 +0200
    259. 

  259. ++++ openjdk/jdk/make/java/nio/Makefile	2014-06-17 17:39:28.709019029 +0200
    260. 

  260. +@@ -373,7 +373,7 @@
    261. 

  261. + endif
    262. 

  262. + 
    263. 

  263. + ifeq ($(PLATFORM), linux)
    264. 

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

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

  266. +   ifdef USE_SYSTEM_GIO
    267. 

  267. +     OTHER_LDLIBS += $(GIO_LIBS)
    268. 

  268. +     OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
    269. 

  269. +@@ -927,7 +927,7 @@
    270. 

  270. + 
    271. 

  271. + $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
    272. 

  272. + 	$(prep-target)
    273. 

  273. +-	($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \
    274. 

  274. ++	($(CD) $(TEMPDIR); $(HOST_CC) $(CPPFLAGS_FOR_BUILD) $(LDDFLAGS) \
    275. 

  275. + 	   -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
    276. 

  276. + 
    277. 

  277. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    278. 

  278. +@@ -963,7 +963,7 @@
    279. 

  279. + 
    280. 

  280. + $(GENUC_EXE) : $(GENUC_SRC)
    281. 

  281. + 	$(prep-target)
    282. 

  282. +-	$(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
    283. 

  283. ++	$(HOST_CC) $(CPPFLAGS_FOR_BUILD) -o $@ $(GENUC_SRC)
    284. 

  284. + 
    285. 

  285. + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
    286. 

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

  287. +diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
    288. 

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

  289. ++++ openjdk/jdk/make/sun/awt/mawt.gmk	2014-06-17 17:39:28.709019029 +0200
    290. 

  290. +@@ -151,22 +151,6 @@
    291. 

  291. + #endif
    292. 

  292. + 
    293. 

  293. + LIBXTST = -lXtst
    294. 

  294. +-ifeq ($(PLATFORM), linux)
    295. 

  295. +-   ifeq ($(ARCH_DATA_MODEL), 64)
    296. 

  296. +-   # XXX what about the rest of them?
    297. 

  297. +-        LIBXT = -lXt
    298. 

  298. +-    else
    299. 

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

  300. +-       LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
    301. 

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

  302. +-       LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
    303. 

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

  304. +-       LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
    305. 

  305. +-                         $(wildcard /usr/lib/libICE.a))
    306. 

  306. +-       LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
    307. 

  307. +-                         $(wildcard /usr/lib/libXtst.a))
    308. 

  308. +-   endif
    309. 

  309. +-endif
    310. 

  310. + 
    311. 

  311. + # Use -lXmu for EditRes support
    312. 

  312. + LIBXMU_DBG	= -lXmu
    313. 

  313. +@@ -181,7 +165,7 @@
    314. 

  314. + OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
    315. 

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

  316. + OTHER_CFLAGS += -DXMSTRINGDEFINES=1
    317. 

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

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

  319. + endif
    320. 

  320. + 
    321. 

  321. + endif
    322. 

  322. +@@ -231,11 +215,6 @@
    323. 

  323. +   CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
    324. 

  324. + endif
    325. 

  325. + 
    326. 

  326. +-ifndef HEADLESS
    327. 

  327. +-CPPFLAGS += -I$(OPENWIN_HOME)/include 
    328. 

  328. +-LDFLAGS  += -L$(OPENWIN_LIB)
    329. 

  329. +-
    330. 

  330. +-endif # !HEADLESS
    331. 

  331. + 
    332. 

  332. + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
    333. 

  333. +             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
    334. 

  334. +@@ -270,11 +249,6 @@
    335. 

  335. + endif # !HEADLESS
    336. 

  336. + endif # PLATFORM
    337. 

  337. + 
    338. 

  338. +-ifeq ($(PLATFORM), linux)
    339. 

  339. +-  # Checking for the X11/extensions headers at the additional location
    340. 

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

  341. +-                        $(wildcard /usr/include/X11/extensions))
    342. 

  342. +-endif
    343. 

  343. + 
    344. 

  344. + ifeq ($(PLATFORM), macosx))
    345. 

  345. +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
    346. 

  346. +diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
    347. 

  347. +--- openjdk.orig/jdk/make/sun/xawt/Makefile	2014-04-12 01:23:06.000000000 +0200
    348. 

  348. ++++ openjdk/jdk/make/sun/xawt/Makefile	2014-06-17 17:39:28.709019029 +0200
    349. 

  349. +@@ -292,16 +292,10 @@
    350. 

  350. + SIZERS = $(SIZER).32
    351. 

  351. + SIZERS_C = $(SIZER_32_C)
    352. 

  352. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
    353. 

  353. +-ifdef CROSS_COMPILE_ARCH
    354. 

  354. +-CFLAGS_32 = -m32
    355. 

  355. +-endif
    356. 

  356. + else # !32
    357. 

  357. + SIZERS = $(SIZER).64
    358. 

  358. + SIZERS_C = $(SIZER_64_C)
    359. 

  359. + SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
    360. 

  360. +-ifdef CROSS_COMPILE_ARCH
    361. 

  361. +-CFLAGS_64 = -m64
    362. 

  362. +-endif
    363. 

  363. + endif # 32
    364. 

  364. + endif # !macosx
    365. 

  365. + endif # solaris
    366. 

  366. +@@ -337,11 +331,7 @@
    367. 

  367. + WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
    368. 

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

  369. + 
    370. 

  370. +-ifndef CROSS_COMPILE_ARCH
    371. 

  371. +-SIZERS_CC = $(CC)
    372. 

  372. +-else
    373. 

  373. +-SIZERS_CC = $(HOST_CC)
    374. 

  374. +-endif
    375. 

  375. ++SIZERS_CC = $(CC) -static
    376. 

  376. + 
    377. 

  377. + $(SIZERS): $(SIZERS_C) 
    378. 

  378. + 	$(prep-target)
    379. 

  379. +@@ -364,7 +354,7 @@
    380. 

  380. + 	    $(CHMOD) +w $@;\
    381. 

  381. + 	else	\
    382. 

  382. + 	    $(ECHO) GENERATING $@; \
    383. 

  383. +-	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    384. 

  384. ++	    $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
    385. 

  385. + 	fi
    386. 

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

  387. + 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
    388. 

  388. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
    389. 

  389. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2014-04-12 01:23:06.000000000 +0200
    390. 

  390. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2014-06-17 17:39:28.709019029 +0200
    391. 

  391. +@@ -69,7 +69,7 @@
    392. 

  392. +      */
    393. 

  393. +     static {
    394. 

  394. +         java.security.AccessController.doPrivileged(
    395. 

  395. +-                  new sun.security.action.LoadLibraryAction("net"));
    396. 

  396. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    397. 

  397. +     }
    398. 

  398. + 
    399. 

  399. +     /**
    400. 

  400. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
    401. 

  401. +--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2014-04-12 01:23:06.000000000 +0200
    402. 

  402. ++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2014-06-17 17:39:28.709019029 +0200
    403. 

  403. +@@ -78,7 +78,7 @@
    404. 

  404. +      */
    405. 

  405. +     static {
    406. 

  406. +         java.security.AccessController.doPrivileged(
    407. 

  407. +-                  new sun.security.action.LoadLibraryAction("net"));
    408. 

  408. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    409. 

  409. +     }
    410. 

  410. + 
    411. 

  411. +     /**
    412. 

  412. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
    413. 

  413. +--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java	2014-04-12 01:23:06.000000000 +0200
    414. 

  414. ++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java	2014-06-17 17:39:28.709019029 +0200
    415. 

  415. +@@ -47,7 +47,7 @@
    416. 

  416. +      */
    417. 

  417. +     static {
    418. 

  418. +         java.security.AccessController.doPrivileged(
    419. 

  419. +-                  new sun.security.action.LoadLibraryAction("net"));
    420. 

  420. ++                  new sun.security.action.LoadLibraryAction("javanet"));
    421. 

  421. +         init();
    422. 

  422. +     }
    423. 

  423. + 
    424. 

  424. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
    425. 

  425. +--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java	2014-04-12 01:23:06.000000000 +0200
    426. 

  426. ++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java	2014-06-17 17:39:28.709019029 +0200
    427. 

  427. +@@ -267,7 +267,7 @@
    428. 

  428. +     static {
    429. 

  429. +         preferIPv6Address = java.security.AccessController.doPrivileged(
    430. 

  430. +             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
    431. 

  431. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    432. 

  432. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    433. 

  433. +         init();
    434. 

  434. +     }
    435. 

  435. + 
    436. 

  436. +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
    437. 

  437. +--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java	2014-04-12 01:23:06.000000000 +0200
    438. 

  438. ++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java	2014-06-17 17:39:28.709019029 +0200
    439. 

  439. +@@ -53,7 +53,7 @@
    440. 

  440. +     private static final int defaultIndex; /* index of defaultInterface */
    441. 

  441. + 
    442. 

  442. +     static {
    443. 

  443. +-        AccessController.doPrivileged(new LoadLibraryAction("net"));
    444. 

  444. ++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
    445. 

  445. +         init();
    446. 

  446. +         defaultInterface = DefaultInterface.getDefault();
    447. 

  447. +         if (defaultInterface != null) {
    448. 

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

  449. +--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2014-04-12 01:23:06.000000000 +0200
    450. 

  450. ++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2014-06-17 17:39:28.709019029 +0200
    451. 

  451. +@@ -76,6 +76,6 @@
    452. 

  452. + 
    453. 

  453. +     static {
    454. 

  454. +         AccessController.doPrivileged(
    455. 

  455. +-            new sun.security.action.LoadLibraryAction("net"));
    456. 

  456. ++            new sun.security.action.LoadLibraryAction("javanet"));
    457. 

  457. +     }
    458. 

  458. + }
    459. 

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

  460. +--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2014-04-12 01:23:06.000000000 +0200
    461. 

  461. ++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2014-06-17 17:39:28.709019029 +0200
    462. 

  462. +@@ -95,7 +95,7 @@
    463. 

  463. +                 }});
    464. 

  464. +         if (b != null && b.booleanValue()) {
    465. 

  465. +             java.security.AccessController.doPrivileged(
    466. 

  466. +-                      new sun.security.action.LoadLibraryAction("net"));
    467. 

  467. ++                      new sun.security.action.LoadLibraryAction("javanet"));
    468. 

  468. +             hasSystemProxies = init();
    469. 

  469. +         }
    470. 

  470. +     }
    471. 

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

  472. +--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java	2014-04-12 01:23:06.000000000 +0200
    473. 

  473. ++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java	2014-06-17 17:39:28.709019029 +0200
    474. 

  474. +@@ -483,7 +483,7 @@
    475. 

  475. +                 return;
    476. 

  476. +             loaded = true;
    477. 

  477. +             java.security.AccessController
    478. 

  478. +-                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
    479. 

  479. ++                .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
    480. 

  480. +             java.security.AccessController
    481. 

  481. +                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
    482. 

  482. +             // IOUtil must be initialized; Its native methods are called from
    483. 

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

  484. +--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-04-12 01:23:06.000000000 +0200
    485. 

  485. ++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-06-17 17:39:28.713019059 +0200
    486. 

  486. +@@ -247,7 +247,7 @@
    487. 

  487. + 
    488. 

  488. +     static {
    489. 

  489. +         java.security.AccessController.doPrivileged(
    490. 

  490. +-            new sun.security.action.LoadLibraryAction("net"));
    491. 

  491. ++            new sun.security.action.LoadLibraryAction("javanet"));
    492. 

  492. +     }
    493. 

  493. + 
    494. 

  494. + }
    495. 

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

  496. +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2014-04-12 01:23:06.000000000 +0200
    497. 

  497. ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2014-06-17 17:39:28.713019059 +0200
    498. 

  498. +@@ -246,7 +246,8 @@
    499. 

  499. +     if (wcs == NULL)
    500. 

  500. +         return NULL;
    501. 

  501. + 
    502. 

  502. +-    n = len*MB_CUR_MAX + 1;
    503. 

  503. ++    //evil hack for uclibc
    504. 

  504. ++    n = len*1 + 1;
    505. 

  505. + 
    506. 

  506. +     mbs = (char *) malloc(n * sizeof(char));
    507. 

  507. +     if (mbs == NULL) {
    508. 

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

  509. +--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2014-04-12 01:23:06.000000000 +0200
    510. 

  510. ++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c	2014-06-17 17:39:28.713019059 +0200
    511. 

  511. +@@ -27,9 +27,6 @@
    512. 

  512. + #include <X11/Xutil.h>
    513. 

  513. + #include <X11/Xos.h>
    514. 

  514. + #include <X11/Xatom.h>
    515. 

  515. +-#ifdef __linux__
    516. 

  516. +-#include <execinfo.h>
    517. 

  517. +-#endif
    518. 

  518. + 
    519. 

  519. + #include <jvm.h>
    520. 

  520. + #include <jni.h>
    521. 

  521. +@@ -785,25 +782,6 @@
    522. 

  522. +     return ret;
    523. 

  523. + }
    524. 

  524. + 
    525. 

  525. +-#ifdef __linux__
    526. 

  526. +-void print_stack(void)
    527. 

  527. +-{
    528. 

  528. +-  void *array[10];
    529. 

  529. +-  size_t size;
    530. 

  530. +-  char **strings;
    531. 

  531. +-  size_t i;
    532. 

  532. +-
    533. 

  533. +-  size = backtrace (array, 10);
    534. 

  534. +-  strings = backtrace_symbols (array, size);
    535. 

  535. +-
    536. 

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

  537. +-
    538. 

  538. +-  for (i = 0; i < size; i++)
    539. 

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

  540. +-
    541. 

  541. +-  free (strings);
    542. 

  542. +-}
    543. 

  543. +-#endif
    544. 

  544. + 
    545. 

  545. + Window get_xawt_root_shell(JNIEnv *env) {
    546. 

  546. +   static jclass classXRootWindow = NULL;
    547. 

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

  548. +--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-04-12 01:23:06.000000000 +0200
    549. 

  549. ++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2014-06-17 17:39:28.713019059 +0200
    550. 

  550. +@@ -159,7 +159,7 @@
    551. 

  551. + 
    552. 

  552. +     static {
    553. 

  553. +         java.security.AccessController.doPrivileged(
    554. 

  554. +-            new sun.security.action.LoadLibraryAction("net"));
    555. 

  555. ++            new sun.security.action.LoadLibraryAction("javanet"));
    556. 

  556. +         init0();
    557. 

  557. + 
    558. 

  558. +         // start the address listener thread
    559. 

  559. +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make
    560. 

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

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

  562. +@@ -288,7 +288,7 @@
    563. 

  563. +   LIBS_VM                  += $(LIBS)
    564. 

  564. + endif
    565. 

  565. + ifeq ($(JVM_VARIANT_ZEROSHARK), true)
    566. 

  566. +-  LIBS_VM   += $(LIBFFI_LIBS) $(LLVM_LIBS)
    567. 

  567. ++  LIBS_VM   += $(LLVM_LIBS)
    568. 

  568. +   LFLAGS_VM += $(LLVM_LDFLAGS)
    569. 

  569. + endif
    570. 

  570. + 
    571. 

  571. +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make openjdk-boot/hotspot/make/linux/makefiles/zero.make
    572. 

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

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

  574. +@@ -33,4 +33,4 @@
    575. 

  575. + 
    576. 

  576. + # Make sure libffi is included
    577. 

  577. + CFLAGS += $(LIBFFI_CFLAGS)
    578. 

  578. +-LIBS_VM += $(LIBFFI_LIBS)
    579. 

  579. ++LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
    580. 

  580. +diff -Nur openjdk-boot.orig/jdk/make/common/Sanity.gmk openjdk-boot/jdk/make/common/Sanity.gmk
    581. 

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

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

  583. +@@ -91,8 +91,7 @@
    584. 

  584. +     sane-ld_run_path \
    585. 

  585. +     sane-alt_bootdir \
    586. 

  586. +     sane-bootdir \
    587. 

  587. +-    sane-local-bootdir \
    588. 

  588. +-    sane-alsa-headers
    589. 

  589. ++    sane-local-bootdir
    590. 

  590. + 
    591. 

  591. + ifdef OPENJDK
    592. 

  592. + sanity-all:: sane-freetype 
    593. 

  593. +diff -Nur openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk openjdk-boot/jdk/make/common/shared/Sanity.gmk
    594. 

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

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

  596. +@@ -114,11 +114,6 @@
    597. 

  597. +     elif [ -f /etc/lsb-release ] ; then \
    598. 

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

  599. +     fi)
    600. 

  600. +-  ALSA_INCLUDE=/usr/include/alsa/version.h
    601. 

  601. +-  ALSA_LIBRARY=/usr/lib/libasound.so
    602. 

  602. +-  _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
    603. 

  603. +-           $(SED) -e 's@.*"\(.*\)".*@\1@' )
    604. 

  604. +-  ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
    605. 

  605. + endif
    606. 

  606. + 
    607. 

  607. + ifeq ($(PLATFORM), macosx)
    608. 

  608. +@@ -225,7 +220,6 @@
    609. 

  609. + 	sane-compiler \
    610. 

  610. + 	sane-link \
    611. 

  611. + 	sane-cacerts \
    612. 

  612. +-	sane-alsa-headers \
    613. 

  613. + 	sane-ant_version \
    614. 

  614. + 	sane-zip_version \
    615. 

  615. + 	sane-unzip_version \
    616. 

  616. +@@ -1381,35 +1375,6 @@
    617. 

  617. +   endif
    618. 

  618. + endif
    619. 

  619. + 
    620. 

  620. +-######################################################
    621. 

  621. +-# Check that ALSA headers and libs are installed and 
    622. 

  622. +-# that the header has the right version. We only
    623. 

  623. +-# need /usr/include/alsa/version.h and /usr/lib/libasound.so
    624. 

  624. +-######################################################
    625. 

  625. +-
    626. 

  626. +-ifdef REQUIRED_ALSA_VERSION
    627. 

  627. +-  ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
    628. 

  628. +-endif
    629. 

  629. +-sane-alsa-headers:
    630. 

  630. +-ifdef REQUIRED_ALSA_VERSION
    631. 

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

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

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

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

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

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

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

  638. +-		"" >> $(ERROR_FILE) ; \
    639. 

  639. +-	    fi ; \
    640. 

  640. +-	else \
    641. 

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

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

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

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

  645. +-	    "" >> $(ERROR_FILE) ; \
    646. 

  646. +-	fi
    647. 

  647. +-endif
    648. 

  648. +-
    649. 

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

  650. + $(SANITY_FILES):
    651. 

  651. + 	-@$(prep-target)
    652. 

  652. +diff -Nur openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile
    653. 

  653. +--- openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile	2014-04-12 01:23:06.000000000 +0200
    654. 

  654. ++++ openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile	2014-05-15 15:49:03.886269427 +0200
    655. 

  655. +@@ -72,6 +72,7 @@
    656. 

  656. + 	-DUSE_PORTS=TRUE  \
    657. 

  657. + 	-DUSE_PLATFORM_MIDI_OUT=TRUE \
    658. 

  658. + 	-DUSE_PLATFORM_MIDI_IN=TRUE \
    659. 

  659. ++	$(ALSA_CPPFLAGS) \
    660. 

  660. + 	-I$(SHARE_SRC)/native/com/sun/media/sound
    661. 

  661. + 
    662. 

  662. + #
    663. 

  663. +diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk
    664. 

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

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

  666. +@@ -270,12 +270,6 @@
    667. 

  667. + endif # !HEADLESS
    668. 

  668. + endif # PLATFORM
    669. 

  669. + 
    670. 

  670. +-ifeq ($(PLATFORM), linux)
    671. 

  671. +-  # Checking for the X11/extensions headers at the additional location
    672. 

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

  673. +-                        $(wildcard /usr/include/X11/extensions))
    674. 

  674. +-endif
    675. 

  675. +-
    676. 

  676. + ifeq ($(PLATFORM), macosx))
    677. 

  677. +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
    678. 

  678. +               -I$(OPENWIN_HOME)/include 
    679.