diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-11-12 20:58:34 +0100 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-11-26 23:41:44 +0100 |
commit | 57e069cde6617f00ca8834a82c6f360af43d5067 (patch) | |
tree | 48cbe15e96d217c45acfa64b0c13aad8c6424980 | |
download | meta-java-57e069cde6617f00ca8834a82c6f360af43d5067.tar.gz |
meta-java: initial commit
* taken over mostly stuff from oe classic
* cleaned up recipes
* added license checksums
* bump icedtea6-native to 1.8.11
* use jamvm from git as native
186 files changed, 16635 insertions, 0 deletions
@@ -0,0 +1,24 @@ | |||
1 | This layer depends on: | ||
2 | |||
3 | URI: git://git.openembedded.org/openembedded-core | ||
4 | branch: master | ||
5 | revision: HEAD | ||
6 | |||
7 | URI: git://git.openembedded.org/meta-openembedded | ||
8 | branch: master | ||
9 | revision: HEAD | ||
10 | |||
11 | You should define at lease the following variables in a distro include file or local.conf | ||
12 | |||
13 | PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" | ||
14 | PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" | ||
15 | |||
16 | PREFERRED_VERSION_cacaoh-native = "0.99.3" | ||
17 | |||
18 | PREFERRED_VERSION_openjdk-6-jre = "6b18-1.8.11" | ||
19 | PREFERRED_VERSION_icedtea6-native = "1.8.11" | ||
20 | |||
21 | |||
22 | Send pull requests to openembedded-devel@lists.openembedded.org | ||
23 | |||
24 | Main layer maintainers: Henning Heinold <heinold@inf.fu-berlin.de> | ||
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass new file mode 100644 index 0000000..4396bb3 --- /dev/null +++ b/classes/java-library.bbclass | |||
@@ -0,0 +1,58 @@ | |||
1 | # Inherit this bbclass for each java recipe that builds a Java library (jar file[s]). | ||
2 | # | ||
3 | # It automatically adds important build dependencies, defines JPN (Java Package Name) | ||
4 | # a package named ${JPN} whose contents are those of ${datadir}/java (the jar location). | ||
5 | # | ||
6 | # The JPN is basically lib${PN}-java but takes care of the fact that ${PN} already | ||
7 | # starts with "lib" and/or ends with "-java". In case the "lib" prefix is part of | ||
8 | # your package's normal name (e.g. liberator) the guessing is wrong and you have | ||
9 | # to set JPN manually! | ||
10 | |||
11 | inherit java | ||
12 | |||
13 | # use java_stage for native packages | ||
14 | JAVA_NATIVE_STAGE_INSTALL = "1" | ||
15 | |||
16 | def java_package_name(d): | ||
17 | import bb; | ||
18 | |||
19 | pre="" | ||
20 | post="" | ||
21 | |||
22 | pn = bb.data.getVar('PN', d, 1) | ||
23 | if not pn.startswith("lib"): | ||
24 | pre='lib' | ||
25 | |||
26 | if not pn.endswith("-java"): | ||
27 | post='-java' | ||
28 | |||
29 | return pre + pn + post | ||
30 | |||
31 | JPN ?= "${@java_package_name(d)}" | ||
32 | |||
33 | DEPENDS_prepend = "virtual/javac-native fastjar-native " | ||
34 | |||
35 | PACKAGES = "${JPN}" | ||
36 | |||
37 | PACKAGE_ARCH_${JPN} = "all" | ||
38 | |||
39 | FILES_${JPN} = "${datadir_java}" | ||
40 | |||
41 | # File name of the libraries' main Jar file | ||
42 | JARFILENAME = "${BP}.jar" | ||
43 | |||
44 | # Space-separated list of alternative file names. | ||
45 | ALTJARFILENAMES = "${BPN}.jar" | ||
46 | |||
47 | # Java "source" distributions often contain precompiled things | ||
48 | # we want to delete first. | ||
49 | do_removebinaries() { | ||
50 | find ${WORKDIR} -name "*.jar" -exec rm {} \; | ||
51 | find ${WORKDIR} -name "*.class" -exec rm {} \; | ||
52 | } | ||
53 | |||
54 | addtask removebinaries after do_unpack before do_patch | ||
55 | |||
56 | do_install() { | ||
57 | oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES} | ||
58 | } | ||
diff --git a/classes/java-native.bbclass b/classes/java-native.bbclass new file mode 100644 index 0000000..cade7b1 --- /dev/null +++ b/classes/java-native.bbclass | |||
@@ -0,0 +1,9 @@ | |||
1 | # This is to be used by recipes which rely on java-library.bbclass | ||
2 | # infrastructure and are a *-native recipe which needs to install | ||
3 | # jar files into staging. | ||
4 | # | ||
5 | # This class has nothing to do with Java's JNI. | ||
6 | |||
7 | inherit native | ||
8 | |||
9 | NATIVE_INSTALL_WORKS = "1" | ||
diff --git a/classes/java.bbclass b/classes/java.bbclass new file mode 100644 index 0000000..6a45065 --- /dev/null +++ b/classes/java.bbclass | |||
@@ -0,0 +1,184 @@ | |||
1 | # Defines the commonly used target directories and provides a convenience | ||
2 | # function to install jar files. | ||
3 | # | ||
4 | # All the default directory locations herein resemble locations chosen in | ||
5 | # the Debian distribution. | ||
6 | |||
7 | # Jar location on target | ||
8 | datadir_java ?= ${datadir}/java | ||
9 | |||
10 | # JNI library location on target | ||
11 | libdir_jni ?= ${libdir}/jni | ||
12 | |||
13 | # JVM bundle location on target | ||
14 | libdir_jvm ?= ${libdir}/jvm | ||
15 | |||
16 | STAGING_DATADIR_JAVA ?= ${STAGING_DATADIR}/java | ||
17 | STAGING_LIBDIR_JNI ?= ${STAGING_LIBDIR}/jni | ||
18 | STAGING_LIBDIR_JVM ?= ${STAGING_LIBDIR}/jvm | ||
19 | |||
20 | STAGING_DATADIR_JAVA_NATIVE ?= ${STAGING_DATADIR_NATIVE}/java | ||
21 | STAGING_LIBDIR_JNI_NATIVE ?= ${STAGING_LIBDIR_NATIVE}/jni | ||
22 | STAGING_LIBDIR_JVM_NATIVE ?= ${STAGING_LIBDIR_NATIVE}/jvm | ||
23 | |||
24 | oe_jarinstall() { | ||
25 | # Purpose: Install a jar file and create all the given symlinks to it. | ||
26 | # Example: | ||
27 | # oe_jarinstall foo-1.3.jar foo.jar | ||
28 | # Installs foo-1.3.jar and creates symlink foo.jar. | ||
29 | # | ||
30 | # oe_jarinstall -r foo-1.3.jar foo_1_3.jar foo.jar | ||
31 | # Installs foo_1_3.jar as foo-1.3.jar and creates a symlink to this. | ||
32 | # | ||
33 | dir=${D}${datadir_java} | ||
34 | destname="" | ||
35 | while [ "$#" -gt 0 ]; do | ||
36 | case "$1" in | ||
37 | -r) | ||
38 | shift | ||
39 | destname=$1 | ||
40 | ;; | ||
41 | -*) | ||
42 | oefatal "oe_jarinstall: unknown option: $1" | ||
43 | ;; | ||
44 | *) | ||
45 | break; | ||
46 | ;; | ||
47 | esac | ||
48 | shift | ||
49 | done | ||
50 | |||
51 | jarname=$1 | ||
52 | destname=${destname:-`basename $jarname`} | ||
53 | shift | ||
54 | |||
55 | install -d $dir | ||
56 | install -m 0644 $jarname $dir/$destname | ||
57 | |||
58 | # Creates symlinks out of the remaining arguments. | ||
59 | while [ "$#" -gt 0 ]; do | ||
60 | if [ -e $dir/$1 -o -h $dir/$1 ]; then | ||
61 | oewarn "file was in the way. removing:" $dir/$1 | ||
62 | rm $dir/$1 | ||
63 | fi | ||
64 | ln -s $destname $dir/$1 | ||
65 | shift | ||
66 | done | ||
67 | } | ||
68 | |||
69 | oe_makeclasspath() { | ||
70 | # Purpose: Generate a classpath variable from the given Jar file names | ||
71 | # where the ".jar" has been omitted. The string is stored in the script | ||
72 | # variable whose name is given in the first argument to this function. | ||
73 | # | ||
74 | # oe_makeclasspath cp foo baz bar | ||
75 | # Stores ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar | ||
76 | # in variable "cp". | ||
77 | # | ||
78 | # oe_makeclasspath bootcp -s foo baz bar | ||
79 | # Stores ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar | ||
80 | # in variable "bootcp". | ||
81 | # | ||
82 | # Provide the -s at the beginning otherwise strange things happen. | ||
83 | # If -s is given the function checks whether the requested jar file exists | ||
84 | # and exits with an error message if it cannot be found. | ||
85 | # | ||
86 | # Note: In order to encourage usage of the DEPENDS variable, the function | ||
87 | # can accept recipe names. If a recipe has no corresponding Jar file it | ||
88 | # is ignored. Be careful with recipes where the recipe name is different | ||
89 | # from the the Jar file name! | ||
90 | dir=${datadir_java} | ||
91 | classpath= | ||
92 | delimiter= | ||
93 | retval=$1 | ||
94 | |||
95 | shift | ||
96 | |||
97 | while [ "$#" -gt 0 ]; do | ||
98 | case "$1" in | ||
99 | -s) | ||
100 | # take jar files from native staging if this is a -native recipe | ||
101 | if [ ${PACKAGE_ARCH} = ${BUILD_ARCH} ]; then | ||
102 | dir=${STAGING_DATADIR_JAVA_NATIVE} | ||
103 | else | ||
104 | dir=${STAGING_DATADIR_JAVA} | ||
105 | fi | ||
106 | ;; | ||
107 | -*) | ||
108 | oefatal "oe_makeclasspath: unknown option: $1" | ||
109 | ;; | ||
110 | *) | ||
111 | file=$dir/$1.jar | ||
112 | |||
113 | if [ -e $file ]; then | ||
114 | classpath=$classpath$delimiter$file | ||
115 | delimiter=":" | ||
116 | fi | ||
117 | |||
118 | ;; | ||
119 | esac | ||
120 | shift | ||
121 | done | ||
122 | |||
123 | eval $retval="$classpath" | ||
124 | } | ||
125 | |||
126 | # Creates a simple wrapper script for your Java program. | ||
127 | # The script is written to ${PN} by default. | ||
128 | # | ||
129 | # Parameters are as follows: | ||
130 | # [options] <output file> <main class> [jar files ...] | ||
131 | # | ||
132 | # Options are | ||
133 | # -o <name> where name is the output file name | ||
134 | # | ||
135 | # It can only take jar files from ${datadir_java}! | ||
136 | oe_java_simple_wrapper() { | ||
137 | delimiter= | ||
138 | mainclass= | ||
139 | classpath= | ||
140 | output=${PN} | ||
141 | |||
142 | while [ "$#" -gt 0 ]; do | ||
143 | case "$1" in | ||
144 | -o) | ||
145 | shift | ||
146 | output=$1 | ||
147 | ;; | ||
148 | -*) | ||
149 | oefatal "oe_java_simple_wrapper: unknown option: $1" | ||
150 | ;; | ||
151 | *) | ||
152 | if [ $mainclass ] | ||
153 | then | ||
154 | classpath=$classpath$delimiter${datadir_java}/$1 | ||
155 | delimiter=":" | ||
156 | else | ||
157 | mainclass=$1 | ||
158 | fi | ||
159 | ;; | ||
160 | esac | ||
161 | shift | ||
162 | done | ||
163 | |||
164 | oenote "Creating simple Java wrapper script" | ||
165 | oenote "Output File: $output" | ||
166 | oenote "Main Class: $mainclass" | ||
167 | oenote "Classpath: $classpath" | ||
168 | |||
169 | echo "#!/bin/sh" > $output | ||
170 | echo "# This file is autogenerated by the oe_java_simple_wrapper function of OpenEmbedded" >> $output | ||
171 | echo >> $output | ||
172 | echo "# You can provide additional VM arguments by setting the VMARGS environment variable." >> $output | ||
173 | echo "CLASSPATH_ARG=\"-cp $classpath\"" >> $output | ||
174 | echo >> $output | ||
175 | echo "MAIN_CLASS=$mainclass" >> $output | ||
176 | echo >> $output | ||
177 | echo "# Allows overriding the VM by setting the JAVA environment variable." >> $output | ||
178 | echo "if [ x\${JAVA} = x ]" >> $output | ||
179 | echo "then" >> $output | ||
180 | echo " JAVA=java" >> $output | ||
181 | echo "fi" >> $output | ||
182 | echo >> $output | ||
183 | echo "exec \${JAVA} \${VMARGS} \${CLASSPATH_ARG} \${MAIN_CLASS} \${@}" >> $output | ||
184 | } | ||
diff --git a/conf/layer.conf b/conf/layer.conf new file mode 100644 index 0000000..2d6fffe --- /dev/null +++ b/conf/layer.conf | |||
@@ -0,0 +1,9 @@ | |||
1 | # We have a conf and classes directory, append to BBPATH | ||
2 | BBPATH .= ":${LAYERDIR}" | ||
3 | |||
4 | # We have a recipes directory, add to BBFILES | ||
5 | BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" | ||
6 | |||
7 | BBFILE_COLLECTIONS += "meta-java" | ||
8 | BBFILE_PATTERN_meta-java := "^${LAYERDIR}/" | ||
9 | BBFILE_PRIORITY_meta-java = "10" | ||
diff --git a/recipes-core/ant/ant-native_1.8.1.bb b/recipes-core/ant/ant-native_1.8.1.bb new file mode 100644 index 0000000..5ea8c16 --- /dev/null +++ b/recipes-core/ant/ant-native_1.8.1.bb | |||
@@ -0,0 +1,66 @@ | |||
1 | DESCRIPTION = "Another Neat Tool - build system for Java" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | HOMEPAGE = "http://ant.apache.org" | ||
4 | LICENSE = "AL2.0" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=503bb72c4dd62dd216d6820d5b869442" | ||
6 | |||
7 | SRC_URI = "http://ftp.riken.jp/net/apache/ant/source/apache-ant-${PV}-src.tar.gz \ | ||
8 | file://ant \ | ||
9 | " | ||
10 | |||
11 | S = "${WORKDIR}/apache-ant-${PV}" | ||
12 | |||
13 | inherit java-library java-native | ||
14 | |||
15 | DEPENDS = " \ | ||
16 | jsch-native bsf-native xalan-j-native xerces-j-native \ | ||
17 | xml-commons-resolver1.1-native gnumail-native gnujaf-native \ | ||
18 | bcel-native regexp-native log4j1.2-native antlr-native oro-native \ | ||
19 | junit-native jdepend-native commons-net-native commons-logging-native \ | ||
20 | " | ||
21 | |||
22 | do_removecruft() { | ||
23 | # Removes thing that need proprietary Jar files or are otherwise problematic | ||
24 | rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/image | ||
25 | rm -rf ${S}/src/main/org/apache/tools/ant/types/optional/image | ||
26 | rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/ejb | ||
27 | rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/scm | ||
28 | rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/starteam | ||
29 | rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java | ||
30 | } | ||
31 | |||
32 | addtask removecruft before do_patch after do_unpack | ||
33 | |||
34 | do_compile() { | ||
35 | mkdir -p build | ||
36 | |||
37 | oe_makeclasspath cp -s jsch bsf xalan2 xercesImpl resolver gnumail gnujaf bcel regexp log4j1.2 antlr oro junit jdepend commons-net commons-logging | ||
38 | cp=build:$cp | ||
39 | |||
40 | find src/main -name "*.java" > java_files | ||
41 | |||
42 | javac -sourcepath src/main -cp $cp -d build @java_files | ||
43 | |||
44 | mkdir -p build/org/apache/tools/ant/types/conditions | ||
45 | |||
46 | cp -r src/resources/org build/ | ||
47 | (cd src/main && find . \( -name "*.properties" -or -name "*.xml" -or -name "*.mf" \) -exec cp {} ../../build/{} \;) | ||
48 | |||
49 | echo "VERSION=${PV}" > build/org/apache/tools/ant/version.txt | ||
50 | echo "DATE=`date -R`" >> build/org/apache/tools/ant/version.txt | ||
51 | |||
52 | fastjar -C build -c -f ${JARFILENAME} . | ||
53 | |||
54 | oe_makeclasspath cp -s ecj-bootstrap jsch bsf xalan2 xercesImpl resolver gnumail gnujaf bcel regexp log4j1.2 antlr oro junit jdepend commons-net commons-logging | ||
55 | cp=${STAGING_DATADIR_JAVA_NATIVE}/ant.jar:${STAGING_DATADIR}/classpath/tools.zip:$cp | ||
56 | sed -i -e"s|@JAR_FILE@|$cp|" ${WORKDIR}/ant | ||
57 | } | ||
58 | |||
59 | do_install_append() { | ||
60 | install -d ${D}${bindir} | ||
61 | install -m 0755 ${WORKDIR}/ant ${D}${bindir} | ||
62 | } | ||
63 | |||
64 | SRC_URI[md5sum] = "9e5960bd586d9425c46199cdd20a6fbc" | ||
65 | SRC_URI[sha256sum] = "4f39057af228663c3cfb6dcfbee603a071a7e3cf48c95c30869ed81c5fcf21c8" | ||
66 | |||
diff --git a/recipes-core/ant/files/ant b/recipes-core/ant/files/ant new file mode 100755 index 0000000..bb282a9 --- /dev/null +++ b/recipes-core/ant/files/ant | |||
@@ -0,0 +1,10 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | export CLASSPATH | ||
4 | CLASSPATH=$CLASSPATH:@JAR_FILE@ | ||
5 | |||
6 | if [ ! $JAVA ];then | ||
7 | JAVA=java | ||
8 | fi | ||
9 | |||
10 | $JAVA org.apache.tools.ant.launch.Launcher $* | ||
diff --git a/recipes-core/antlr/antlr_2.7.7.bb b/recipes-core/antlr/antlr_2.7.7.bb new file mode 100644 index 0000000..105b5e8 --- /dev/null +++ b/recipes-core/antlr/antlr_2.7.7.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | DESCRIPTION = "Framework for constructing recognizers, interpreters, compilers, and translators" | ||
2 | HOMEPAGE = "http://www.antlr2.org" | ||
3 | # see http://www.antlr2.org/license.html | ||
4 | LICENSE = "PD" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=361934e706423915b4d9f413ad37fb65" | ||
6 | |||
7 | SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz" | ||
8 | SRC_URI_virtclass_native += "file://runantlr" | ||
9 | |||
10 | inherit java-library | ||
11 | |||
12 | do_configure_virtclass_native() { | ||
13 | sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr | ||
14 | } | ||
15 | |||
16 | do_compile() { | ||
17 | mkdir -p build | ||
18 | |||
19 | javac -sourcepath . -d build `find antlr -name "*.java"` | ||
20 | |||
21 | fastjar -C build -c -f ${JARFILENAME} . | ||
22 | } | ||
23 | |||
24 | do_install_virtclass_native() { | ||
25 | install ${D}${bindir} | ||
26 | install -m 0755 ${WORKDIR}/runantlr {D}${bindir}/ | ||
27 | } | ||
28 | |||
29 | SRC_URI[md5sum] = "01cc9a2a454dd33dcd8c856ec89af090" | ||
30 | SRC_URI[sha256sum] = "853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9" | ||
31 | |||
32 | BBCLASSEXTEND = "native" | ||
33 | |||
diff --git a/recipes-core/antlr/files/runantlr b/recipes-core/antlr/files/runantlr new file mode 100755 index 0000000..b924bf4 --- /dev/null +++ b/recipes-core/antlr/files/runantlr | |||
@@ -0,0 +1,11 @@ | |||
1 | #!/bin/sh | ||
2 | echo Running 'java antlr.Tool $*' with @JAR_FILE@ appended to the CLASSPATH variable | ||
3 | |||
4 | export CLASSPATH | ||
5 | CLASSPATH=$CLASSPATH:@JAR_FILE@ | ||
6 | |||
7 | if [ ! $JAVA ];then | ||
8 | JAVA=java | ||
9 | fi | ||
10 | |||
11 | $JAVA antlr.Tool $* | ||
diff --git a/recipes-core/bcel/bcel_5.2.bb b/recipes-core/bcel/bcel_5.2.bb new file mode 100644 index 0000000..c831516 --- /dev/null +++ b/recipes-core/bcel/bcel_5.2.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | DESCRIPTION = "Java Bytecode manipulation library" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44030f19e8bad73725f39d16fd05ff12" | ||
5 | |||
6 | SRC_URI = "http://archive.apache.org/dist/jakarta/bcel/source/${BP}-src.tar.gz" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | DEPENDS = "xerces-j regexp" | ||
11 | DEPENDS_virtclass-native = "xerces-j-native regexp-native" | ||
12 | |||
13 | |||
14 | do_compile() { | ||
15 | mkdir -p build | ||
16 | |||
17 | oe_makeclasspath cp -s xercesImpl regexp | ||
18 | |||
19 | javac -sourcepath src/java -d build -cp $cp `find src/java -name \*.java` | ||
20 | |||
21 | fastjar -C build -c -f ${JARFILENAME} . | ||
22 | } | ||
23 | |||
24 | SRC_URI[md5sum] = "905b7e718e30e7ca726530ecf106e532" | ||
25 | SRC_URI[sha256sum] = "68039d59a38379d7b65ea3fc72276c43ba234776460e14361af35771bcaab295" | ||
26 | |||
27 | NATIVE_INSTALL_WORKS = "1" | ||
28 | BBCLASSEXTEND = "native" | ||
29 | |||
diff --git a/recipes-core/cacao/cacaoh-openjdk-native.inc b/recipes-core/cacao/cacaoh-openjdk-native.inc new file mode 100644 index 0000000..fcc38ad --- /dev/null +++ b/recipes-core/cacao/cacaoh-openjdk-native.inc | |||
@@ -0,0 +1,31 @@ | |||
1 | DESCRIPTION = "Header generator for Cacao JVM - Needed for cross-compilation builds" | ||
2 | HOMEPAGE = "http://www.cacaojvm.org/" | ||
3 | LICENSE = "GPL" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
5 | |||
6 | DEPENDS = "libtool-native zlib-native virtual/javac-native classpath-native icedtea6-native" | ||
7 | |||
8 | S = "${WORKDIR}/cacao-${PV}" | ||
9 | |||
10 | inherit java autotools native | ||
11 | |||
12 | EXTRA_OECONF = " \ | ||
13 | --with-java-runtime-library=openjdk \ | ||
14 | --with-java-runtime-library-classes=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar \ | ||
15 | --with-jni_md_h=${STAGING_INCDIR}/classpath \ | ||
16 | --with-jni_h=${STAGING_INCDIR}/classpath \ | ||
17 | --with-hpi_md_h=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/include/hpi \ | ||
18 | --with-hpi_h=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/include/hpi \ | ||
19 | " | ||
20 | |||
21 | do_compile() { | ||
22 | # Compile the header generator only (and what is needed for it). | ||
23 | oe_runmake -C src/toolbox libtoolbox.la | ||
24 | oe_runmake -C src/vmcore libvmcore.la | ||
25 | oe_runmake -C src/cacaoh cacaoh | ||
26 | } | ||
27 | |||
28 | do_install() { | ||
29 | install -d ${D}${bindir}/cacaoh-${PV} | ||
30 | ${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool --mode=install install -m 0755 src/cacaoh/cacaoh ${D}/${bindir}/cacaoh-openjdk-${PV} | ||
31 | } | ||
diff --git a/recipes-core/cacao/cacaoh-openjdk-native_0.99.4.bb b/recipes-core/cacao/cacaoh-openjdk-native_0.99.4.bb new file mode 100644 index 0000000..2e7ff93 --- /dev/null +++ b/recipes-core/cacao/cacaoh-openjdk-native_0.99.4.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require cacaoh-openjdk-native.inc | ||
2 | |||
3 | SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2" | ||
4 | |||
5 | SRC_URI[md5sum] = "63220327925ace13756ae334c55a3baa" | ||
6 | SRC_URI[sha256sum] = "1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56" | ||
7 | |||
diff --git a/recipes-core/classpath/classpath-0.98/SimpleName.diff b/recipes-core/classpath/classpath-0.98/SimpleName.diff new file mode 100644 index 0000000..ff2bec0 --- /dev/null +++ b/recipes-core/classpath/classpath-0.98/SimpleName.diff | |||
@@ -0,0 +1,66 @@ | |||
1 | Index: vm/reference/java/lang/VMClass.java | ||
2 | =================================================================== | ||
3 | RCS file: /sources/classpath/classpath/vm/reference/java/lang/VMClass.java,v | ||
4 | retrieving revision 1.20 | ||
5 | diff -u -r1.20 VMClass.java | ||
6 | --- vm/reference/java/lang/VMClass.java 18 Sep 2007 21:52:38 -0000 1.20 | ||
7 | +++ vm/reference/java/lang/VMClass.java 19 Apr 2008 15:19:00 -0000 | ||
8 | @@ -296,27 +296,43 @@ | ||
9 | */ | ||
10 | static String getSimpleName(Class klass) | ||
11 | { | ||
12 | + int arrayCount = 0; | ||
13 | + while (klass.isArray()) | ||
14 | + { | ||
15 | + klass = klass.getComponentType(); | ||
16 | + ++arrayCount; | ||
17 | + } | ||
18 | + // now klass is the component type | ||
19 | + | ||
20 | + String simpleComponentName = null; | ||
21 | if (isAnonymousClass(klass)) | ||
22 | - return ""; | ||
23 | - if (isArray(klass)) | ||
24 | { | ||
25 | - return getComponentType(klass).getSimpleName() + "[]"; | ||
26 | + simpleComponentName = ""; | ||
27 | } | ||
28 | - String fullName = getName(klass); | ||
29 | - int pos = fullName.lastIndexOf("$"); | ||
30 | - if (pos == -1) | ||
31 | - pos = 0; | ||
32 | else | ||
33 | { | ||
34 | - ++pos; | ||
35 | - while (Character.isDigit(fullName.charAt(pos))) | ||
36 | - ++pos; | ||
37 | + String fullName = getName(klass); | ||
38 | + int pos = fullName.lastIndexOf("$"); | ||
39 | + if (pos != -1) | ||
40 | + { //inner class or local class | ||
41 | + // skip digits of local classes | ||
42 | + while (Character.isDigit(fullName.charAt(pos+1))) | ||
43 | + pos++; | ||
44 | + } | ||
45 | + else | ||
46 | + { | ||
47 | + pos = fullName.lastIndexOf("."); | ||
48 | + } | ||
49 | + simpleComponentName = fullName.substring(pos+1); | ||
50 | } | ||
51 | - int packagePos = fullName.lastIndexOf(".", pos); | ||
52 | - if (packagePos == -1) | ||
53 | - return fullName.substring(pos); | ||
54 | - else | ||
55 | - return fullName.substring(packagePos + 1); | ||
56 | + | ||
57 | + if (arrayCount == 0) | ||
58 | + return simpleComponentName; | ||
59 | + | ||
60 | + StringBuffer sb = new StringBuffer(simpleComponentName); | ||
61 | + while (arrayCount-- > 0) | ||
62 | + sb.append("[]"); | ||
63 | + return sb.toString(); | ||
64 | } | ||
65 | |||
66 | /** | ||
diff --git a/recipes-core/classpath/classpath-0.98/ecj_java_dir.patch b/recipes-core/classpath/classpath-0.98/ecj_java_dir.patch new file mode 100644 index 0000000..1455a24 --- /dev/null +++ b/recipes-core/classpath/classpath-0.98/ecj_java_dir.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Index: classpath-0.98/lib/gen-classlist.sh.in | ||
2 | =================================================================== | ||
3 | --- classpath-0.98.orig/lib/gen-classlist.sh.in 2010-06-24 21:18:02.776819217 +0200 | ||
4 | +++ classpath-0.98/lib/gen-classlist.sh.in 2010-06-24 21:18:35.625566191 +0200 | ||
5 | @@ -148,4 +148,7 @@ | ||
6 | done | ||
7 | fi | ||
8 | |||
9 | +# hack for javac that uses -d and do not make the directories | ||
10 | +@AWK@ -F " " '{print $1}' classes.1 | uniq | awk -F " " '{system("mkdir -p " $0)}' | ||
11 | + | ||
12 | exit 0 | ||
13 | Index: classpath-0.98/tools/Makefile.am | ||
14 | =================================================================== | ||
15 | --- classpath-0.98.orig/tools/Makefile.am 2010-06-24 21:18:02.783479881 +0200 | ||
16 | +++ classpath-0.98/tools/Makefile.am 2010-06-24 21:20:04.925557253 +0200 | ||
17 | @@ -323,6 +323,8 @@ | ||
18 | endif | ||
19 | ## Compile ASM separately as it is latin-1 encoded. | ||
20 | find $(srcdir)/external/asm -name '*.java' -print > asm.lst | ||
21 | + @AWK@ -F "/" '{OFS=FS;gsub("/"$$2"/"$$3,"",$$0);gsub("/"$$NF,"",$$0); print $$0}' asm.lst | \ | ||
22 | + sort | uniq | @AWK@ -F " " '{system("mkdir -p asm/" $$0)}' | ||
23 | AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ | ||
24 | $$AC -g -d asm @asm.lst | ||
25 | find $(srcdir)/gnu/classpath/tools \ | ||
26 | @@ -334,7 +336,10 @@ | ||
27 | $(srcdir)/sun/rmi/rmic \ | ||
28 | $(GJDOC_EX) \ | ||
29 | -name '*.java' -print > classes.lst | ||
30 | - $(JCOMPILER) -g -d classes @classes.lst | ||
31 | + @AWK@ -F "/" '{OFS=FS;gsub("/"$$NF,"",$$0); print $$0}' classes.lst | \ | ||
32 | + sort | uniq | @AWK@ -F " " '{system("mkdir -p classes/" $$0)}' | ||
33 | + BC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ | ||
34 | + $$BC -g -d classes @classes.lst | ||
35 | cat classes.lst asm.lst > all-classes.lst | ||
36 | ## Copy over tools resource files. | ||
37 | @list=`cd $(srcdir)/resource && find gnu/classpath/tools com/sun/tools/javac \ | ||
diff --git a/recipes-core/classpath/classpath-0.98/fix-gmp.patch b/recipes-core/classpath/classpath-0.98/fix-gmp.patch new file mode 100644 index 0000000..3f0dfbe --- /dev/null +++ b/recipes-core/classpath/classpath-0.98/fix-gmp.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | --- | ||
2 | configure.ac | 2 +- | ||
3 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
4 | |||
5 | --- classpath-0.98.orig/configure.ac | ||
6 | +++ classpath-0.98/configure.ac | ||
7 | @@ -766,11 +766,11 @@ if test "x${COMPILE_JNI}" = xyes; then | ||
8 | dnl __gmpz_mul_si for earlier versions (>= 3.1). | ||
9 | dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to | ||
10 | dnl change the name of the corresponding ac_ variable on lines 860... | ||
11 | if test "x${COMPILE_GMP}" = xyes; then | ||
12 | AC_CHECK_LIB(gmp, __gmpz_mul_si, | ||
13 | - [GMP_CFLAGS=-I/usr/include | ||
14 | + [GMP_CFLAGS= | ||
15 | GMP_LIBS=-lgmp ], | ||
16 | [GMP_CFLAGS= | ||
17 | GMP_LIBS= ]) | ||
18 | AC_SUBST(GMP_CFLAGS) | ||
19 | AC_SUBST(GMP_LIBS) | ||
diff --git a/recipes-core/classpath/classpath-0.98/javanet-local.patch b/recipes-core/classpath/classpath-0.98/javanet-local.patch new file mode 100644 index 0000000..b8d1584 --- /dev/null +++ b/recipes-core/classpath/classpath-0.98/javanet-local.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Index: native/jni/java-net/local.c | ||
2 | =================================================================== | ||
3 | RCS file: /sources/classpath/classpath/native/jni/java-net/local.c,v | ||
4 | retrieving revision 1.4 | ||
5 | diff -u -r1.4 local.c | ||
6 | --- native/jni/java-net/local.c 17 Apr 2007 21:46:27 -0000 1.4 | ||
7 | +++ native/jni/java-net/local.c 27 Jun 2008 13:14:40 -0000 | ||
8 | @@ -73,27 +73,18 @@ | ||
9 | return socket (PF_UNIX, stream ? SOCK_STREAM : SOCK_DGRAM, 0); | ||
10 | } | ||
11 | |||
12 | -static int gcc_sucks = 0; | ||
13 | - | ||
14 | int | ||
15 | local_bind (int fd, const char *addr) | ||
16 | { | ||
17 | struct sockaddr_un saddr; | ||
18 | |||
19 | - /* For some reason, GCC 4.0.1 on Darwin/x86 MODIFIES the `addr' | ||
20 | - pointer in the CALLER's STACK FRAME after calling this function, | ||
21 | - but if we add this statement below, it doesn't! */ | ||
22 | - if (gcc_sucks) | ||
23 | - fprintf (stderr, "bind %p\n", addr); | ||
24 | - | ||
25 | - if (strlen (addr) > sizeof (saddr.sun_path)) | ||
26 | + if (strlen (addr) >= sizeof (saddr.sun_path)) | ||
27 | { | ||
28 | errno = ENAMETOOLONG; | ||
29 | return -1; | ||
30 | } | ||
31 | |||
32 | - strncpy (saddr.sun_path, addr, sizeof (saddr.sun_path)); | ||
33 | - saddr.sun_path[sizeof (saddr.sun_path)] = '\0'; | ||
34 | + strcpy (saddr.sun_path, addr); | ||
35 | saddr.sun_family = AF_LOCAL; | ||
36 | |||
37 | return bind (fd, (struct sockaddr *) &saddr, SUN_LEN (&saddr)); | ||
diff --git a/recipes-core/classpath/classpath-0.98/miscompilation.patch b/recipes-core/classpath/classpath-0.98/miscompilation.patch new file mode 100644 index 0000000..c61b214 --- /dev/null +++ b/recipes-core/classpath/classpath-0.98/miscompilation.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: classpath-0.97.2/native/jni/java-io/java_io_VMFile.c | ||
2 | =================================================================== | ||
3 | --- classpath-0.97.2.orig/native/jni/java-io/java_io_VMFile.c 2008-10-10 15:24:54.000000000 +0200 | ||
4 | +++ classpath-0.97.2/native/jni/java-io/java_io_VMFile.c 2008-10-10 15:25:36.000000000 +0200 | ||
5 | @@ -439,7 +439,7 @@ | ||
6 | { | ||
7 | #ifndef WITHOUT_FILESYSTEM | ||
8 | const char *filename; | ||
9 | - int result; | ||
10 | + volatile int result; | ||
11 | |||
12 | /* Don't use the JCL convert function because it throws an exception | ||
13 | on failure */ | ||
diff --git a/recipes-core/classpath/classpath-0.98/sun-security-getproperty.patch b/recipes-core/classpath/classpath-0.98/sun-security-getproperty.patch new file mode 100644 index 0000000..fb9cd9d --- /dev/null +++ b/recipes-core/classpath/classpath-0.98/sun-security-getproperty.patch | |||
@@ -0,0 +1,503 @@ | |||
1 | Index: gnu/classpath/debug/Simple1LineFormatter.java | ||
2 | =================================================================== | ||
3 | --- gnu/classpath/debug/Simple1LineFormatter.java.orig 2006-07-11 18:03:59.000000000 +0200 | ||
4 | +++ gnu/classpath/debug/Simple1LineFormatter.java 2009-03-19 19:00:47.000000000 +0100 | ||
5 | @@ -38,8 +38,6 @@ | ||
6 | |||
7 | package gnu.classpath.debug; | ||
8 | |||
9 | -import gnu.java.security.action.GetPropertyAction; | ||
10 | - | ||
11 | import java.io.PrintWriter; | ||
12 | import java.io.StringWriter; | ||
13 | import java.security.AccessController; | ||
14 | @@ -51,6 +49,8 @@ | ||
15 | import java.util.logging.Formatter; | ||
16 | import java.util.logging.LogRecord; | ||
17 | |||
18 | +import sun.security.action.GetPropertyAction; | ||
19 | + | ||
20 | /** | ||
21 | * A simple 1-line formatter to use instead of the 2-line SimpleFormatter used | ||
22 | * by default in the JDK logging handlers. | ||
23 | Index: gnu/classpath/debug/SystemLogger.java | ||
24 | =================================================================== | ||
25 | --- gnu/classpath/debug/SystemLogger.java.orig 2006-12-10 21:25:41.000000000 +0100 | ||
26 | +++ gnu/classpath/debug/SystemLogger.java 2009-03-19 19:00:47.000000000 +0100 | ||
27 | @@ -38,13 +38,13 @@ | ||
28 | |||
29 | package gnu.classpath.debug; | ||
30 | |||
31 | -import gnu.java.security.action.GetPropertyAction; | ||
32 | - | ||
33 | import java.security.AccessController; | ||
34 | import java.util.StringTokenizer; | ||
35 | import java.util.logging.Level; | ||
36 | import java.util.logging.Logger; | ||
37 | |||
38 | +import sun.security.action.GetPropertyAction; | ||
39 | + | ||
40 | public final class SystemLogger extends Logger | ||
41 | { | ||
42 | public static final SystemLogger SYSTEM = new SystemLogger(); | ||
43 | Index: gnu/java/security/PolicyFile.java | ||
44 | =================================================================== | ||
45 | --- gnu/java/security/PolicyFile.java.orig 2008-06-16 00:07:30.000000000 +0200 | ||
46 | +++ gnu/java/security/PolicyFile.java 2009-03-19 19:01:31.000000000 +0100 | ||
47 | @@ -41,7 +41,6 @@ | ||
48 | import gnu.classpath.debug.SystemLogger; | ||
49 | |||
50 | import gnu.java.lang.CPStringBuilder; | ||
51 | -import gnu.java.security.action.GetPropertyAction; | ||
52 | |||
53 | import java.io.File; | ||
54 | import java.io.IOException; | ||
55 | @@ -74,6 +73,8 @@ | ||
56 | import java.util.StringTokenizer; | ||
57 | import java.util.logging.Logger; | ||
58 | |||
59 | +import sun.security.action.GetPropertyAction; | ||
60 | + | ||
61 | /** | ||
62 | * An implementation of a {@link java.security.Policy} object whose | ||
63 | * permissions are specified by a <em>policy file</em>. | ||
64 | Index: gnu/java/security/action/GetPropertyAction.java | ||
65 | =================================================================== | ||
66 | --- gnu/java/security/action/GetPropertyAction.java 2006-12-10 21:25:42.000000000 +0100 | ||
67 | +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
68 | @@ -1,89 +0,0 @@ | ||
69 | -/* GetPropertyAction.java | ||
70 | - Copyright (C) 2004 Free Software Foundation, Inc. | ||
71 | - | ||
72 | -This file is part of GNU Classpath. | ||
73 | - | ||
74 | -GNU Classpath is free software; you can redistribute it and/or modify | ||
75 | -it under the terms of the GNU General Public License as published by | ||
76 | -the Free Software Foundation; either version 2, or (at your option) | ||
77 | -any later version. | ||
78 | - | ||
79 | -GNU Classpath is distributed in the hope that it will be useful, but | ||
80 | -WITHOUT ANY WARRANTY; without even the implied warranty of | ||
81 | -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
82 | -General Public License for more details. | ||
83 | - | ||
84 | -You should have received a copy of the GNU General Public License | ||
85 | -along with GNU Classpath; see the file COPYING. If not, write to the | ||
86 | -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
87 | -02110-1301 USA. | ||
88 | - | ||
89 | -Linking this library statically or dynamically with other modules is | ||
90 | -making a combined work based on this library. Thus, the terms and | ||
91 | -conditions of the GNU General Public License cover the whole | ||
92 | -combination. | ||
93 | - | ||
94 | -As a special exception, the copyright holders of this library give you | ||
95 | -permission to link this library with independent modules to produce an | ||
96 | -executable, regardless of the license terms of these independent | ||
97 | -modules, and to copy and distribute the resulting executable under | ||
98 | -terms of your choice, provided that you also meet, for each linked | ||
99 | -independent module, the terms and conditions of the license of that | ||
100 | -module. An independent module is a module which is not derived from | ||
101 | -or based on this library. If you modify this library, you may extend | ||
102 | -this exception to your version of the library, but you are not | ||
103 | -obligated to do so. If you do not wish to do so, delete this | ||
104 | -exception statement from your version. */ | ||
105 | - | ||
106 | -package gnu.java.security.action; | ||
107 | - | ||
108 | -import java.security.PrivilegedAction; | ||
109 | - | ||
110 | -/** | ||
111 | - * PrivilegedAction implementation that calls System.getProperty() with | ||
112 | - * the property name passed to its constructor. | ||
113 | - * | ||
114 | - * Example of use: | ||
115 | - * <code> | ||
116 | - * GetPropertyAction action = new GetPropertyAction("http.proxyPort"); | ||
117 | - * String port = AccessController.doPrivileged(action); | ||
118 | - * </code> | ||
119 | - */ | ||
120 | -public class GetPropertyAction implements PrivilegedAction<String> | ||
121 | -{ | ||
122 | - String name; | ||
123 | - String value = null; | ||
124 | - | ||
125 | - public GetPropertyAction() | ||
126 | - { | ||
127 | - } | ||
128 | - | ||
129 | - public GetPropertyAction(String propName) | ||
130 | - { | ||
131 | - setParameters(propName); | ||
132 | - } | ||
133 | - | ||
134 | - public GetPropertyAction(String propName, String defaultValue) | ||
135 | - { | ||
136 | - setParameters(propName, defaultValue); | ||
137 | - } | ||
138 | - | ||
139 | - public String run() | ||
140 | - { | ||
141 | - return System.getProperty(name, value); | ||
142 | - } | ||
143 | - | ||
144 | - public GetPropertyAction setParameters(String propName) | ||
145 | - { | ||
146 | - this.name = propName; | ||
147 | - this.value = null; | ||
148 | - return this; | ||
149 | - } | ||
150 | - | ||
151 | - public GetPropertyAction setParameters(String propName, String defaultValue) | ||
152 | - { | ||
153 | - this.name = propName; | ||
154 | - this.value = defaultValue; | ||
155 | - return this; | ||
156 | - } | ||
157 | -} | ||
158 | Index: gnu/java/security/key/dss/DSSKey.java | ||
159 | =================================================================== | ||
160 | --- gnu/java/security/key/dss/DSSKey.java.orig 2008-03-16 23:04:49.000000000 +0100 | ||
161 | +++ gnu/java/security/key/dss/DSSKey.java 2009-03-19 19:00:47.000000000 +0100 | ||
162 | @@ -41,7 +41,6 @@ | ||
163 | import gnu.java.lang.CPStringBuilder; | ||
164 | |||
165 | import gnu.java.security.Registry; | ||
166 | -import gnu.java.security.action.GetPropertyAction; | ||
167 | import gnu.java.security.util.FormatUtil; | ||
168 | |||
169 | import java.math.BigInteger; | ||
170 | @@ -51,6 +50,8 @@ | ||
171 | import java.security.interfaces.DSAParams; | ||
172 | import java.security.spec.DSAParameterSpec; | ||
173 | |||
174 | +import sun.security.action.GetPropertyAction; | ||
175 | + | ||
176 | /** | ||
177 | * A base asbtract class for both public and private DSS (Digital Signature | ||
178 | * Standard) keys. It encapsulates the three DSS numbers: <code>p</code>, | ||
179 | Index: gnu/java/security/key/dss/DSSPrivateKey.java | ||
180 | =================================================================== | ||
181 | --- gnu/java/security/key/dss/DSSPrivateKey.java.orig 2008-03-16 23:04:49.000000000 +0100 | ||
182 | +++ gnu/java/security/key/dss/DSSPrivateKey.java 2009-03-19 19:00:47.000000000 +0100 | ||
183 | @@ -42,7 +42,6 @@ | ||
184 | |||
185 | import gnu.java.security.Configuration; | ||
186 | import gnu.java.security.Registry; | ||
187 | -import gnu.java.security.action.GetPropertyAction; | ||
188 | import gnu.java.security.key.IKeyPairCodec; | ||
189 | |||
190 | import java.math.BigInteger; | ||
191 | @@ -50,6 +49,8 @@ | ||
192 | import java.security.PrivateKey; | ||
193 | import java.security.interfaces.DSAPrivateKey; | ||
194 | |||
195 | +import sun.security.action.GetPropertyAction; | ||
196 | + | ||
197 | /** | ||
198 | * An object that embodies a DSS (Digital Signature Standard) private key. | ||
199 | * | ||
200 | Index: gnu/java/security/key/dss/DSSPublicKey.java | ||
201 | =================================================================== | ||
202 | --- gnu/java/security/key/dss/DSSPublicKey.java.orig 2008-03-16 23:04:49.000000000 +0100 | ||
203 | +++ gnu/java/security/key/dss/DSSPublicKey.java 2009-03-19 19:00:47.000000000 +0100 | ||
204 | @@ -41,7 +41,6 @@ | ||
205 | import gnu.java.lang.CPStringBuilder; | ||
206 | |||
207 | import gnu.java.security.Registry; | ||
208 | -import gnu.java.security.action.GetPropertyAction; | ||
209 | import gnu.java.security.key.IKeyPairCodec; | ||
210 | |||
211 | import java.math.BigInteger; | ||
212 | @@ -49,6 +48,8 @@ | ||
213 | import java.security.PublicKey; | ||
214 | import java.security.interfaces.DSAPublicKey; | ||
215 | |||
216 | +import sun.security.action.GetPropertyAction; | ||
217 | + | ||
218 | /** | ||
219 | * An object that embodies a DSS (Digital Signature Standard) public key. | ||
220 | * | ||
221 | Index: gnu/java/security/key/rsa/GnuRSAKey.java | ||
222 | =================================================================== | ||
223 | --- gnu/java/security/key/rsa/GnuRSAKey.java.orig 2008-03-16 23:04:49.000000000 +0100 | ||
224 | +++ gnu/java/security/key/rsa/GnuRSAKey.java 2009-03-19 19:00:47.000000000 +0100 | ||
225 | @@ -41,7 +41,6 @@ | ||
226 | import gnu.java.lang.CPStringBuilder; | ||
227 | |||
228 | import gnu.java.security.Registry; | ||
229 | -import gnu.java.security.action.GetPropertyAction; | ||
230 | import gnu.java.security.util.FormatUtil; | ||
231 | |||
232 | import java.math.BigInteger; | ||
233 | @@ -49,6 +48,8 @@ | ||
234 | import java.security.Key; | ||
235 | import java.security.interfaces.RSAKey; | ||
236 | |||
237 | +import sun.security.action.GetPropertyAction; | ||
238 | + | ||
239 | /** | ||
240 | * A base asbtract class for both public and private RSA keys. | ||
241 | */ | ||
242 | Index: gnu/java/security/key/rsa/GnuRSAPrivateKey.java | ||
243 | =================================================================== | ||
244 | --- gnu/java/security/key/rsa/GnuRSAPrivateKey.java.orig 2008-03-16 23:04:50.000000000 +0100 | ||
245 | +++ gnu/java/security/key/rsa/GnuRSAPrivateKey.java 2009-03-19 19:00:47.000000000 +0100 | ||
246 | @@ -41,7 +41,6 @@ | ||
247 | import gnu.java.lang.CPStringBuilder; | ||
248 | |||
249 | import gnu.java.security.Configuration; | ||
250 | -import gnu.java.security.action.GetPropertyAction; | ||
251 | import gnu.java.security.Registry; | ||
252 | import gnu.java.security.key.IKeyPairCodec; | ||
253 | |||
254 | @@ -51,6 +50,8 @@ | ||
255 | import java.security.interfaces.RSAPrivateCrtKey; | ||
256 | import java.security.interfaces.RSAPrivateKey; | ||
257 | |||
258 | +import sun.security.action.GetPropertyAction; | ||
259 | + | ||
260 | /** | ||
261 | * An object that embodies an RSA private key. | ||
262 | * <p> | ||
263 | Index: gnu/java/security/key/rsa/GnuRSAPublicKey.java | ||
264 | =================================================================== | ||
265 | --- gnu/java/security/key/rsa/GnuRSAPublicKey.java.orig 2008-03-16 23:04:50.000000000 +0100 | ||
266 | +++ gnu/java/security/key/rsa/GnuRSAPublicKey.java 2009-03-19 19:00:47.000000000 +0100 | ||
267 | @@ -41,7 +41,6 @@ | ||
268 | import gnu.java.lang.CPStringBuilder; | ||
269 | |||
270 | import gnu.java.security.Registry; | ||
271 | -import gnu.java.security.action.GetPropertyAction; | ||
272 | import gnu.java.security.key.IKeyPairCodec; | ||
273 | |||
274 | import java.math.BigInteger; | ||
275 | @@ -49,6 +48,8 @@ | ||
276 | import java.security.PublicKey; | ||
277 | import java.security.interfaces.RSAPublicKey; | ||
278 | |||
279 | +import sun.security.action.GetPropertyAction; | ||
280 | + | ||
281 | /** | ||
282 | * An object that encapsulates an RSA public key. | ||
283 | * <p> | ||
284 | Index: gnu/javax/crypto/key/dh/GnuDHKey.java | ||
285 | =================================================================== | ||
286 | --- gnu/javax/crypto/key/dh/GnuDHKey.java.orig 2006-07-11 18:03:59.000000000 +0200 | ||
287 | +++ gnu/javax/crypto/key/dh/GnuDHKey.java 2009-03-19 19:00:47.000000000 +0100 | ||
288 | @@ -39,7 +39,6 @@ | ||
289 | package gnu.javax.crypto.key.dh; | ||
290 | |||
291 | import gnu.java.security.Registry; | ||
292 | -import gnu.java.security.action.GetPropertyAction; | ||
293 | import gnu.java.security.util.FormatUtil; | ||
294 | |||
295 | import java.math.BigInteger; | ||
296 | @@ -49,6 +48,8 @@ | ||
297 | import javax.crypto.interfaces.DHKey; | ||
298 | import javax.crypto.spec.DHParameterSpec; | ||
299 | |||
300 | +import sun.security.action.GetPropertyAction; | ||
301 | + | ||
302 | /** | ||
303 | * A base asbtract class for both public and private Diffie-Hellman keys. It | ||
304 | * encapsulates the two DH numbers: <code>p</code>, and <code>g</code>. | ||
305 | Index: gnu/javax/crypto/key/dh/GnuDHPrivateKey.java | ||
306 | =================================================================== | ||
307 | --- gnu/javax/crypto/key/dh/GnuDHPrivateKey.java.orig 2006-07-11 18:03:59.000000000 +0200 | ||
308 | +++ gnu/javax/crypto/key/dh/GnuDHPrivateKey.java 2009-03-19 19:00:47.000000000 +0100 | ||
309 | @@ -40,7 +40,6 @@ | ||
310 | |||
311 | import gnu.java.security.Configuration; | ||
312 | import gnu.java.security.Registry; | ||
313 | -import gnu.java.security.action.GetPropertyAction; | ||
314 | import gnu.java.security.key.IKeyPairCodec; | ||
315 | |||
316 | import java.math.BigInteger; | ||
317 | @@ -48,6 +47,8 @@ | ||
318 | |||
319 | import javax.crypto.interfaces.DHPrivateKey; | ||
320 | |||
321 | +import sun.security.action.GetPropertyAction; | ||
322 | + | ||
323 | /** | ||
324 | * An implementation of the Diffie-Hellman private key. | ||
325 | * <p> | ||
326 | Index: gnu/javax/crypto/key/dh/GnuDHPublicKey.java | ||
327 | =================================================================== | ||
328 | --- gnu/javax/crypto/key/dh/GnuDHPublicKey.java.orig 2006-07-11 18:03:59.000000000 +0200 | ||
329 | +++ gnu/javax/crypto/key/dh/GnuDHPublicKey.java 2009-03-19 19:00:47.000000000 +0100 | ||
330 | @@ -39,7 +39,6 @@ | ||
331 | package gnu.javax.crypto.key.dh; | ||
332 | |||
333 | import gnu.java.security.Registry; | ||
334 | -import gnu.java.security.action.GetPropertyAction; | ||
335 | import gnu.java.security.key.IKeyPairCodec; | ||
336 | |||
337 | import java.math.BigInteger; | ||
338 | @@ -47,6 +46,8 @@ | ||
339 | |||
340 | import javax.crypto.interfaces.DHPublicKey; | ||
341 | |||
342 | +import sun.security.action.GetPropertyAction; | ||
343 | + | ||
344 | /** | ||
345 | * An implementation of the Diffie-Hellman public key. | ||
346 | * <p> | ||
347 | Index: gnu/javax/crypto/sasl/plain/PasswordFile.java | ||
348 | =================================================================== | ||
349 | --- gnu/javax/crypto/sasl/plain/PasswordFile.java.orig 2008-05-05 23:29:46.000000000 +0200 | ||
350 | +++ gnu/javax/crypto/sasl/plain/PasswordFile.java 2009-03-19 19:00:47.000000000 +0100 | ||
351 | @@ -40,7 +40,6 @@ | ||
352 | |||
353 | import gnu.java.lang.CPStringBuilder; | ||
354 | |||
355 | -import gnu.java.security.action.GetPropertyAction; | ||
356 | import gnu.javax.crypto.sasl.NoSuchUserException; | ||
357 | import gnu.javax.crypto.sasl.UserAlreadyExistsException; | ||
358 | |||
359 | @@ -58,6 +57,8 @@ | ||
360 | import java.util.NoSuchElementException; | ||
361 | import java.util.StringTokenizer; | ||
362 | |||
363 | +import sun.security.action.GetPropertyAction; | ||
364 | + | ||
365 | /** | ||
366 | * A representation of a Plain password file. | ||
367 | */ | ||
368 | Index: gnu/javax/net/ssl/provider/X509TrustManagerFactory.java | ||
369 | =================================================================== | ||
370 | --- gnu/javax/net/ssl/provider/X509TrustManagerFactory.java.orig 2006-12-10 21:25:43.000000000 +0100 | ||
371 | +++ gnu/javax/net/ssl/provider/X509TrustManagerFactory.java 2009-03-19 19:00:47.000000000 +0100 | ||
372 | @@ -66,11 +66,12 @@ | ||
373 | import javax.net.ssl.TrustManagerFactorySpi; | ||
374 | import javax.net.ssl.X509TrustManager; | ||
375 | |||
376 | -import gnu.java.security.action.GetPropertyAction; | ||
377 | import gnu.java.security.x509.X509CertPath; | ||
378 | import gnu.javax.net.ssl.NullManagerParameters; | ||
379 | import gnu.javax.net.ssl.StaticTrustAnchors; | ||
380 | |||
381 | +import sun.security.action.GetPropertyAction; | ||
382 | + | ||
383 | /** | ||
384 | * This class implements a {@link javax.net.ssl.TrustManagerFactory} engine | ||
385 | * for the ``JessieX509'' algorithm. | ||
386 | Index: gnu/xml/aelfred2/XmlParser.java | ||
387 | =================================================================== | ||
388 | --- gnu/xml/aelfred2/XmlParser.java.orig 2008-01-11 22:22:59.000000000 +0100 | ||
389 | +++ gnu/xml/aelfred2/XmlParser.java 2009-03-19 19:00:47.000000000 +0100 | ||
390 | @@ -53,8 +53,6 @@ | ||
391 | |||
392 | package gnu.xml.aelfred2; | ||
393 | |||
394 | -import gnu.java.security.action.GetPropertyAction; | ||
395 | - | ||
396 | import java.io.BufferedInputStream; | ||
397 | import java.io.CharConversionException; | ||
398 | import java.io.EOFException; | ||
399 | @@ -74,6 +72,7 @@ | ||
400 | import org.xml.sax.InputSource; | ||
401 | import org.xml.sax.SAXException; | ||
402 | |||
403 | +import sun.security.action.GetPropertyAction; | ||
404 | |||
405 | /** | ||
406 | * Parse XML documents and return parse events through call-backs. | ||
407 | Index: sun/security/action/GetPropertyAction.java | ||
408 | =================================================================== | ||
409 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
410 | +++ sun/security/action/GetPropertyAction.java 2009-03-19 19:00:47.000000000 +0100 | ||
411 | @@ -0,0 +1,92 @@ | ||
412 | +/* GetPropertyAction.java | ||
413 | + Copyright (C) 2004, 2008 Free Software Foundation, Inc. | ||
414 | + | ||
415 | +This file is part of GNU Classpath. | ||
416 | + | ||
417 | +GNU Classpath is free software; you can redistribute it and/or modify | ||
418 | +it under the terms of the GNU General Public License as published by | ||
419 | +the Free Software Foundation; either version 2, or (at your option) | ||
420 | +any later version. | ||
421 | + | ||
422 | +GNU Classpath is distributed in the hope that it will be useful, but | ||
423 | +WITHOUT ANY WARRANTY; without even the implied warranty of | ||
424 | +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
425 | +General Public License for more details. | ||
426 | + | ||
427 | +You should have received a copy of the GNU General Public License | ||
428 | +along with GNU Classpath; see the file COPYING. If not, write to the | ||
429 | +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
430 | +02110-1301 USA. | ||
431 | + | ||
432 | +Linking this library statically or dynamically with other modules is | ||
433 | +making a combined work based on this library. Thus, the terms and | ||
434 | +conditions of the GNU General Public License cover the whole | ||
435 | +combination. | ||
436 | + | ||
437 | +As a special exception, the copyright holders of this library give you | ||
438 | +permission to link this library with independent modules to produce an | ||
439 | +executable, regardless of the license terms of these independent | ||
440 | +modules, and to copy and distribute the resulting executable under | ||
441 | +terms of your choice, provided that you also meet, for each linked | ||
442 | +independent module, the terms and conditions of the license of that | ||
443 | +module. An independent module is a module which is not derived from | ||
444 | +or based on this library. If you modify this library, you may extend | ||
445 | +this exception to your version of the library, but you are not | ||
446 | +obligated to do so. If you do not wish to do so, delete this | ||
447 | +exception statement from your version. */ | ||
448 | + | ||
449 | +package sun.security.action; | ||
450 | + | ||
451 | +import java.security.PrivilegedAction; | ||
452 | + | ||
453 | +/** | ||
454 | + * PrivilegedAction implementation that calls System.getProperty() with | ||
455 | + * the property name passed to its constructor. | ||
456 | + * | ||
457 | + * Example of use: | ||
458 | + * <code> | ||
459 | + * GetPropertyAction action = new GetPropertyAction("http.proxyPort"); | ||
460 | + * String port = AccessController.doPrivileged(action); | ||
461 | + * </code> | ||
462 | + * | ||
463 | + * Note: Usage of this class is discouraged as it is not a part of the | ||
464 | + * J2SE API. | ||
465 | + */ | ||
466 | +public class GetPropertyAction implements PrivilegedAction<String> | ||
467 | +{ | ||
468 | + String name; | ||
469 | + String value = null; | ||
470 | + | ||
471 | + public GetPropertyAction() | ||
472 | + { | ||
473 | + } | ||
474 | + | ||
475 | + public GetPropertyAction(String propName) | ||
476 | + { | ||
477 | + setParameters(propName); | ||
478 | + } | ||
479 | + | ||
480 | + public GetPropertyAction(String propName, String defaultValue) | ||
481 | + { | ||
482 | + setParameters(propName, defaultValue); | ||
483 | + } | ||
484 | + | ||
485 | + public String run() | ||
486 | + { | ||
487 | + return System.getProperty(name, value); | ||
488 | + } | ||
489 | + | ||
490 | + public GetPropertyAction setParameters(String propName) | ||
491 | + { | ||
492 | + this.name = propName; | ||
493 | + this.value = null; | ||
494 | + return this; | ||
495 | + } | ||
496 | + | ||
497 | + public GetPropertyAction setParameters(String propName, String defaultValue) | ||
498 | + { | ||
499 | + this.name = propName; | ||
500 | + this.value = defaultValue; | ||
501 | + return this; | ||
502 | + } | ||
503 | +} | ||
diff --git a/recipes-core/classpath/classpath-0.98/toolwrapper-exithook.patch b/recipes-core/classpath/classpath-0.98/toolwrapper-exithook.patch new file mode 100644 index 0000000..49b6631 --- /dev/null +++ b/recipes-core/classpath/classpath-0.98/toolwrapper-exithook.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | Index: classpath-0.97.2/tools/toolwrapper.c | ||
2 | =================================================================== | ||
3 | --- classpath-0.97.2.orig/tools/toolwrapper.c 2006-12-13 18:56:44.000000000 +0100 | ||
4 | +++ classpath-0.97.2/tools/toolwrapper.c 2009-12-24 13:16:44.295000627 +0100 | ||
5 | @@ -59,6 +59,10 @@ | ||
6 | /* Typedef for JNI_CreateJavaVM dlopen call. */ | ||
7 | typedef jint createVM (JavaVM **, void **, void *); | ||
8 | |||
9 | +void exit_hook(jint); | ||
10 | + | ||
11 | +int return_code = 1; | ||
12 | + | ||
13 | int | ||
14 | main (int argc, const char** argv) | ||
15 | { | ||
16 | @@ -143,6 +147,17 @@ | ||
17 | vm_args.options[vm_args.nOptions++].optionString = "-Xbootclasspath/p:" TOOLS_ZIP; | ||
18 | } | ||
19 | |||
20 | + /* Set the exit hook */ | ||
21 | + vm_args.options = (JavaVMOption*) realloc (vm_args.options, (vm_args.nOptions + 1) * sizeof (JavaVMOption)); | ||
22 | + | ||
23 | + if (vm_args.options == NULL) | ||
24 | + { | ||
25 | + fprintf (stderr, TOOLNAME ": realloc failed.\n"); | ||
26 | + goto destroy; | ||
27 | + } | ||
28 | + vm_args.options[vm_args.nOptions].optionString = "exit"; | ||
29 | + vm_args.options[vm_args.nOptions++].extraInfo = (void *) exit_hook; | ||
30 | + | ||
31 | /* Terminate vm_args.options with a NULL element. */ | ||
32 | vm_args.options = (JavaVMOption*) realloc (vm_args.options, (vm_args.nOptions + 1) * sizeof (JavaVMOption)); | ||
33 | if (vm_args.options == NULL) | ||
34 | @@ -260,5 +275,11 @@ | ||
35 | if (lt_dlexit () != 0) | ||
36 | fprintf (stderr, TOOLNAME ": lt_dlexit failed.\n"); | ||
37 | |||
38 | - return 1; | ||
39 | + return return_code; | ||
40 | +} | ||
41 | + | ||
42 | +void exit_hook(jint code) | ||
43 | +{ | ||
44 | + return_code = code; | ||
45 | } | ||
46 | + | ||
diff --git a/recipes-core/classpath/classpath-initial-0.93/miscompilation.patch b/recipes-core/classpath/classpath-initial-0.93/miscompilation.patch new file mode 100644 index 0000000..99db6f3 --- /dev/null +++ b/recipes-core/classpath/classpath-initial-0.93/miscompilation.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: classpath-0.93/native/jni/java-io/java_io_VMFile.c | ||
2 | =================================================================== | ||
3 | --- classpath-0.93.orig/native/jni/java-io/java_io_VMFile.c 2006-09-23 07:17:45.000000000 +0200 | ||
4 | +++ classpath-0.93/native/jni/java-io/java_io_VMFile.c 2008-11-14 13:41:27.000000000 +0100 | ||
5 | @@ -239,7 +239,7 @@ | ||
6 | { | ||
7 | #ifndef WITHOUT_FILESYSTEM | ||
8 | const char *filename; | ||
9 | - int result; | ||
10 | + volatile int result; | ||
11 | |||
12 | /* Don't use the JCL convert function because it throws an exception | ||
13 | on failure */ | ||
diff --git a/recipes-core/classpath/classpath-initial_0.93.bb b/recipes-core/classpath/classpath-initial_0.93.bb new file mode 100644 index 0000000..77831c1 --- /dev/null +++ b/recipes-core/classpath/classpath-initial_0.93.bb | |||
@@ -0,0 +1,37 @@ | |||
1 | # No later version of Classpath may be used because this is the latest that can be compiled | ||
2 | # by jikes! | ||
3 | |||
4 | require classpath-native.inc | ||
5 | |||
6 | DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native." | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" | ||
8 | |||
9 | DEPENDS = "zip-native fastjar-native jikes-native gettext-native" | ||
10 | |||
11 | SRC_URI += " \ | ||
12 | file://autotools.patch \ | ||
13 | file://miscompilation.patch \ | ||
14 | " | ||
15 | |||
16 | EXTRA_OECONF = " \ | ||
17 | --with-jikes=jikes \ | ||
18 | --with-fastjar=fastjar \ | ||
19 | --with-glibj \ | ||
20 | --disable-Werror \ | ||
21 | --disable-local-sockets \ | ||
22 | --disable-alsa \ | ||
23 | --disable-gconf-peer \ | ||
24 | --disable-gtk-peer \ | ||
25 | --disable-plugin \ | ||
26 | --disable-dssi \ | ||
27 | --disable-examples \ | ||
28 | --disable-tools \ | ||
29 | --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \ | ||
30 | --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \ | ||
31 | --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \ | ||
32 | --with-vm=java \ | ||
33 | " | ||
34 | |||
35 | SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" | ||
36 | SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" | ||
37 | |||
diff --git a/recipes-core/classpath/classpath-native.inc b/recipes-core/classpath/classpath-native.inc new file mode 100644 index 0000000..aefbf6d --- /dev/null +++ b/recipes-core/classpath/classpath-native.inc | |||
@@ -0,0 +1,34 @@ | |||
1 | DESCRIPTION = "GNU Classpath standard Java libraries - For native Java-dependent programs" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/classpath/" | ||
3 | LICENSE = "Classpath" | ||
4 | |||
5 | DEPENDS = "ecj-initial fastjar-native zip-native gettext-native" | ||
6 | |||
7 | inherit autotools native | ||
8 | |||
9 | SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" | ||
10 | |||
11 | do_configure_prepend () { | ||
12 | |||
13 | cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S} | ||
14 | } | ||
15 | |||
16 | export JAVA="${STAGING_BINDIR_NATIVE}/java-initial" | ||
17 | export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" | ||
18 | export JAVACFLAGS="-nowarn" | ||
19 | |||
20 | EXTRA_OECONF = " \ | ||
21 | --with-glibj \ | ||
22 | --enable-local-sockets \ | ||
23 | --disable-Werror \ | ||
24 | --disable-alsa \ | ||
25 | --disable-gconf-peer \ | ||
26 | --disable-gtk-peer \ | ||
27 | --disable-plugin \ | ||
28 | --disable-dssi \ | ||
29 | --disable-gjdoc \ | ||
30 | --disable-examples \ | ||
31 | --enable-tools \ | ||
32 | --includedir=${STAGING_INCDIR}/classpath \ | ||
33 | " | ||
34 | |||
diff --git a/recipes-core/classpath/classpath-native_0.98.bb b/recipes-core/classpath/classpath-native_0.98.bb new file mode 100644 index 0000000..55022fb --- /dev/null +++ b/recipes-core/classpath/classpath-native_0.98.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | require classpath-native.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" | ||
4 | |||
5 | SRC_URI += " \ | ||
6 | file://SimpleName.diff;striplevel=0 \ | ||
7 | file://sun-security-getproperty.patch;striplevel=0 \ | ||
8 | file://ecj_java_dir.patch \ | ||
9 | file://autotools.patch \ | ||
10 | file://miscompilation.patch \ | ||
11 | file://toolwrapper-exithook.patch \ | ||
12 | " | ||
13 | |||
14 | do_unpackpost() { | ||
15 | # Kind of patch: Moves package "org.w3c.dom.html2" to "org.w3c.dom.html" | ||
16 | mv external/w3c_dom/org/w3c/dom/html2 \ | ||
17 | external/w3c_dom/org/w3c/dom/html | ||
18 | |||
19 | find examples/gnu/classpath/examples/html gnu/xml/dom/html2 external/w3c_dom/org/w3c/dom/html -name "*.java" \ | ||
20 | -exec sed -i -e"s|org.w3c.dom.html2|org.w3c.dom.html|" {} \; | ||
21 | |||
22 | sed -i -e"s|org/w3c/dom/html2|org/w3c/dom/html|" external/w3c_dom/Makefile.am | ||
23 | } | ||
24 | |||
25 | addtask unpackpost after do_unpack before do_patch | ||
26 | |||
27 | SRC_URI[md5sum] = "90c6571b8b0309e372faa0f9f6255ea9" | ||
28 | SRC_URI[sha256sum] = "501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f" | ||
29 | |||
diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc new file mode 100644 index 0000000..dfe4a68 --- /dev/null +++ b/recipes-core/classpath/classpath.inc | |||
@@ -0,0 +1,86 @@ | |||
1 | DESCRIPTION = "GNU Classpath standard Java libraries" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/classpath/" | ||
3 | SECTION = "libs" | ||
4 | PRIORITY = "optional" | ||
5 | LICENSE = "Classpath" | ||
6 | PBN = "classpath" | ||
7 | |||
8 | |||
9 | inherit autotools java | ||
10 | |||
11 | DEPENDS = "virtual/javac-native fastjar-native zip-native gettext-native gmp antlr-native gtk+ gconf libxtst" | ||
12 | |||
13 | RPROVIDES_${PN} = "" | ||
14 | |||
15 | RDEPENDS_${PN} = "${PBN}-common (>= ${PV})" | ||
16 | RDEPENDS_${PN}-examples = "java2-runtime ${PN}-awt" | ||
17 | RDEPENDS_${PN}-tools = "java2-runtime" | ||
18 | |||
19 | RPROVIDES_${PN} = "${PBN}" | ||
20 | RPROVIDES_${PN}-common = "${PBN}-common" | ||
21 | RPROVIDES_${PN}-gtk = "${PBN}-awt" | ||
22 | |||
23 | SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" | ||
24 | |||
25 | S = "${WORKDIR}/${PBN}-${PV}" | ||
26 | |||
27 | export JAVA = "java" | ||
28 | |||
29 | EXTRA_OECONF = "\ | ||
30 | --with-glibj \ | ||
31 | --with-ecj=javac \ | ||
32 | --with-fastjar=fastjar \ | ||
33 | --includedir=${includedir}/classpath \ | ||
34 | --with-vm=java \ | ||
35 | --disable-Werror \ | ||
36 | --with-antlr-jar=${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar \ | ||
37 | --disable-alsa \ | ||
38 | --disable-dssi \ | ||
39 | --disable-qt4-peer \ | ||
40 | --disable-plugin \ | ||
41 | --enable-gconf-peer \ | ||
42 | --enable-gtk-peer \ | ||
43 | --enable-local-sockets \ | ||
44 | --with-vm=java \ | ||
45 | " | ||
46 | |||
47 | |||
48 | EXTRA_OECONF += "\ | ||
49 | " | ||
50 | |||
51 | do_configure_prepend () { | ||
52 | cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S} | ||
53 | } | ||
54 | |||
55 | |||
56 | do_install() { | ||
57 | autotools_do_install | ||
58 | mv ${D}${libdir}/security ${D}${libdir}/${PBN} | ||
59 | } | ||
60 | |||
61 | # Defines the packages that this classpath recipe creates. | ||
62 | # This allows the classpath-minimal variants to override this | ||
63 | # again. | ||
64 | CPPACKAGES = "${PBN}-common ${PN}-examples \ | ||
65 | ${PN}-tools ${PN}-tools-doc \ | ||
66 | ${PN}-gtk ${PN}-gconf" | ||
67 | |||
68 | PACKAGES =+ "${CPPACKAGES}" | ||
69 | |||
70 | FILES_${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}" | ||
71 | |||
72 | FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip ${libdir}/logging.properties ${libdir}/${PBN}/security" | ||
73 | FILES_${PN}-examples = "${datadir}/${PBN}/examples" | ||
74 | |||
75 | FILES_${PN}-tools = "${datadir}/${PBN}/tools.zip ${bindir}" | ||
76 | FILES_${PN}-tools-doc = "${mandir}" | ||
77 | |||
78 | FILES_${PN}-dbg += "${libdir}/${PBN}/.debug" | ||
79 | FILES_${PN}-doc = "${infodir}" | ||
80 | |||
81 | # gcjwebplugin - not built yet | ||
82 | #FILES_${PN}-gcjwebplugin = "${libdir}/${PBN}/libgcjwebplugin.so" | ||
83 | FILES_${PN}-gtk = "${libdir}/${PBN}/libgtkpeer.so ${libdir}/${PBN}/libjawt.so" | ||
84 | FILES_${PN}-gconf = "${libdir}/${PBN}/libgconfpeer.so" | ||
85 | FILES_${PN} = "${libdir}/${PBN}/lib*so*" | ||
86 | |||
diff --git a/recipes-core/classpath/classpath_0.98.bb b/recipes-core/classpath/classpath_0.98.bb new file mode 100644 index 0000000..21223c9 --- /dev/null +++ b/recipes-core/classpath/classpath_0.98.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require classpath.inc | ||
2 | |||
3 | SRC_URI += " \ | ||
4 | file://SimpleName.diff;striplevel=0 \ | ||
5 | file://ecj_java_dir.patch \ | ||
6 | file://autotools.patch \ | ||
7 | file://fix-gmp.patch \ | ||
8 | file://toolwrapper-exithook.patch \ | ||
9 | " | ||
10 | |||
11 | SRC_URI[md5sum] = "90c6571b8b0309e372faa0f9f6255ea9" | ||
12 | SRC_URI[sha256sum] = "501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f" | ||
13 | |||
diff --git a/recipes-core/classpath/files/autotools.patch b/recipes-core/classpath/files/autotools.patch new file mode 100644 index 0000000..663c034 --- /dev/null +++ b/recipes-core/classpath/files/autotools.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Index: classpath-0.93/configure.ac | ||
2 | =================================================================== | ||
3 | --- classpath-0.93.orig/configure.ac 2006-12-08 20:22:50.000000000 +0100 | ||
4 | +++ classpath-0.93/configure.ac 2008-08-25 22:07:40.711946598 +0200 | ||
5 | @@ -41,6 +41,11 @@ | ||
6 | AC_CONFIG_HEADERS([include/config.h]) | ||
7 | AC_PREFIX_DEFAULT(/usr/local/classpath) | ||
8 | |||
9 | +AC_CONFIG_MACRO_DIR([m4]) | ||
10 | + | ||
11 | + | ||
12 | +AM_ICONV_LINK | ||
13 | + | ||
14 | dnl ----------------------------------------------------------- | ||
15 | dnl Enable collections.jar (disabled by default) | ||
16 | dnl ----------------------------------------------------------- | ||
17 | @@ -312,6 +317,7 @@ | ||
18 | dnl AC_PROG_AWK | ||
19 | AC_PROG_CC | ||
20 | AC_PROG_CPP | ||
21 | +AM_PROG_CC_C_O | ||
22 | |||
23 | # Handle -Werror default case. | ||
24 | if test "$ENABLE_WERROR" = default; then | ||
diff --git a/recipes-core/classpathx/gnujaf-1.1.1/datadir_java.patch b/recipes-core/classpathx/gnujaf-1.1.1/datadir_java.patch new file mode 100644 index 0000000..807a1cb --- /dev/null +++ b/recipes-core/classpathx/gnujaf-1.1.1/datadir_java.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Index: activation-1.1.1/Makefile.am | ||
2 | =================================================================== | ||
3 | --- activation-1.1.1.orig/Makefile.am 2008-03-01 10:30:06.000000000 +0100 | ||
4 | +++ activation-1.1.1/Makefile.am 2008-03-01 10:31:04.000000000 +0100 | ||
5 | @@ -7,6 +7,8 @@ | ||
6 | JAVADOC = @JAVADOC@ | ||
7 | JAVADOCFLAGS = @JAVADOCFLAGS@ | ||
8 | |||
9 | +JARDIR = $(datadir)/java | ||
10 | + | ||
11 | src = @srcdir@/source | ||
12 | dst = classes | ||
13 | doc = @srcdir@/docs | ||
14 | @@ -92,7 +94,7 @@ | ||
15 | $(RM) config.log config.status | ||
16 | |||
17 | install-data-local: | ||
18 | - @srcdir@/mkinstalldirs $(DESTDIR)/$(datadir)/java | ||
19 | - $(INSTALL_DATA) $(activation_jar) $(DESTDIR)/$(datadir)/java | ||
20 | + @srcdir@/mkinstalldirs $(DESTDIR)/$(JARDIR) | ||
21 | + $(INSTALL_DATA) $(activation_jar) $(DESTDIR)/$(JARDIR) | ||
22 | |||
23 | # End of Makefile.am | ||
diff --git a/recipes-core/classpathx/gnujaf_1.1.1.bb b/recipes-core/classpathx/gnujaf_1.1.1.bb new file mode 100644 index 0000000..2c055bb --- /dev/null +++ b/recipes-core/classpathx/gnujaf_1.1.1.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | DESCRIPTION = "Provides a mean to type data and locate components suitable for performing various kinds of action on it." | ||
2 | AUTHOR = "GNU ClasspathX" | ||
3 | LICENSE = "GPL+libraryexception" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" | ||
5 | |||
6 | SRC_URI = "http://ftp.gnu.org/gnu/classpathx/activation-${PV}.tar.gz \ | ||
7 | file://datadir_java.patch \ | ||
8 | " | ||
9 | |||
10 | inherit autotools java-library | ||
11 | |||
12 | S = "${WORKDIR}/activation-${PV}" | ||
13 | |||
14 | export JAVAC = "javac" | ||
15 | |||
16 | # Fake javadoc | ||
17 | export JAVADOC = "true" | ||
18 | |||
19 | JARFILENAME = "activation-${PV}.jar" | ||
20 | ALTJARFILENAMES = "activation.jar gnujaf.jar" | ||
21 | |||
22 | do_compile() { | ||
23 | mkdir -p build | ||
24 | |||
25 | javac -sourcepath source -d build `find source -name "*.java"` | ||
26 | |||
27 | fastjar -C build -c -f ${JARFILENAME} . | ||
28 | } | ||
29 | |||
30 | SRC_URI[md5sum] = "de50d7728e8140eb404f2b4554321f8c" | ||
31 | SRC_URI[sha256sum] = "b1b5ef560d30fcb11fbf537246857d14110ce4eb2b200d4c54690472305d87b7" | ||
32 | |||
33 | NATIVE_INSTALL_WORKS = "1" | ||
34 | BBCLASSEXTEND = "native" | ||
35 | |||
diff --git a/recipes-core/classpathx/gnumail-1.1.2/datadir_java.patch b/recipes-core/classpathx/gnumail-1.1.2/datadir_java.patch new file mode 100644 index 0000000..50e908d --- /dev/null +++ b/recipes-core/classpathx/gnumail-1.1.2/datadir_java.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Index: mail-1.1.2/Makefile.am | ||
2 | =================================================================== | ||
3 | --- mail-1.1.2.orig/Makefile.am 2008-03-01 11:13:36.000000000 +0100 | ||
4 | +++ mail-1.1.2/Makefile.am 2008-03-01 11:17:49.000000000 +0100 | ||
5 | @@ -7,6 +7,8 @@ | ||
6 | JAVADOC = @JAVADOC@ | ||
7 | JAVADOCFLAGS = @JAVADOCFLAGS@ | ||
8 | |||
9 | +JARDIR = $(datadir)/java | ||
10 | + | ||
11 | src = @srcdir@/source | ||
12 | dst = classes | ||
13 | doc = @srcdir@/docs | ||
14 | @@ -433,8 +435,8 @@ | ||
15 | rm -rf $(gnumail_jar) $(providers_jar) META-INF $(dst) $(doc) | ||
16 | |||
17 | install-data-local: | ||
18 | - @srcdir@/mkinstalldirs $(DESTDIR)/$(datadir)/java | ||
19 | - $(INSTALL_DATA) $(gnumail_jar) $(DESTDIR)/$(datadir)/java | ||
20 | - $(INSTALL_DATA) $(providers_jar) $(DESTDIR)/$(datadir)/java | ||
21 | + @srcdir@/mkinstalldirs $(DESTDIR)/$(JARDIR) | ||
22 | + $(INSTALL_DATA) $(gnumail_jar) $(DESTDIR)/$(JARDIR) | ||
23 | + $(INSTALL_DATA) $(providers_jar) $(DESTDIR)/$(JARDIR) | ||
24 | |||
25 | # End of Makefile.am | ||
diff --git a/recipes-core/classpathx/gnumail_1.1.2.bb b/recipes-core/classpathx/gnumail_1.1.2.bb new file mode 100644 index 0000000..4cdee2b --- /dev/null +++ b/recipes-core/classpathx/gnumail_1.1.2.bb | |||
@@ -0,0 +1,39 @@ | |||
1 | DESCRIPTION = "GNU's free implementation of the JavaMail API specification" | ||
2 | AUTHOR = "GNU ClasspathX" | ||
3 | LICENSE = "GPL+libraryexception" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=14bc6ee8b2e2b409be599212867d126e" | ||
5 | |||
6 | SRC_URI = "http://ftp.gnu.org/gnu/classpathx/mail-${PV}.tar.gz \ | ||
7 | file://datadir_java.patch \ | ||
8 | " | ||
9 | |||
10 | inherit java-library autotools | ||
11 | |||
12 | S = "${WORKDIR}/mail-${PV}" | ||
13 | |||
14 | DEPENDS = "gnujaf inetlib" | ||
15 | DEPENDS_virtclass-native = "gnujaf-native inetlib-native" | ||
16 | |||
17 | export JAVAC = "${STAGING_BINDIR_NATIVE}/javac" | ||
18 | export JAVA = "${STAGING_BINDIR_NATIVE}/java" | ||
19 | |||
20 | # Fake javadoc | ||
21 | export JAVADOC = "true" | ||
22 | |||
23 | EXTRA_OECONF = " \ | ||
24 | --with-inetlib-jar=${STAGING_DATADIR_JAVA} \ | ||
25 | --with-activation-jar=${STAGING_DATADIR_JAVA} \ | ||
26 | " | ||
27 | |||
28 | do_compile() { | ||
29 | oe_runmake \ | ||
30 | JARDIR=${datadir_java} \ | ||
31 | gnumail_jar=${JARFILENAME} \ | ||
32 | providers_jar=${P}-providers.jar | ||
33 | } | ||
34 | |||
35 | SRC_URI[md5sum] = "0a94ff4328ceb6a4131be96946976a33" | ||
36 | SRC_URI[sha256sum] = "5eb09597a8f81bfc943206e3e0f45b963ba605a646051c353374f1b475bb9f04" | ||
37 | |||
38 | BBCLASSEXTEND = "native" | ||
39 | |||
diff --git a/recipes-core/classpathx/inetlib-1.1.1/datadir_java.patch b/recipes-core/classpathx/inetlib-1.1.1/datadir_java.patch new file mode 100644 index 0000000..16302cd --- /dev/null +++ b/recipes-core/classpathx/inetlib-1.1.1/datadir_java.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Index: inetlib-1.1.1/Makefile.am | ||
2 | =================================================================== | ||
3 | --- inetlib-1.1.1.orig/Makefile.am 2008-03-01 10:49:49.000000000 +0100 | ||
4 | +++ inetlib-1.1.1/Makefile.am 2008-03-01 10:52:21.000000000 +0100 | ||
5 | @@ -7,6 +7,8 @@ | ||
6 | JAVADOC = @JAVADOC@ | ||
7 | JAVADOCFLAGS = @JAVADOCFLAGS@ | ||
8 | |||
9 | +JARDIR = $(datadir)/java | ||
10 | + | ||
11 | src = @srcdir@/source | ||
12 | dst = classes | ||
13 | doc = @srcdir@/docs | ||
14 | @@ -280,7 +282,7 @@ | ||
15 | find $(dst) -name '*.class' -exec rm -f '{}' ';' | ||
16 | |||
17 | install-data-local: | ||
18 | - $(mkinstalldirs) $(prefix)/share/java | ||
19 | - $(INSTALL_DATA) $(inetlib_jar) $(prefix)/share/java | ||
20 | + $(mkinstalldirs) $(DESTDIR)/$(JARDIR) | ||
21 | + $(INSTALL_DATA) $(inetlib_jar) $(DESTDIR)/$(JARDIR) | ||
22 | |||
23 | # End of Makefile.am | ||
diff --git a/recipes-core/classpathx/inetlib_1.1.1.bb b/recipes-core/classpathx/inetlib_1.1.1.bb new file mode 100644 index 0000000..862b730 --- /dev/null +++ b/recipes-core/classpathx/inetlib_1.1.1.bb | |||
@@ -0,0 +1,31 @@ | |||
1 | DESCRIPTION = "A Java library of clients for common internet protocols" | ||
2 | AUTHOR = "GNU Classpath" | ||
3 | HOMEPAGE = "http://gnu.org/software/classpath/inetlib.html" | ||
4 | LICENSE = "GPL+libraryexception" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
6 | |||
7 | SRC_URI = "http://ftp.gnu.org/gnu/classpath/${BP}.tar.gz \ | ||
8 | file://datadir_java.patch \ | ||
9 | " | ||
10 | |||
11 | inherit java-library autotools | ||
12 | |||
13 | JPN = "libgnuinet-java" | ||
14 | |||
15 | export JAVAC = "javac" | ||
16 | |||
17 | export JAVA = "java" | ||
18 | |||
19 | # We fake this, it is not neccessary anyway. | ||
20 | export JAVADOC = "true" | ||
21 | |||
22 | do_compile() { | ||
23 | oe_runmake JARDIR=${datadir_java} inetlib_jar=${JARFILENAME} | ||
24 | } | ||
25 | |||
26 | SRC_URI[md5sum] = "aaa24be4bc8d172ac675be8bdfa636ee" | ||
27 | SRC_URI[sha256sum] = "1b078a39e022f86e4e2c8189b4d2789a5da414e8f1cb285587b7800b950a44de" | ||
28 | |||
29 | NATIVE_INSTALL_WORKS = "1" | ||
30 | BBCLASSEXTEND = "native" | ||
31 | |||
diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb new file mode 100644 index 0000000..5b76fcc --- /dev/null +++ b/recipes-core/cup/cup_0.10k.bb | |||
@@ -0,0 +1,47 @@ | |||
1 | DESCRIPTION = "Lexical analyzer generator for Java" | ||
2 | AUTHOR = "Elliot Berk, A. Appel, C. Scott Ananian" | ||
3 | LICENSE = "CUP" | ||
4 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c33" | ||
5 | |||
6 | |||
7 | RDEPENDS_${PN} = "java2-runtime" | ||
8 | RDEPENDS_${PN}_virtclass-native = "" | ||
9 | |||
10 | inherit java-library | ||
11 | |||
12 | SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/CUP/java_${BPN}_v10k.tar.gz \ | ||
13 | file://cup \ | ||
14 | " | ||
15 | |||
16 | S = "${WORKDIR}/java_cup" | ||
17 | |||
18 | do_configure() { | ||
19 | sed -i \ | ||
20 | -e "s|OE_STAGING_BINDIR|${bindir}|" \ | ||
21 | -e "s|OE_STAGING_DATADIR_JAVA|${data_java}|" \ | ||
22 | -e "s|OE_CUP_JAR|${BP}.jar|" \ | ||
23 | ${WORKDIR}/cup | ||
24 | } | ||
25 | |||
26 | do_compile() { | ||
27 | mkdir -p build | ||
28 | |||
29 | javac -d build `find . -name "*.java"` | ||
30 | |||
31 | fastjar -C build -c -f ${BP}.jar . | ||
32 | } | ||
33 | |||
34 | do_install_append() { | ||
35 | install -d ${D}${bindir} | ||
36 | install -m 0755 ${WORKDIR}/cup ${D}${bindir} | ||
37 | } | ||
38 | |||
39 | PACKAGES = "${PN}" | ||
40 | |||
41 | FILES_${PN} += "${datadir_java}" | ||
42 | |||
43 | SRC_URI[md5sum] = "8b11edfec13c590ea443d0f0ae0da479" | ||
44 | SRC_URI[sha256sum] = "7e6dc5be74ae56c7e86e69ad0ad88dae3b2847afa9e73a76635918a6b1eb75cd" | ||
45 | |||
46 | BBCLASSEXTEND = "native" | ||
47 | |||
diff --git a/recipes-core/cup/files/cup b/recipes-core/cup/files/cup new file mode 100755 index 0000000..34b4f05 --- /dev/null +++ b/recipes-core/cup/files/cup | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cp=OE_STAGING_DATADIR_JAVA/OE_CUP_JAR | ||
4 | |||
5 | exec OE_STAGING_BINDIR/java -cp $cp java_cup.Main "$@" | ||
diff --git a/recipes-core/ecj/ecj-bootstrap-native.bb b/recipes-core/ecj/ecj-bootstrap-native.bb new file mode 100644 index 0000000..df05be5 --- /dev/null +++ b/recipes-core/ecj/ecj-bootstrap-native.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | # ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more | ||
2 | # and no less features. | ||
3 | # | ||
4 | # This recipe uses the jar created by libecj-bootstrap. | ||
5 | |||
6 | DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" | ||
7 | HOMEPAGE = "http://www.eclipse.org/" | ||
8 | SECTION = "devel" | ||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
11 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | ||
12 | " | ||
13 | |||
14 | DEPENDS = "libecj-bootstrap virtual/java-native" | ||
15 | |||
16 | PROVIDES = "virtual/javac-native" | ||
17 | |||
18 | SRC_URI = "file://ecj.in" | ||
19 | |||
20 | S = "${WORKDIR}" | ||
21 | |||
22 | JAR = "ecj-bootstrap.jar" | ||
23 | |||
24 | inherit native | ||
25 | |||
26 | do_compile() { | ||
27 | # Create the start script | ||
28 | echo "#!/bin/sh" > ecj-bootstrap | ||
29 | echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap | ||
30 | echo "RUNTIME=java" >> ecj-bootstrap | ||
31 | cat ecj.in >> ecj-bootstrap | ||
32 | } | ||
33 | |||
34 | do_install() { | ||
35 | install -d ${D}${bindir} | ||
36 | install -m 755 ${S}/ecj-bootstrap ${D}${bindir} | ||
37 | install -m 755 ${S}/ecj-bootstrap ${D}${bindir}/javac | ||
38 | } | ||
diff --git a/recipes-core/ecj/ecj-initial.bb b/recipes-core/ecj/ecj-initial.bb new file mode 100644 index 0000000..45317a6 --- /dev/null +++ b/recipes-core/ecj/ecj-initial.bb | |||
@@ -0,0 +1,32 @@ | |||
1 | # ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more | ||
2 | # and no less features. | ||
3 | |||
4 | # This variant runs on the initial (not Java5-compatible runtime). | ||
5 | |||
6 | DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" | ||
7 | HOMEPAGE = "http://www.eclipse.org/" | ||
8 | LICENSE = "MIT" | ||
9 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
10 | |||
11 | DEPENDS = "libecj-bootstrap" | ||
12 | |||
13 | SRC_URI = "file://ecj-initial.in" | ||
14 | |||
15 | S = "${WORKDIR}" | ||
16 | |||
17 | inherit native | ||
18 | |||
19 | JAR = "ecj-bootstrap.jar" | ||
20 | |||
21 | do_compile() { | ||
22 | # Create the start script | ||
23 | echo "#!/bin/sh" > ecj-initial | ||
24 | echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial | ||
25 | echo "RUNTIME=java-initial" >> ecj-initial | ||
26 | cat ecj-initial.in >> ecj-initial | ||
27 | } | ||
28 | |||
29 | do_install() { | ||
30 | install -d ${D}${bindir} | ||
31 | install -m 755 ${S}/ecj-initial ${D}${bindir} | ||
32 | } | ||
diff --git a/recipes-core/ecj/files/ecj-initial.in b/recipes-core/ecj/files/ecj-initial.in new file mode 100755 index 0000000..2099991 --- /dev/null +++ b/recipes-core/ecj/files/ecj-initial.in | |||
@@ -0,0 +1 @@ | |||
${RUNTIME} -Xmx512m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"} | |||
diff --git a/recipes-core/ecj/files/ecj.in b/recipes-core/ecj/files/ecj.in new file mode 100755 index 0000000..30c3862 --- /dev/null +++ b/recipes-core/ecj/files/ecj.in | |||
@@ -0,0 +1,12 @@ | |||
1 | error_counter=0; | ||
2 | error_occured=139 | ||
3 | while [ ${error_counter} -le 50 -a ${error_occured} -eq 139 ]; do | ||
4 | ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"} | ||
5 | error_occured=$? | ||
6 | if [ ${error_occured} -eq 139 ]; then | ||
7 | echo "ecj crashed - silently trying again" | ||
8 | error_counter=$(( $error_counter + 1 )) | ||
9 | fi | ||
10 | done | ||
11 | |||
12 | exit ${error_occured} | ||
diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc new file mode 100644 index 0000000..e704a87 --- /dev/null +++ b/recipes-core/ecj/libecj-bootstrap.inc | |||
@@ -0,0 +1,68 @@ | |||
1 | # This package compiles and stages only the Jar. | ||
2 | |||
3 | DESCRIPTION = "JDT Core Batch Compiler - Jar only" | ||
4 | HOMEPAGE = "http://www.eclipse.org/" | ||
5 | LICENSE = "EPL-1" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/EPL-1;md5=d830412fb40c35122cb4d78375d30f76" | ||
7 | |||
8 | DEPENDS = "fastjar-native jikes-initial virtual/java-initial" | ||
9 | |||
10 | inherit native java | ||
11 | |||
12 | S = "${WORKDIR}" | ||
13 | |||
14 | JAR = "ecj-bootstrap-${PV}.jar" | ||
15 | |||
16 | do_unpackpost() { | ||
17 | if [ ! -d source ]; then | ||
18 | mkdir source | ||
19 | fi | ||
20 | |||
21 | if [ ! -d build ]; then | ||
22 | mkdir build | ||
23 | fi | ||
24 | |||
25 | # Remove crap. | ||
26 | rm about.html build.xml | ||
27 | rm -rf META-INF | ||
28 | |||
29 | # Move source into separate subdir. | ||
30 | mv org source/ | ||
31 | |||
32 | # Remove stuff unneeded for the bootstrap compiler. | ||
33 | rm -rf source/org/eclipse/jdt/internal/compiler/apt | ||
34 | rm -rf source/org/eclipse/jdt/internal/compiler/tool | ||
35 | rm -rf source/org/eclipse/jdt/internal/antadapter | ||
36 | rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java | ||
37 | |||
38 | # Make a copy of the remaining source to get the embedded | ||
39 | # resources. | ||
40 | cp -R source/org build/ | ||
41 | |||
42 | # Remove source code and other stuff. | ||
43 | find build -name '*.java' -exec rm -f {} \; | ||
44 | find build -name '*.html' -exec rm -f {} \; | ||
45 | } | ||
46 | |||
47 | addtask unpackpost after do_unpack before do_patch | ||
48 | |||
49 | do_compile() { | ||
50 | find source -name '*.java' > sourcefiles | ||
51 | split -l 25 sourcefiles ecj-sources. | ||
52 | |||
53 | # Compiling in place is done because the sources contain | ||
54 | # property files which need to be available at runtime. | ||
55 | for list in `find . -name 'ecj-sources.*'`; do | ||
56 | echo "building files in $list ..."; | ||
57 | echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`; | ||
58 | jikes-initial \ | ||
59 | -d build -source 1.4 -sourcepath source `cat $list`; | ||
60 | done | ||
61 | |||
62 | fastjar -c -C build . -f ${JAR} | ||
63 | } | ||
64 | |||
65 | do_install() { | ||
66 | oe_jarinstall ${JAR} ecj-bootstrap.jar | ||
67 | } | ||
68 | |||
diff --git a/recipes-core/ecj/libecj-bootstrap_3.6.2.bb b/recipes-core/ecj/libecj-bootstrap_3.6.2.bb new file mode 100644 index 0000000..98edc01 --- /dev/null +++ b/recipes-core/ecj/libecj-bootstrap_3.6.2.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require libecj-bootstrap.inc | ||
2 | |||
3 | SRC_URI = " http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.6.2-201102101200/ecjsrc-${PV}.zip" | ||
4 | |||
5 | SRC_URI[md5sum] = "3f3ca1973dd7a21780525c9ffba7a263" | ||
6 | SRC_URI[sha256sum] = "94f2095d38d71b414a593ec56847008bec267a926ec935959fecdde44f98467f" | ||
7 | |||
diff --git a/recipes-core/fastjar/fastjar.inc b/recipes-core/fastjar/fastjar.inc new file mode 100644 index 0000000..f48135d --- /dev/null +++ b/recipes-core/fastjar/fastjar.inc | |||
@@ -0,0 +1,16 @@ | |||
1 | DESCRIPTION = "jar replacement written in C." | ||
2 | HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/" | ||
3 | SECTION = "devel" | ||
4 | PRIORITY = "optional" | ||
5 | LICENSE = "GPLv2" | ||
6 | |||
7 | DEPENDS = "zlib" | ||
8 | |||
9 | SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz" | ||
10 | |||
11 | inherit autotools | ||
12 | |||
13 | PACKAGES = "${PN}-grepjar ${PN} ${PN}-dbg ${PN}-doc" | ||
14 | FILES_${PN}-grepjar = "${bindir}/grepjar" | ||
15 | |||
16 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/fastjar/fastjar/jartool.patch b/recipes-core/fastjar/fastjar/jartool.patch new file mode 100644 index 0000000..bb58b27 --- /dev/null +++ b/recipes-core/fastjar/fastjar/jartool.patch | |||
@@ -0,0 +1,114 @@ | |||
1 | Index: fastjar-0.98/jartool.c | ||
2 | =================================================================== | ||
3 | --- fastjar-0.98.orig/jartool.c 2009-09-07 00:10:47.000000000 +0200 | ||
4 | +++ fastjar-0.98/jartool.c 2011-11-10 13:59:01.320585544 +0100 | ||
5 | @@ -790,6 +790,7 @@ | ||
6 | progname, jarfile); | ||
7 | return 1; | ||
8 | } | ||
9 | + ze->filename[len] = '\0'; | ||
10 | len = UNPACK_UB4(header, CEN_EFLEN); | ||
11 | len += UNPACK_UB4(header, CEN_COMLEN); | ||
12 | if (lseek (fd, len, SEEK_CUR) == -1) | ||
13 | @@ -1257,7 +1258,7 @@ | ||
14 | exit_on_error("write"); | ||
15 | |||
16 | /* write the file name to the zip file */ | ||
17 | - if (1 == write(jfd, fname, file_name_length)) | ||
18 | + if (-1 == write(jfd, fname, file_name_length)) | ||
19 | exit_on_error("write"); | ||
20 | |||
21 | if(verbose){ | ||
22 | @@ -1730,7 +1731,17 @@ | ||
23 | struct stat sbuf; | ||
24 | int depth = 0; | ||
25 | |||
26 | - tmp_buff = malloc(sizeof(char) * strlen((const char *)filename)); | ||
27 | + if(*filename == '/'){ | ||
28 | + fprintf(stderr, "Absolute path names are not allowed.\n"); | ||
29 | + exit(EXIT_FAILURE); | ||
30 | + } | ||
31 | + | ||
32 | + tmp_buff = malloc(strlen((const char *)filename)); | ||
33 | + | ||
34 | + if(tmp_buff == NULL) { | ||
35 | + fprintf(stderr, "Out of memory.\n"); | ||
36 | + exit(EXIT_FAILURE); | ||
37 | + } | ||
38 | |||
39 | for(;;){ | ||
40 | const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/'); | ||
41 | @@ -1738,25 +1749,28 @@ | ||
42 | if(idx == NULL) | ||
43 | break; | ||
44 | else if(idx == start){ | ||
45 | + tmp_buff[idx - filename] = '/'; | ||
46 | start++; | ||
47 | continue; | ||
48 | } | ||
49 | - start = idx + 1; | ||
50 | |||
51 | - strncpy(tmp_buff, (const char *)filename, (idx - filename)); | ||
52 | - tmp_buff[(idx - filename)] = '\0'; | ||
53 | + memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start)); | ||
54 | + tmp_buff[idx - filename] = '\0'; | ||
55 | |||
56 | #ifdef DEBUG | ||
57 | printf("checking the existance of %s\n", tmp_buff); | ||
58 | #endif | ||
59 | - if(strcmp(tmp_buff, "..") == 0){ | ||
60 | + if(idx - start == 2 && memcmp(start, "..", 2) == 0){ | ||
61 | --depth; | ||
62 | if (depth < 0){ | ||
63 | fprintf(stderr, "Traversal to parent directories during unpacking!\n"); | ||
64 | exit(EXIT_FAILURE); | ||
65 | } | ||
66 | - } else if (strcmp(tmp_buff, ".") != 0) | ||
67 | + } else if (idx - start != 1 || *start != '.') | ||
68 | ++depth; | ||
69 | + | ||
70 | + start = idx + 1; | ||
71 | + | ||
72 | if(stat(tmp_buff, &sbuf) < 0){ | ||
73 | if(errno != ENOENT) | ||
74 | exit_on_error("stat"); | ||
75 | @@ -1765,6 +1779,7 @@ | ||
76 | #ifdef DEBUG | ||
77 | printf("Directory exists\n"); | ||
78 | #endif | ||
79 | + tmp_buff[idx - filename] = '/'; | ||
80 | continue; | ||
81 | }else { | ||
82 | fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n", | ||
83 | @@ -1781,10 +1796,11 @@ | ||
84 | if(verbose && handle) | ||
85 | printf("%10s: %s/\n", "created", tmp_buff); | ||
86 | |||
87 | + tmp_buff[idx - filename] = '/'; | ||
88 | } | ||
89 | |||
90 | /* only a directory */ | ||
91 | - if(strlen((const char *)start) == 0) | ||
92 | + if(*start == '\0') | ||
93 | dir = TRUE; | ||
94 | |||
95 | #ifdef DEBUG | ||
96 | @@ -1792,7 +1808,7 @@ | ||
97 | #endif | ||
98 | |||
99 | /* If the entry was just a directory, don't write to file, etc */ | ||
100 | - if(strlen((const char *)start) == 0) | ||
101 | + if(*start == '\0') | ||
102 | f_fd = -1; | ||
103 | |||
104 | free(tmp_buff); | ||
105 | @@ -1876,7 +1892,8 @@ | ||
106 | exit(EXIT_FAILURE); | ||
107 | } | ||
108 | |||
109 | - close(f_fd); | ||
110 | + if (f_fd != -1) | ||
111 | + close(f_fd); | ||
112 | |||
113 | if(verbose && dir == FALSE && handle) | ||
114 | printf("%10s: %s\n", | ||
diff --git a/recipes-core/fastjar/fastjar_0.98.bb b/recipes-core/fastjar/fastjar_0.98.bb new file mode 100644 index 0000000..5b5a403 --- /dev/null +++ b/recipes-core/fastjar/fastjar_0.98.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require fastjar.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
4 | |||
5 | SRC_URI += "file://jartool.patch" | ||
6 | |||
7 | SRC_URI[md5sum] = "d2d264d343d4d0e1575832cc1023c3bf" | ||
8 | SRC_URI[sha256sum] = "f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145" | ||
9 | |||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/build-hacks-native.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/build-hacks-native.patch new file mode 100644 index 0000000..9432d03 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/build-hacks-native.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Index: icedtea6-1.6.1/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.6.1.orig/Makefile.am 2009-12-24 11:38:06.582572265 +0100 | ||
4 | +++ icedtea6-1.6.1/Makefile.am 2009-12-24 11:57:27.159578486 +0100 | ||
5 | @@ -265,6 +265,10 @@ | ||
6 | FT2_LIB="$(FREETYPE2_LIBS)" \ | ||
7 | ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ | ||
8 | HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | JAVAC="" \ | ||
14 | RHINO_JAR="$(RHINO_JAR)" \ | ||
15 | JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/disable-library-checks.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/disable-library-checks.patch new file mode 100644 index 0000000..23b8bed --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/disable-library-checks.patch | |||
@@ -0,0 +1,141 @@ | |||
1 | Index: icedtea6-1.7/configure.ac | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.7.orig/configure.ac 2010-01-26 04:52:18.000000000 +0100 | ||
4 | +++ icedtea6-1.7/configure.ac 2010-02-08 12:05:51.354556052 +0100 | ||
5 | @@ -205,9 +205,9 @@ | ||
6 | fi | ||
7 | |||
8 | dnl pkgconfig cannot be used to find these headers and libraries. | ||
9 | -AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
10 | - ,[AC_MSG_ERROR("CUPS headers were not found - | ||
11 | - try installing cups-devel.")]) | ||
12 | +#AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
13 | +# ,[AC_MSG_ERROR("CUPS headers were not found - | ||
14 | +# try installing cups-devel.")]) | ||
15 | AC_CHECK_HEADERS([X11/X.h],[] | ||
16 | ,[AC_MSG_ERROR("xorg headers were not found - | ||
17 | try installing xorg-x11-proto-devel.")]) | ||
18 | @@ -239,12 +239,12 @@ | ||
19 | AC_SUBST(XT_LIBS) | ||
20 | |||
21 | dnl Check for libXp headers and libraries. | ||
22 | -PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
23 | -if test "x${XP_FOUND}" = xno | ||
24 | -then | ||
25 | - AC_MSG_ERROR([Could not find Xp - \ | ||
26 | - Try installing libXp-devel.]) | ||
27 | -fi | ||
28 | +#PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
29 | +#if test "x${XP_FOUND}" = xno | ||
30 | +#then | ||
31 | +# AC_MSG_ERROR([Could not find Xp - \ | ||
32 | +# Try installing libXp-devel.]) | ||
33 | +#fi | ||
34 | AC_SUBST(XP_CFLAGS) | ||
35 | AC_SUBST(XP_LIBS) | ||
36 | |||
37 | @@ -258,16 +258,16 @@ | ||
38 | AC_SUBST(X11_CFLAGS) | ||
39 | AC_SUBST(X11_LIBS) | ||
40 | |||
41 | -dnl Check for libXinerama headers and libraries. | ||
42 | -PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
43 | - ,[XINERAMA_FOUND=no]) | ||
44 | -if test "x${XINERAMA_FOUND}" = xno | ||
45 | -then | ||
46 | - AC_MSG_ERROR([Could not find Xinerama - \ | ||
47 | - Try installing libXinerama-devel.]) | ||
48 | -fi | ||
49 | -AC_SUBST(XINERAMA_CFLAGS) | ||
50 | -AC_SUBST(XINERAMA_LIBS) | ||
51 | +#dnl Check for libXinerama headers and libraries. | ||
52 | +#PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
53 | +# ,[XINERAMA_FOUND=no]) | ||
54 | +#if test "x${XINERAMA_FOUND}" = xno | ||
55 | +#then | ||
56 | +# AC_MSG_ERROR([Could not find Xinerama - \ | ||
57 | +# Try installing libXinerama-devel.]) | ||
58 | +#fi | ||
59 | +#AC_SUBST(XINERAMA_CFLAGS) | ||
60 | +#AC_SUBST(XINERAMA_LIBS) | ||
61 | |||
62 | if test "x${ENABLE_XRENDER}" = "xyes" | ||
63 | then | ||
64 | @@ -341,26 +341,26 @@ | ||
65 | AC_CONFIG_FILES([tapset/jstack.stp]) | ||
66 | fi | ||
67 | |||
68 | -dnl Check for libpng headers and libraries. | ||
69 | -PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
70 | - ,[LIBPNG_FOUND=no]) | ||
71 | -if test "x${LIBPNG_FOUND}" = xno | ||
72 | -then | ||
73 | - AC_MSG_ERROR([Could not find libpng - \ | ||
74 | - Try installing libpng-devel.]) | ||
75 | -fi | ||
76 | -AC_SUBST(LIBPNG_CFLAGS) | ||
77 | -AC_SUBST(LIBPNG_LIBS) | ||
78 | - | ||
79 | -dnl Check for libXtst headers and libraries. | ||
80 | -PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
81 | -if test "x${XTST_FOUND}" = xno | ||
82 | -then | ||
83 | - AC_MSG_ERROR([Could not find Xtst - \ | ||
84 | - Try installing libXtst-devel.]) | ||
85 | -fi | ||
86 | -AC_SUBST(XTST_CFLAGS) | ||
87 | -AC_SUBST(XTST_LIBS) | ||
88 | +#dnl Check for libpng headers and libraries. | ||
89 | +#PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
90 | +# ,[LIBPNG_FOUND=no]) | ||
91 | +#if test "x${LIBPNG_FOUND}" = xno | ||
92 | +#then | ||
93 | +# AC_MSG_ERROR([Could not find libpng - \ | ||
94 | +# Try installing libpng-devel.]) | ||
95 | +#fi | ||
96 | +#AC_SUBST(LIBPNG_CFLAGS) | ||
97 | +#AC_SUBST(LIBPNG_LIBS) | ||
98 | + | ||
99 | +#dnl Check for libXtst headers and libraries. | ||
100 | +#PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
101 | +#if test "x${XTST_FOUND}" = xno | ||
102 | +#then | ||
103 | +# AC_MSG_ERROR([Could not find Xtst - \ | ||
104 | +# Try installing libXtst-devel.]) | ||
105 | +#fi | ||
106 | +#AC_SUBST(XTST_CFLAGS) | ||
107 | +#AC_SUBST(XTST_LIBS) | ||
108 | |||
109 | dnl Check for freetype2 headers and libraries. | ||
110 | PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] | ||
111 | @@ -373,18 +373,18 @@ | ||
112 | AC_SUBST(FREETYPE2_CFLAGS) | ||
113 | AC_SUBST(FREETYPE2_LIBS) | ||
114 | |||
115 | -dnl Check for alsa headers and libraries (only required for Linux). | ||
116 | -if test "x${BUILD_OS_DIR}" = "xlinux" | ||
117 | -then | ||
118 | - PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
119 | - if test "x${ALSA_FOUND}" = xno | ||
120 | - then | ||
121 | - AC_MSG_ERROR([Could not find alsa - \ | ||
122 | - Try installing alsa-lib-devel.]) | ||
123 | - fi | ||
124 | -AC_SUBST(ALSA_CFLAGS) | ||
125 | -AC_SUBST(ALSA_LIBS) | ||
126 | -fi | ||
127 | +#dnl Check for alsa headers and libraries (only required for Linux). | ||
128 | +#if test "x${BUILD_OS_DIR}" = "xlinux" | ||
129 | +#then | ||
130 | +# PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
131 | +# if test "x${ALSA_FOUND}" = xno | ||
132 | +# then | ||
133 | +# AC_MSG_ERROR([Could not find alsa - \ | ||
134 | +# Try installing alsa-lib-devel.]) | ||
135 | +# fi | ||
136 | +#AC_SUBST(ALSA_CFLAGS) | ||
137 | +#AC_SUBST(ALSA_LIBS) | ||
138 | +#fi | ||
139 | |||
140 | if test "x${enable_pulse_java}" = "xyes" | ||
141 | then | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch new file mode 100644 index 0000000..cd0f68a --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch | |||
@@ -0,0 +1,513 @@ | |||
1 | Index: openjdk/jdk/make/sun/awt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/sun/awt/Makefile 2009-04-24 09:33:55.000000000 +0200 | ||
4 | +++ openjdk/jdk/make/sun/awt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
5 | @@ -180,7 +180,8 @@ | ||
6 | include $(BUILDDIR)/common/Mapfile-vers.gmk | ||
7 | include $(BUILDDIR)/common/Library.gmk | ||
8 | |||
9 | -build: fontconfigs | ||
10 | +#build: fontconfigs | ||
11 | +build: | ||
12 | |||
13 | |||
14 | ifeq ($(PLATFORM), windows) | ||
15 | @@ -535,9 +536,9 @@ | ||
16 | -I$(PLATFORM_SRC)/native/$(PKGDIR) \ | ||
17 | $(EVENT_MODEL) | ||
18 | |||
19 | -ifeq ($(PLATFORM), linux) | ||
20 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
21 | -endif | ||
22 | +#ifeq ($(PLATFORM), linux) | ||
23 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
24 | +#endif | ||
25 | |||
26 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
27 | $(AWT_RUNPATH) | ||
28 | Index: openjdk/jdk/make/javax/sound/jsoundalsa/Makefile | ||
29 | =================================================================== | ||
30 | --- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:48:34.534565581 +0200 | ||
31 | +++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
32 | @@ -44,34 +44,35 @@ | ||
33 | # Files | ||
34 | # | ||
35 | |||
36 | -FILES_c = \ | ||
37 | - Utilities.c \ | ||
38 | - $(DAUDIOFILES_c) \ | ||
39 | - $(MIDIFILES_c) \ | ||
40 | - $(PORTFILES_c) | ||
41 | +#FILES_c = \ | ||
42 | +# Utilities.c \ | ||
43 | +# $(DAUDIOFILES_c) \ | ||
44 | +# $(MIDIFILES_c) \ | ||
45 | +# $(PORTFILES_c) | ||
46 | |||
47 | # platform dependent files | ||
48 | -FILES_c += \ | ||
49 | - PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
50 | - PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
51 | - PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
52 | - PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
53 | - PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
54 | - PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
55 | - PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
56 | - | ||
57 | -FILES_export = \ | ||
58 | - $(DAUDIOFILES_export) \ | ||
59 | - $(MIDIFILES_export) \ | ||
60 | - $(PORTFILES_export) | ||
61 | +#FILES_c += \ | ||
62 | +# PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
63 | +# PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
64 | +# PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
65 | +# PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
66 | +# PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
67 | +# PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
68 | +# PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
69 | + | ||
70 | +FILES_export = | ||
71 | +#FILES_export = \ | ||
72 | +# $(DAUDIOFILES_export) \ | ||
73 | +# $(MIDIFILES_export) \ | ||
74 | +# $(PORTFILES_export) | ||
75 | |||
76 | -OTHER_LDLIBS += -lasound | ||
77 | +#OTHER_LDLIBS += -lasound | ||
78 | |||
79 | CPPFLAGS += \ | ||
80 | - -DUSE_DAUDIO=TRUE \ | ||
81 | - -DUSE_PORTS=TRUE \ | ||
82 | - -DUSE_PLATFORM_MIDI_OUT=TRUE \ | ||
83 | - -DUSE_PLATFORM_MIDI_IN=TRUE \ | ||
84 | + -DUSE_DAUDIO=FALSE \ | ||
85 | + -DUSE_PORTS=FALSE \ | ||
86 | + -DUSE_PLATFORM_MIDI_OUT=FALSE \ | ||
87 | + -DUSE_PLATFORM_MIDI_IN=FALSE \ | ||
88 | -I$(SHARE_SRC)/native/com/sun/media/sound | ||
89 | |||
90 | # | ||
91 | Index: openjdk/jdk/make/sun/splashscreen/Makefile | ||
92 | =================================================================== | ||
93 | --- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:48:33.738565601 +0200 | ||
94 | +++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
95 | @@ -32,7 +32,8 @@ | ||
96 | # | ||
97 | # Files | ||
98 | # | ||
99 | -include FILES_c.gmk | ||
100 | +#include FILES_c.gmk | ||
101 | +FILES_c = | ||
102 | |||
103 | FILES_java = \ | ||
104 | java/awt/SplashScreen.java | ||
105 | @@ -62,9 +63,9 @@ | ||
106 | CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE | ||
107 | |||
108 | ifneq ($(PLATFORM), windows) | ||
109 | - CFLAGS += -DWITH_X11 | ||
110 | - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
111 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
112 | +# CFLAGS += -DWITH_X11 | ||
113 | +# CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
114 | +# OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
115 | else # PLATFORM | ||
116 | CFLAGS += -DWITH_WIN32 | ||
117 | OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib | ||
118 | @@ -79,7 +80,7 @@ | ||
119 | vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg | ||
120 | vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen | ||
121 | |||
122 | -CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
123 | +#CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
124 | |||
125 | ifeq ($(PLATFORM), linux) | ||
126 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
127 | Index: openjdk/jdk/make/sun/xawt/Makefile | ||
128 | =================================================================== | ||
129 | --- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-04-24 09:33:56.000000000 +0200 | ||
130 | +++ openjdk/jdk/make/sun/xawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
131 | @@ -41,15 +41,16 @@ | ||
132 | # | ||
133 | # Files | ||
134 | # | ||
135 | -include FILES_c_unix.gmk | ||
136 | -include FILES_export_unix.gmk | ||
137 | +#include FILES_c_unix.gmk | ||
138 | +FILES_c = | ||
139 | +#include FILES_export_unix.gmk | ||
140 | AUTO_FILES_JAVA_DIRS = sun/awt/X11 | ||
141 | AUTO_JAVA_PRUNE = WrapperGenerator.java | ||
142 | |||
143 | LDFLAGS += -L$(OPENWIN_LIB) | ||
144 | |||
145 | ifeq ($(PLATFORM), linux) | ||
146 | -LDFLAGS += -lpthread | ||
147 | +#LDFLAGS += -lpthread | ||
148 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
149 | endif | ||
150 | |||
151 | @@ -86,16 +87,19 @@ | ||
152 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl | ||
153 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 | ||
154 | |||
155 | -OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
156 | - $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
157 | +#OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
158 | +# $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
159 | |||
160 | ifeq ($(PLATFORM), solaris) | ||
161 | CPPFLAGS += -DFUNCPROTO=15 | ||
162 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
163 | endif | ||
164 | |||
165 | -CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
166 | +#CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
167 | |||
168 | +# Normally we would like to patch these includes away but | ||
169 | +# we need them for the successfull compilation of the sizer | ||
170 | +# executables. | ||
171 | CPPFLAGS += -DXAWT -DXAWT_HACK \ | ||
172 | -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ | ||
173 | -I$(PLATFORM_SRC)/native/sun/awt \ | ||
174 | @@ -124,10 +128,10 @@ | ||
175 | |||
176 | ifeq ($(PLATFORM), linux) | ||
177 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
178 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
179 | - -I/usr/include/X11/extensions \ | ||
180 | - -I$(MOTIF_DIR)/include \ | ||
181 | - -I$(OPENWIN_HOME)/include | ||
182 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
183 | +# -I/usr/include/X11/extensions \ | ||
184 | +# -I$(MOTIF_DIR)/include \ | ||
185 | +# -I$(OPENWIN_HOME)/include | ||
186 | endif | ||
187 | |||
188 | ifeq ($(PLATFORM), solaris) | ||
189 | @@ -238,18 +242,20 @@ | ||
190 | $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) | ||
191 | |||
192 | $(SIZES): $(SIZERS) | ||
193 | - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
194 | - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
195 | - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
196 | - $(CHMOD) +w $@;\ | ||
197 | - else \ | ||
198 | - $(ECHO) GENERATING $@; \ | ||
199 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
200 | - fi | ||
201 | - @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
202 | - $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
203 | - $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
204 | - fi | ||
205 | + touch $(SIZES) | ||
206 | +# | ||
207 | +# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
208 | +# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
209 | +# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
210 | +# $(CHMOD) +w $@;\ | ||
211 | +# else \ | ||
212 | +# $(ECHO) GENERATING $@; \ | ||
213 | +# $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
214 | +# fi | ||
215 | +# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
216 | +# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
217 | +# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
218 | +# fi | ||
219 | |||
220 | $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) | ||
221 | $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ | ||
222 | Index: openjdk/jdk/make/sun/jawt/Makefile | ||
223 | =================================================================== | ||
224 | --- openjdk.orig/jdk/make/sun/jawt/Makefile 2009-09-29 13:48:34.186565471 +0200 | ||
225 | +++ openjdk/jdk/make/sun/jawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
226 | @@ -36,7 +36,8 @@ | ||
227 | ifeq ($(PLATFORM), windows) | ||
228 | FILES_cpp = jawt.cpp | ||
229 | else # PLATFORM | ||
230 | -FILES_c = jawt.c | ||
231 | +FILES_c = | ||
232 | +#FILES_c = jawt.c | ||
233 | endif # PLATFORM | ||
234 | |||
235 | FILES_h = $(INCLUDEDIR)/jawt.h \ | ||
236 | Index: openjdk/jdk/make/sun/jpeg/Makefile | ||
237 | =================================================================== | ||
238 | --- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-09-29 13:48:33.726565626 +0200 | ||
239 | +++ openjdk/jdk/make/sun/jpeg/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
240 | @@ -37,7 +37,8 @@ | ||
241 | # | ||
242 | # Files | ||
243 | # | ||
244 | -include FILES_c.gmk | ||
245 | +FILES_c = | ||
246 | +#include FILES_c.gmk | ||
247 | |||
248 | AUTO_FILES_JAVA_DIRS = sun/awt/image com/sun/imageio/plugins/jpeg | ||
249 | |||
250 | Index: openjdk/jdk/make/common/shared/Defs-java.gmk | ||
251 | =================================================================== | ||
252 | --- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:48:55.954565215 +0200 | ||
253 | +++ openjdk/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:57:14.446815782 +0200 | ||
254 | @@ -36,14 +36,14 @@ | ||
255 | # Memory related -J flags that all uses of java tools should use. | ||
256 | # | ||
257 | JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m | ||
258 | -ifneq (,$(filter $(ARCH), ia64 s390)) | ||
259 | +#ifneq (,$(filter $(ARCH), ia64 s390)) | ||
260 | # Special flags for javac on ia64 to work around a VM problem with | ||
261 | # bad code generation during inlining (what version had this problem?): | ||
262 | # Suspect this may not be needed anymore. | ||
263 | - JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
264 | -else | ||
265 | - JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
266 | -endif | ||
267 | +# JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
268 | +#else | ||
269 | +# JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
270 | +#endif | ||
271 | |||
272 | # | ||
273 | # All java tools (javac, javah, and javadoc) run faster with certain java | ||
274 | Index: openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java | ||
275 | =================================================================== | ||
276 | --- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-04-24 09:34:04.000000000 +0200 | ||
277 | +++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-09-29 13:57:14.450815511 +0200 | ||
278 | @@ -113,7 +113,7 @@ | ||
279 | * @since 1.4 | ||
280 | */ | ||
281 | public static boolean isHeadless() { | ||
282 | - return getHeadlessProperty(); | ||
283 | + return true; | ||
284 | } | ||
285 | |||
286 | /** | ||
287 | Index: openjdk/corba/make/common/Defs.gmk | ||
288 | =================================================================== | ||
289 | --- openjdk.orig/corba/make/common/Defs.gmk 2009-04-24 09:30:19.000000000 +0200 | ||
290 | +++ openjdk/corba/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
291 | @@ -444,11 +444,11 @@ | ||
292 | # Tool flags | ||
293 | # | ||
294 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
295 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
296 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
297 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
298 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
299 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
300 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
301 | $(DEFINES) $(OPTIONS:%=-D%) | ||
302 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
303 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
304 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
305 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
306 | $(OTHER_LINTFLAGS) | ||
307 | Index: openjdk/jdk/make/common/Defs.gmk | ||
308 | =================================================================== | ||
309 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:48:33.590565061 +0200 | ||
310 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
311 | @@ -662,11 +662,11 @@ | ||
312 | # Tool flags | ||
313 | # | ||
314 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
315 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
316 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
317 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
318 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
319 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
320 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
321 | $(DEFINES) $(OPTIONS:%=-D%) | ||
322 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
323 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
324 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
325 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
326 | $(OTHER_LINTFLAGS) | ||
327 | Index: openjdk/hotspot/make/linux/makefiles/vm.make | ||
328 | =================================================================== | ||
329 | --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:48:34.098565716 +0200 | ||
330 | +++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:57:14.450815511 +0200 | ||
331 | @@ -170,6 +170,7 @@ | ||
332 | LIBS_VM += $(LLVM_LIBS) | ||
333 | endif | ||
334 | |||
335 | +LFLAGS_VM = $(OE_LDFLAGS) | ||
336 | LINK_VM = $(LINK_LIB.c) | ||
337 | |||
338 | # rule for building precompiled header | ||
339 | Index: openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c | ||
340 | =================================================================== | ||
341 | --- openjdk.orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-04-24 09:34:34.000000000 +0200 | ||
342 | +++ openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-09-29 13:57:14.450815511 +0200 | ||
343 | @@ -26,8 +26,10 @@ | ||
344 | #include <jni.h> | ||
345 | #include <jni_util.h> | ||
346 | #include <dlfcn.h> | ||
347 | +#if 0 | ||
348 | #include <cups/cups.h> | ||
349 | #include <cups/ppd.h> | ||
350 | +#endif | ||
351 | |||
352 | //#define CUPS_DEBUG | ||
353 | |||
354 | @@ -37,6 +39,7 @@ | ||
355 | #define DPRINTF(x, y) | ||
356 | #endif | ||
357 | |||
358 | +#if 0 | ||
359 | typedef const char* (*fn_cupsServer)(void); | ||
360 | typedef int (*fn_ippPort)(void); | ||
361 | typedef http_t* (*fn_httpConnect)(const char *, int); | ||
362 | @@ -56,7 +59,7 @@ | ||
363 | fn_ppdClose j2d_ppdClose; | ||
364 | fn_ppdFindOption j2d_ppdFindOption; | ||
365 | fn_ppdPageSize j2d_ppdPageSize; | ||
366 | - | ||
367 | +#endif | ||
368 | |||
369 | /* | ||
370 | * Initialize library functions. | ||
371 | @@ -65,6 +68,7 @@ | ||
372 | JNIEXPORT jboolean JNICALL | ||
373 | Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env, | ||
374 | jobject printObj) { | ||
375 | +#if 0 | ||
376 | void *handle = dlopen("libcups.so.2", RTLD_LAZY | RTLD_GLOBAL); | ||
377 | |||
378 | if (handle == NULL) { | ||
379 | @@ -131,6 +135,8 @@ | ||
380 | } | ||
381 | |||
382 | return JNI_TRUE; | ||
383 | +#endif | ||
384 | + return JNI_FALSE; | ||
385 | } | ||
386 | |||
387 | /* | ||
388 | @@ -141,6 +147,7 @@ | ||
389 | Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env, | ||
390 | jobject printObj) | ||
391 | { | ||
392 | +#if 0 | ||
393 | jstring cServer = NULL; | ||
394 | const char* server = j2d_cupsServer(); | ||
395 | if (server != NULL) { | ||
396 | @@ -152,6 +159,8 @@ | ||
397 | } | ||
398 | } | ||
399 | return cServer; | ||
400 | +#endif | ||
401 | + return NULL; | ||
402 | } | ||
403 | |||
404 | /* | ||
405 | @@ -162,8 +171,11 @@ | ||
406 | Java_sun_print_CUPSPrinter_getCupsPort(JNIEnv *env, | ||
407 | jobject printObj) | ||
408 | { | ||
409 | +#if 0 | ||
410 | int port = j2d_ippPort(); | ||
411 | return (jint) port; | ||
412 | +#endif | ||
413 | + return 0; | ||
414 | } | ||
415 | |||
416 | |||
417 | @@ -177,6 +189,7 @@ | ||
418 | jstring server, | ||
419 | jint port) | ||
420 | { | ||
421 | +#if 0 | ||
422 | const char *serverName; | ||
423 | serverName = (*env)->GetStringUTFChars(env, server, NULL); | ||
424 | if (serverName != NULL) { | ||
425 | @@ -187,6 +200,7 @@ | ||
426 | return JNI_TRUE; | ||
427 | } | ||
428 | } | ||
429 | +#endif | ||
430 | return JNI_FALSE; | ||
431 | } | ||
432 | |||
433 | @@ -199,6 +213,7 @@ | ||
434 | jobject printObj, | ||
435 | jstring printer) | ||
436 | { | ||
437 | +#if 0 | ||
438 | ppd_file_t *ppd; | ||
439 | ppd_option_t *optionTray, *optionPage; | ||
440 | ppd_choice_t *choice; | ||
441 | @@ -304,6 +319,8 @@ | ||
442 | j2d_ppdClose(ppd); | ||
443 | unlink(filename); | ||
444 | return nameArray; | ||
445 | +#endif | ||
446 | + return NULL; | ||
447 | } | ||
448 | |||
449 | |||
450 | @@ -315,6 +332,7 @@ | ||
451 | jobject printObj, | ||
452 | jstring printer) | ||
453 | { | ||
454 | +#if 0 | ||
455 | ppd_file_t *ppd; | ||
456 | ppd_option_t *option; | ||
457 | ppd_choice_t *choice; | ||
458 | @@ -374,4 +392,6 @@ | ||
459 | j2d_ppdClose(ppd); | ||
460 | unlink(filename); | ||
461 | return sizeArray; | ||
462 | +#endif | ||
463 | + return NULL; | ||
464 | } | ||
465 | Index: openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java | ||
466 | =================================================================== | ||
467 | --- openjdk.orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-04-24 09:34:17.000000000 +0200 | ||
468 | +++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
469 | @@ -244,6 +244,8 @@ | ||
470 | * that might be specified. | ||
471 | */ | ||
472 | fontConfig = createFontConfiguration(); | ||
473 | + if (fontConfig == null) | ||
474 | + return null; | ||
475 | getPlatformFontPathFromFontConfig(); | ||
476 | |||
477 | String extraFontPath = fontConfig.getExtraFontPath(); | ||
478 | Index: openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | ||
479 | =================================================================== | ||
480 | --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-04-24 09:34:33.000000000 +0200 | ||
481 | +++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
482 | @@ -899,7 +899,8 @@ | ||
483 | |||
484 | // Implements SunGraphicsEnvironment.createFontConfiguration. | ||
485 | protected FontConfiguration createFontConfiguration() { | ||
486 | - return new MFontConfiguration(this); | ||
487 | +// return new MFontConfiguration(this); | ||
488 | + return null; | ||
489 | } | ||
490 | public FontConfiguration | ||
491 | createFontConfiguration(boolean preferLocaleFonts, | ||
492 | Index: openjdk/jdk/make/launchers/Makefile | ||
493 | =================================================================== | ||
494 | --- openjdk.orig/jdk/make/launchers/Makefile 2009-09-29 13:48:33.490815135 +0200 | ||
495 | +++ openjdk/jdk/make/launchers/Makefile 2009-09-29 13:57:14.454815276 +0200 | ||
496 | @@ -57,7 +57,7 @@ | ||
497 | endif | ||
498 | # Run MAKE $@ for all generic launchers | ||
499 | define make-all-launchers | ||
500 | -$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
501 | +#$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
502 | $(call make-launcher, apt, com.sun.tools.apt.Main, , ) | ||
503 | $(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , ) | ||
504 | $(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , ) | ||
505 | @@ -93,7 +93,7 @@ | ||
506 | -J-Dcom.sun.CORBA.activation.Port=1049 \ | ||
507 | -J-Dcom.sun.CORBA.POA.ORBServerId=1, ) | ||
508 | $(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack) | ||
509 | -$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
510 | +#$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
511 | $(call make-launcher, rmic, sun.rmi.rmic.Main, , ) | ||
512 | $(call make-launcher, rmid, sun.rmi.server.Activation, , ) | ||
513 | $(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , ) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-freetype.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-freetype.patch new file mode 100644 index 0000000..3420fbd --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-freetype.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: openjdk/jdk/make/tools/freetypecheck/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/tools/freetypecheck/Makefile 2009-09-29 13:48:33.590565061 +0200 | ||
4 | +++ openjdk/jdk/make/tools/freetypecheck/Makefile 2009-09-29 14:00:04.470566156 +0200 | ||
5 | @@ -45,7 +45,7 @@ | ||
6 | FT_OPTIONS = $(CFLAGS) | ||
7 | endif | ||
8 | |||
9 | -FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 | ||
10 | +FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 $(FREETYPE2_CFLAGS) $(FREETYPE2_LIBS) $(FREETYPE2_HEADERS) | ||
11 | FT_OPTIONS += $(XARCH) | ||
12 | |||
13 | #add runtime library search path | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-zlib.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-zlib.patch new file mode 100644 index 0000000..eff7e48 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-zlib.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | Index: openjdk/jdk/make/com/sun/java/pack/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-09-29 13:48:34.538565136 +0200 | ||
4 | +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-09-29 14:00:26.226565853 +0200 | ||
5 | @@ -80,7 +80,7 @@ | ||
6 | OTHER_LDLIBS += $(JVMLIB) | ||
7 | endif | ||
8 | |||
9 | -OTHER_LDLIBS += -lz | ||
10 | +OTHER_LDLIBS += -L$(libdir) -lz | ||
11 | CXXFLAGS_DBG += -DFULL | ||
12 | CXXFLAGS_OPT += -DPRODUCT | ||
13 | CXXFLAGS_COMMON += -DFULL | ||
14 | Index: openjdk/jdk/make/common/Defs.gmk | ||
15 | =================================================================== | ||
16 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
17 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
18 | @@ -289,7 +289,7 @@ | ||
19 | |||
20 | endif # PROGRAM | ||
21 | |||
22 | -LDLIBS_COMMON += $(EXTRA_LIBS) | ||
23 | +LDLIBS_COMMON += $(EXTRA_LIBS) -L$(libdir) | ||
24 | |||
25 | # | ||
26 | # Default is to build, not import native binaries | ||
27 | @@ -425,7 +425,7 @@ | ||
28 | CLASSDESTDIR = $(CLASSBINDIR) | ||
29 | endif | ||
30 | |||
31 | -INCLUDES = -I. -I$(CLASSHDRDIR) \ | ||
32 | +INCLUDES = -I$(includedir) -I. -I$(CLASSHDRDIR) \ | ||
33 | $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES) | ||
34 | OTHER_CPPFLAGS = $(INCLUDES) | ||
35 | |||
36 | Index: openjdk/jdk/make/common/Program.gmk | ||
37 | =================================================================== | ||
38 | --- openjdk.orig/jdk/make/common/Program.gmk 2009-09-29 13:48:33.914565255 +0200 | ||
39 | +++ openjdk/jdk/make/common/Program.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
40 | @@ -73,7 +73,7 @@ | ||
41 | # itself, as with all the Windows libraries. | ||
42 | # | ||
43 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
44 | - LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli | ||
45 | + LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli -L $(libdir) | ||
46 | OTHER_LDLIBS += -ljli | ||
47 | ifeq ($(PLATFORM), solaris) | ||
48 | ifeq ($(ARCH_DATA_MODEL), 32) | ||
49 | Index: openjdk/jdk/make/java/jli/Makefile | ||
50 | =================================================================== | ||
51 | --- openjdk.orig/jdk/make/java/jli/Makefile 2009-09-29 13:48:33.806565054 +0200 | ||
52 | +++ openjdk/jdk/make/java/jli/Makefile 2009-09-29 14:00:26.230565844 +0200 | ||
53 | @@ -61,7 +61,7 @@ | ||
54 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
55 | LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli | ||
56 | # Guarantee very limited dependencies | ||
57 | - LDLIBS = -lz -lc | ||
58 | + LDLIBS = -L$(libdir) -lz -lc | ||
59 | endif | ||
60 | |||
61 | ifeq ($(PLATFORM), windows) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-fix-jar-path.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-fix-jar-path.patch new file mode 100644 index 0000000..c2f8df1 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-fix-jar-path.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | # Backported from | ||
2 | # HG changeset patch | ||
3 | # User Xerxes R?nby <xerxes@zafena.se> | ||
4 | # Date 1275385110 -7200 | ||
5 | # Node ID 7674917fa451a17a38b8cd6930068e8dc3b57b76 | ||
6 | # Parent cf45c29fbe48d2a0c543cbd6d03f4329010011c0 | ||
7 | Use full path to jar application to avoid relying on the one on the path. | ||
8 | |||
9 | 2010-06-01 Xerxes R?nby <xerxes@zafena.se> | ||
10 | |||
11 | * Makefile.am: | ||
12 | (extra-lib/about.jar): Remove redundant | ||
13 | conditional that we don't need any more. | ||
14 | (rewrite-rhino.stamp): Use full path to | ||
15 | jar application to avoid relying on the one | ||
16 | on the path. | ||
17 | |||
18 | diff -uNr icedtea6-1.7.3.orig/Makefile.am icedtea6-1.7.3/Makefile.am | ||
19 | --- icedtea6-1.7.3.orig/Makefile.am 2010-03-31 23:34:07.000000000 +0200 | ||
20 | +++ icedtea6-1.7.3/Makefile.am 2010-07-14 16:52:45.000000000 +0200 | ||
21 | @@ -1749,7 +1744,7 @@ | ||
22 | stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR) | ||
23 | if WITH_RHINO | ||
24 | mkdir -p rhino/rhino.{old,new} | ||
25 | - (cd rhino/rhino.old ; jar xf $(RHINO_JAR)) | ||
26 | + (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) | ||
27 | $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \ | ||
28 | com.redhat.rewriter.ClassRewriter \ | ||
29 | $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \ | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-hotspot-make-arch-sane-for-x86.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-hotspot-make-arch-sane-for-x86.patch new file mode 100644 index 0000000..9d7b9bb --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-hotspot-make-arch-sane-for-x86.patch | |||
@@ -0,0 +1,1130 @@ | |||
1 | From b8a51665ada45e3beb0823c03c025d5514f5e745 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Thu, 22 Oct 2009 16:35:25 +0200 | ||
4 | Subject: [PATCH] hotspot: make arch sane for x86 | ||
5 | |||
6 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
7 | index 38e0f78..64c8410 100644 | ||
8 | --- openjdk/hotspot/agent/make/saenv.sh | ||
9 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
10 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
11 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
12 | CPU=amd64 | ||
13 | else | ||
14 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
15 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
16 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
17 | - CPU=i386 | ||
18 | + CPU=x86 | ||
19 | fi | ||
20 | else | ||
21 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
22 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
23 | index 83ddd1a..c20c7eb 100644 | ||
24 | --- openjdk/hotspot/make/defs.make | ||
25 | +++ openjdk/hotspot/make/defs.make | ||
26 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
27 | ifdef LP64 | ||
28 | BUILDARCH = amd64 | ||
29 | else | ||
30 | - BUILDARCH = i486 | ||
31 | + BUILDARCH = x86 | ||
32 | endif | ||
33 | endif | ||
34 | ifeq ($(BUILDARCH), sparc) | ||
35 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
36 | |||
37 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
38 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
39 | - LIBARCH/i486 = i386 | ||
40 | + LIBARCH/x86 = x86 | ||
41 | LIBARCH/amd64 = amd64 | ||
42 | LIBARCH/sparc = sparc | ||
43 | LIBARCH/sparcv9 = sparcv9 | ||
44 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
45 | index bc82543..4a1ef4e 100644 | ||
46 | --- openjdk/hotspot/make/jprt.config | ||
47 | +++ openjdk/hotspot/make/jprt.config | ||
48 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
49 | # LINUX: X86, AMD64 | ||
50 | osarch=`uname -m` | ||
51 | if [ "${osarch}" = i686 ] ; then | ||
52 | - linux_arch=i586 | ||
53 | + linux_arch=x86 | ||
54 | elif [ "${osarch}" = x86_64 ] ; then | ||
55 | linux_arch=amd64 | ||
56 | fi | ||
57 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
58 | index eb2ce82..7193de0 100644 | ||
59 | --- openjdk/hotspot/make/jprt.properties | ||
60 | +++ openjdk/hotspot/make/jprt.properties | ||
61 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
62 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
63 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
64 | |||
65 | -jprt.my.linux.i586=linux_i586 | ||
66 | +jprt.my.linux.x86=linux_x86 | ||
67 | jprt.my.linux.x64=linux_x64 | ||
68 | jprt.my.windows.i586=windows_i586 | ||
69 | jprt.my.windows.x64=windows_x64 | ||
70 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
71 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
72 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
73 | |||
74 | -jprt.my.linux.i586.test.targets = \ | ||
75 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
76 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
77 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
78 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
79 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
80 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
81 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
82 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
83 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
84 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
85 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
86 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
87 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
88 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
89 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
90 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
91 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
92 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
93 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
94 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
95 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
96 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
97 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
98 | +jprt.my.linux.x86.test.targets = \ | ||
99 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
100 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
101 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
102 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
103 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
104 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
105 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
106 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
107 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
108 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
109 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
110 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
111 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
112 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
113 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
114 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
115 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
116 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
117 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
118 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
119 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
120 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
121 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
122 | |||
123 | jprt.my.linux.x64.test.targets = \ | ||
124 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
125 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
126 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
127 | ${jprt.my.solaris.i586.test.targets}, \ | ||
128 | ${jprt.my.solaris.x64.test.targets}, \ | ||
129 | - ${jprt.my.linux.i586.test.targets}, \ | ||
130 | + ${jprt.my.linux.x86.test.targets}, \ | ||
131 | ${jprt.my.linux.x64.test.targets}, \ | ||
132 | ${jprt.my.windows.i586.test.targets}, \ | ||
133 | ${jprt.my.windows.x64.test.targets} | ||
134 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
135 | index e317fdd..5d3b1ff 100644 | ||
136 | --- openjdk/hotspot/make/linux/build.sh | ||
137 | +++ openjdk/hotspot/make/linux/build.sh | ||
138 | @@ -43,7 +43,7 @@ esac | ||
139 | |||
140 | case `uname -m` in | ||
141 | i386|i486|i586|i686) | ||
142 | - mach=i386 | ||
143 | + mach=x86 | ||
144 | ;; | ||
145 | *) | ||
146 | echo "Unsupported machine: " `uname -m` | ||
147 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
148 | index add9823..cbbf81f 100644 | ||
149 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
150 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
151 | @@ -30,7 +30,7 @@ | ||
152 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
153 | # environment or on the command-line: | ||
154 | # | ||
155 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
156 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
157 | # BUILDARCH - build directory | ||
158 | # LIBARCH - the corresponding directory in JDK/JRE | ||
159 | # GAMMADIR - top of workspace | ||
160 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
161 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
162 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
163 | |||
164 | -DATA_MODE/i486 = 32 | ||
165 | +DATA_MODE/x86 = 32 | ||
166 | DATA_MODE/sparc = 32 | ||
167 | DATA_MODE/sparcv9 = 64 | ||
168 | DATA_MODE/amd64 = 64 | ||
169 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
170 | index 113d4f8..d3f06cb 100644 | ||
171 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
172 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
173 | @@ -78,7 +78,7 @@ endif | ||
174 | # Processor-specific files for other processors are excluded by default. Use | ||
175 | # CS_CPU=x to include platform-specific files for other platforms. | ||
176 | ifndef CS_CPU | ||
177 | -CS_CPU = i486 sparc amd64 ia64 | ||
178 | +CS_CPU = x86 sparc amd64 ia64 | ||
179 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
180 | endif | ||
181 | |||
182 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
183 | index 9131c79..138dfb3 100644 | ||
184 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
185 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
186 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
187 | HS_ARCH = sparc | ||
188 | endif | ||
189 | |||
190 | +# x86 | ||
191 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
192 | + ARCH_DATA_MODEL = 32 | ||
193 | + PLATFORM = linux-x86 | ||
194 | + VM_PLATFORM = linux_x86 | ||
195 | + HS_ARCH = x86 | ||
196 | +endif | ||
197 | + | ||
198 | # x86_64 | ||
199 | ifeq ($(ARCH), x86_64) | ||
200 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
201 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
202 | HS_ARCH = x86 | ||
203 | else | ||
204 | ARCH_DATA_MODEL = 32 | ||
205 | - PLATFORM = linux-i586 | ||
206 | - VM_PLATFORM = linux_i486 | ||
207 | + PLATFORM = linux-x86 | ||
208 | + VM_PLATFORM = linux_x86 | ||
209 | HS_ARCH = x86 | ||
210 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
211 | - ARCH = i686 | ||
212 | endif | ||
213 | endif | ||
214 | |||
215 | -# i686 | ||
216 | -ifeq ($(ARCH), i686) | ||
217 | - ARCH_DATA_MODEL = 32 | ||
218 | - PLATFORM = linux-i586 | ||
219 | - VM_PLATFORM = linux_i486 | ||
220 | - HS_ARCH = x86 | ||
221 | -endif | ||
222 | - | ||
223 | JDK_INCLUDE_SUBDIR=linux | ||
224 | |||
225 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
226 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
227 | index 0a9f75b..2e29bb9 100644 | ||
228 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
229 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
230 | @@ -30,7 +30,7 @@ CC = cc | ||
231 | AS = $(CC) -c | ||
232 | |||
233 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
234 | -ARCHFLAG/i486 = -m32 | ||
235 | +ARCHFLAG/x86 = -m32 | ||
236 | ARCHFLAG/amd64 = -m64 | ||
237 | |||
238 | CFLAGS += $(ARCHFLAG) | ||
239 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
240 | deleted file mode 100644 | ||
241 | index 610ac91..0000000 | ||
242 | --- openjdk/hotspot/make/linux/platform_i486 | ||
243 | +++ /dev/null | ||
244 | @@ -1,15 +0,0 @@ | ||
245 | -os_family = linux | ||
246 | - | ||
247 | -arch = x86 | ||
248 | - | ||
249 | -arch_model = x86_32 | ||
250 | - | ||
251 | -os_arch = linux_x86 | ||
252 | - | ||
253 | -os_arch_model = linux_x86_32 | ||
254 | - | ||
255 | -lib_arch = i386 | ||
256 | - | ||
257 | -compiler = gcc | ||
258 | - | ||
259 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
260 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
261 | index 325a3fe..717fc75 100644 | ||
262 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
263 | +++ openjdk/hotspot/make/linux/platform_i486.suncc | ||
264 | @@ -8,10 +8,10 @@ os_arch = linux_x86 | ||
265 | |||
266 | os_arch_model = linux_x86_32 | ||
267 | |||
268 | -lib_arch = i386 | ||
269 | +lib_arch = x86 | ||
270 | |||
271 | compiler = sparcWorks | ||
272 | |||
273 | -gnu_dis_arch = i386 | ||
274 | +gnu_dis_arch = x86 | ||
275 | |||
276 | sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
277 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
278 | new file mode 100644 | ||
279 | index 0000000..5c613fe | ||
280 | --- /dev/null | ||
281 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
282 | @@ -0,0 +1,15 @@ | ||
283 | +os_family = linux | ||
284 | + | ||
285 | +arch = x86 | ||
286 | + | ||
287 | +arch_model = x86_32 | ||
288 | + | ||
289 | +os_arch = linux_x86 | ||
290 | + | ||
291 | +os_arch_model = linux_x86_32 | ||
292 | + | ||
293 | +lib_arch = x86 | ||
294 | + | ||
295 | +compiler = gcc | ||
296 | + | ||
297 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
298 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
299 | index b2b3162..a4bbe70 100644 | ||
300 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
301 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
302 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
303 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
304 | #ifdef __ia64__ | ||
305 | #define SYS_gettid 1105 | ||
306 | -#elif __i386__ | ||
307 | +#elif __x86__ | ||
308 | #define SYS_gettid 224 | ||
309 | #elif __amd64__ | ||
310 | #define SYS_gettid 186 | ||
311 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
312 | #elif defined(IA64) | ||
313 | static char cpu_arch[] = "ia64"; | ||
314 | #elif defined(IA32) | ||
315 | -static char cpu_arch[] = "i386"; | ||
316 | +static char cpu_arch[] = "x86"; | ||
317 | #elif defined(AMD64) | ||
318 | static char cpu_arch[] = "amd64"; | ||
319 | #elif defined(SPARC) | ||
320 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
321 | index 6bdf4b8..fd43c6e 100644 | ||
322 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
323 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
324 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
325 | endif | ||
326 | |||
327 | # Default arch; it is changed below as needed. | ||
328 | -ARCH = i386 | ||
329 | +ARCH = x86 | ||
330 | OS = $(shell uname) | ||
331 | |||
332 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
333 | @@ -87,7 +87,7 @@ endif # SunOS | ||
334 | LIBARCH = $(ARCH) | ||
335 | ifdef LP64 | ||
336 | LIBARCH64/sparc = sparcv9 | ||
337 | -LIBARCH64/i386 = amd64 | ||
338 | +LIBARCH64/x86 = amd64 | ||
339 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
340 | ifneq ($(LIBARCH64),) | ||
341 | LIBARCH = $(LIBARCH64) | ||
342 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
343 | index 75b7efe..62c692b 100644 | ||
344 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
345 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
346 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
347 | else | ||
348 | disassembler_usage(stderr); /* better than nothing */ | ||
349 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
350 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
351 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
352 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
353 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
354 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
355 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
356 | #endif | ||
357 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
358 | static const char* native_arch_name() { | ||
359 | const char* res = HOTSPOT_LIB_ARCH; | ||
360 | #ifdef LIBARCH_amd64 | ||
361 | - res = "i386:x86-64"; | ||
362 | + res = "x86:x86-64"; | ||
363 | #endif | ||
364 | #ifdef LIBARCH_sparc | ||
365 | res = "sparc:v8plusb"; | ||
366 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
367 | index 2596d85..c2f3eb9 100644 | ||
368 | --- openjdk/hotspot/test/Makefile | ||
369 | +++ openjdk/hotspot/test/Makefile | ||
370 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
371 | PLATFORM = solaris | ||
372 | ARCH = $(shell uname -p) | ||
373 | ifeq ($(ARCH), i386) | ||
374 | - ARCH=i586 | ||
375 | + ARCH=x86 | ||
376 | endif | ||
377 | endif | ||
378 | ifeq ($(OSNAME), Linux) | ||
379 | PLATFORM = linux | ||
380 | ARCH = $(shell uname -m) | ||
381 | - ifeq ($(ARCH), i386) | ||
382 | - ARCH = i586 | ||
383 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
384 | + ARCH = x86 | ||
385 | endif | ||
386 | endif | ||
387 | ifeq ($(OSNAME), Windows_NT) | ||
388 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
389 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
390 | ARCH = x64 | ||
391 | else | ||
392 | - ARCH = i586 | ||
393 | + ARCH = x86 | ||
394 | endif | ||
395 | endif | ||
396 | endif | ||
397 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
398 | index 38e0f78..64c8410 100644 | ||
399 | --- openjdk/hotspot/agent/make/saenv.sh | ||
400 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
401 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
402 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
403 | CPU=amd64 | ||
404 | else | ||
405 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
406 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
407 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
408 | - CPU=i386 | ||
409 | + CPU=x86 | ||
410 | fi | ||
411 | else | ||
412 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
413 | diff --git openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
414 | index c4ca7de..54c12ca 100644 | ||
415 | --- openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
416 | +++ openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
417 | @@ -29,7 +29,7 @@ | ||
418 | #define amd64 1 | ||
419 | #endif | ||
420 | |||
421 | -#ifdef i386 | ||
422 | +#ifdef x86 | ||
423 | #include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h" | ||
424 | #endif | ||
425 | |||
426 | @@ -295,7 +295,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
427 | } | ||
428 | |||
429 | #undef NPRGREG | ||
430 | -#ifdef i386 | ||
431 | +#ifdef x86 | ||
432 | #define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG | ||
433 | #endif | ||
434 | #ifdef ia64 | ||
435 | @@ -314,7 +314,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
436 | |||
437 | #undef REG_INDEX | ||
438 | |||
439 | -#ifdef i386 | ||
440 | +#ifdef x86 | ||
441 | #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg | ||
442 | |||
443 | regs[REG_INDEX(GS)] = (uintptr_t) gregs.xgs; | ||
444 | @@ -333,7 +333,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
445 | regs[REG_INDEX(CS)] = (uintptr_t) gregs.xcs; | ||
446 | regs[REG_INDEX(SS)] = (uintptr_t) gregs.xss; | ||
447 | |||
448 | -#endif /* i386 */ | ||
449 | +#endif /* x86 */ | ||
450 | |||
451 | #if ia64 | ||
452 | regs = (*env)->GetLongArrayElements(env, array, &isCopy); | ||
453 | diff --git openjdk/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile | ||
454 | index a16f3a7..85fecb1 100644 | ||
455 | --- openjdk/hotspot/agent/src/os/linux/Makefile | ||
456 | +++ openjdk/hotspot/agent/src/os/linux/Makefile | ||
457 | @@ -22,7 +22,7 @@ | ||
458 | # | ||
459 | # | ||
460 | |||
461 | -ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) | ||
462 | +ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo x86 ; fi ) | ||
463 | GCC = gcc$(GCC_SUFFIX) | ||
464 | |||
465 | JAVAH = ${JAVA_HOME}/bin/javah | ||
466 | diff --git openjdk/hotspot/agent/src/os/linux/ps_core.c openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
467 | index 3562f2d..47ab01b 100644 | ||
468 | --- openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
469 | +++ openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
470 | @@ -540,7 +540,7 @@ static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size | ||
471 | |||
472 | if (is_debug()) { | ||
473 | print_debug("integer regset\n"); | ||
474 | -#ifdef i386 | ||
475 | +#ifdef x86 | ||
476 | // print the regset | ||
477 | print_debug("\teax = 0x%x\n", newthr->regs.eax); | ||
478 | print_debug("\tebx = 0x%x\n", newthr->regs.ebx); | ||
479 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
480 | index 83ddd1a..c20c7eb 100644 | ||
481 | --- openjdk/hotspot/make/defs.make | ||
482 | +++ openjdk/hotspot/make/defs.make | ||
483 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
484 | ifdef LP64 | ||
485 | BUILDARCH = amd64 | ||
486 | else | ||
487 | - BUILDARCH = i486 | ||
488 | + BUILDARCH = x86 | ||
489 | endif | ||
490 | endif | ||
491 | ifeq ($(BUILDARCH), sparc) | ||
492 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
493 | |||
494 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
495 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
496 | - LIBARCH/i486 = i386 | ||
497 | + LIBARCH/x86 = x86 | ||
498 | LIBARCH/amd64 = amd64 | ||
499 | LIBARCH/sparc = sparc | ||
500 | LIBARCH/sparcv9 = sparcv9 | ||
501 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
502 | index bc82543..4a1ef4e 100644 | ||
503 | --- openjdk/hotspot/make/jprt.config | ||
504 | +++ openjdk/hotspot/make/jprt.config | ||
505 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
506 | # LINUX: X86, AMD64 | ||
507 | osarch=`uname -m` | ||
508 | if [ "${osarch}" = i686 ] ; then | ||
509 | - linux_arch=i586 | ||
510 | + linux_arch=x86 | ||
511 | elif [ "${osarch}" = x86_64 ] ; then | ||
512 | linux_arch=amd64 | ||
513 | fi | ||
514 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
515 | index eb2ce82..7193de0 100644 | ||
516 | --- openjdk/hotspot/make/jprt.properties | ||
517 | +++ openjdk/hotspot/make/jprt.properties | ||
518 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
519 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
520 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
521 | |||
522 | -jprt.my.linux.i586=linux_i586 | ||
523 | +jprt.my.linux.x86=linux_x86 | ||
524 | jprt.my.linux.x64=linux_x64 | ||
525 | jprt.my.windows.i586=windows_i586 | ||
526 | jprt.my.windows.x64=windows_x64 | ||
527 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
528 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
529 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
530 | |||
531 | -jprt.my.linux.i586.test.targets = \ | ||
532 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
533 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
534 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
535 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
536 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
537 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
538 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
539 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
540 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
541 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
542 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
543 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
544 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
545 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
546 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
547 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
548 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
549 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
550 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
551 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
552 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
553 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
554 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
555 | +jprt.my.linux.x86.test.targets = \ | ||
556 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
557 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
558 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
559 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
560 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
561 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
562 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
563 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
564 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
565 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
566 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
567 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
568 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
569 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
570 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
571 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
572 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
573 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
574 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
575 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
576 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
577 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
578 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
579 | |||
580 | jprt.my.linux.x64.test.targets = \ | ||
581 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
582 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
583 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
584 | ${jprt.my.solaris.i586.test.targets}, \ | ||
585 | ${jprt.my.solaris.x64.test.targets}, \ | ||
586 | - ${jprt.my.linux.i586.test.targets}, \ | ||
587 | + ${jprt.my.linux.x86.test.targets}, \ | ||
588 | ${jprt.my.linux.x64.test.targets}, \ | ||
589 | ${jprt.my.windows.i586.test.targets}, \ | ||
590 | ${jprt.my.windows.x64.test.targets} | ||
591 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
592 | index e317fdd..5d3b1ff 100644 | ||
593 | --- openjdk/hotspot/make/linux/build.sh | ||
594 | +++ openjdk/hotspot/make/linux/build.sh | ||
595 | @@ -43,7 +43,7 @@ esac | ||
596 | |||
597 | case `uname -m` in | ||
598 | i386|i486|i586|i686) | ||
599 | - mach=i386 | ||
600 | + mach=x86 | ||
601 | ;; | ||
602 | *) | ||
603 | echo "Unsupported machine: " `uname -m` | ||
604 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
605 | index add9823..cbbf81f 100644 | ||
606 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
607 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
608 | @@ -30,7 +30,7 @@ | ||
609 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
610 | # environment or on the command-line: | ||
611 | # | ||
612 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
613 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
614 | # BUILDARCH - build directory | ||
615 | # LIBARCH - the corresponding directory in JDK/JRE | ||
616 | # GAMMADIR - top of workspace | ||
617 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
618 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
619 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
620 | |||
621 | -DATA_MODE/i486 = 32 | ||
622 | +DATA_MODE/x86 = 32 | ||
623 | DATA_MODE/sparc = 32 | ||
624 | DATA_MODE/sparcv9 = 64 | ||
625 | DATA_MODE/amd64 = 64 | ||
626 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
627 | index 113d4f8..d3f06cb 100644 | ||
628 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
629 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
630 | @@ -78,7 +78,7 @@ endif | ||
631 | # Processor-specific files for other processors are excluded by default. Use | ||
632 | # CS_CPU=x to include platform-specific files for other platforms. | ||
633 | ifndef CS_CPU | ||
634 | -CS_CPU = i486 sparc amd64 ia64 | ||
635 | +CS_CPU = x86 sparc amd64 ia64 | ||
636 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
637 | endif | ||
638 | |||
639 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
640 | index 9131c79..138dfb3 100644 | ||
641 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
642 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
643 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
644 | HS_ARCH = sparc | ||
645 | endif | ||
646 | |||
647 | +# x86 | ||
648 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
649 | + ARCH_DATA_MODEL = 32 | ||
650 | + PLATFORM = linux-x86 | ||
651 | + VM_PLATFORM = linux_x86 | ||
652 | + HS_ARCH = x86 | ||
653 | +endif | ||
654 | + | ||
655 | # x86_64 | ||
656 | ifeq ($(ARCH), x86_64) | ||
657 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
658 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
659 | HS_ARCH = x86 | ||
660 | else | ||
661 | ARCH_DATA_MODEL = 32 | ||
662 | - PLATFORM = linux-i586 | ||
663 | - VM_PLATFORM = linux_i486 | ||
664 | + PLATFORM = linux-x86 | ||
665 | + VM_PLATFORM = linux_x86 | ||
666 | HS_ARCH = x86 | ||
667 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
668 | - ARCH = i686 | ||
669 | endif | ||
670 | endif | ||
671 | |||
672 | -# i686 | ||
673 | -ifeq ($(ARCH), i686) | ||
674 | - ARCH_DATA_MODEL = 32 | ||
675 | - PLATFORM = linux-i586 | ||
676 | - VM_PLATFORM = linux_i486 | ||
677 | - HS_ARCH = x86 | ||
678 | -endif | ||
679 | - | ||
680 | JDK_INCLUDE_SUBDIR=linux | ||
681 | |||
682 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
683 | diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make | ||
684 | index a2c24bc..27bad01 100644 | ||
685 | --- openjdk/hotspot/make/linux/makefiles/gcc.make | ||
686 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make | ||
687 | @@ -77,7 +77,7 @@ CFLAGS += -fcheck-new | ||
688 | CFLAGS += -g | ||
689 | |||
690 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
691 | -ARCHFLAG/i486 = -m32 -march=i586 | ||
692 | +ARCHFLAG/x86 = -m32 | ||
693 | ARCHFLAG/amd64 = -m64 | ||
694 | ARCHFLAG/ia64 = | ||
695 | ARCHFLAG/sparc = -m32 -mcpu=v9 | ||
696 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
697 | index 0a9f75b..2e29bb9 100644 | ||
698 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
699 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
700 | @@ -30,7 +30,7 @@ CC = cc | ||
701 | AS = $(CC) -c | ||
702 | |||
703 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
704 | -ARCHFLAG/i486 = -m32 | ||
705 | +ARCHFLAG/x86 = -m32 | ||
706 | ARCHFLAG/amd64 = -m64 | ||
707 | |||
708 | CFLAGS += $(ARCHFLAG) | ||
709 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
710 | deleted file mode 100644 | ||
711 | index 610ac91..0000000 | ||
712 | --- openjdk/hotspot/make/linux/platform_i486 | ||
713 | +++ /dev/null | ||
714 | @@ -1,15 +0,0 @@ | ||
715 | -os_family = linux | ||
716 | - | ||
717 | -arch = x86 | ||
718 | - | ||
719 | -arch_model = x86_32 | ||
720 | - | ||
721 | -os_arch = linux_x86 | ||
722 | - | ||
723 | -os_arch_model = linux_x86_32 | ||
724 | - | ||
725 | -lib_arch = i386 | ||
726 | - | ||
727 | -compiler = gcc | ||
728 | - | ||
729 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
730 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
731 | deleted file mode 100644 | ||
732 | index 325a3fe..0000000 | ||
733 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
734 | +++ /dev/null | ||
735 | @@ -1,17 +0,0 @@ | ||
736 | -os_family = linux | ||
737 | - | ||
738 | -arch = x86 | ||
739 | - | ||
740 | -arch_model = x86_32 | ||
741 | - | ||
742 | -os_arch = linux_x86 | ||
743 | - | ||
744 | -os_arch_model = linux_x86_32 | ||
745 | - | ||
746 | -lib_arch = i386 | ||
747 | - | ||
748 | -compiler = sparcWorks | ||
749 | - | ||
750 | -gnu_dis_arch = i386 | ||
751 | - | ||
752 | -sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
753 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
754 | new file mode 100644 | ||
755 | index 0000000..5c613fe | ||
756 | --- /dev/null | ||
757 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
758 | @@ -0,0 +1,15 @@ | ||
759 | +os_family = linux | ||
760 | + | ||
761 | +arch = x86 | ||
762 | + | ||
763 | +arch_model = x86_32 | ||
764 | + | ||
765 | +os_arch = linux_x86 | ||
766 | + | ||
767 | +os_arch_model = linux_x86_32 | ||
768 | + | ||
769 | +lib_arch = x86 | ||
770 | + | ||
771 | +compiler = gcc | ||
772 | + | ||
773 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
774 | diff --git openjdk/hotspot/make/linux/platform_x86.suncc openjdk/hotspot/make/linux/platform_x86.suncc | ||
775 | new file mode 100644 | ||
776 | index 0000000..717fc75 | ||
777 | --- /dev/null | ||
778 | +++ openjdk/hotspot/make/linux/platform_x86.suncc | ||
779 | @@ -0,0 +1,17 @@ | ||
780 | +os_family = linux | ||
781 | + | ||
782 | +arch = x86 | ||
783 | + | ||
784 | +arch_model = x86_32 | ||
785 | + | ||
786 | +os_arch = linux_x86 | ||
787 | + | ||
788 | +os_arch_model = linux_x86_32 | ||
789 | + | ||
790 | +lib_arch = x86 | ||
791 | + | ||
792 | +compiler = sparcWorks | ||
793 | + | ||
794 | +gnu_dis_arch = x86 | ||
795 | + | ||
796 | +sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
797 | diff --git openjdk/hotspot/src/os/linux/launcher/java_md.c openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
798 | index 50a86cd..48141be 100644 | ||
799 | --- openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
800 | +++ openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
801 | @@ -56,8 +56,8 @@ | ||
802 | * models is supported, then DUAL_MODE is defined. When DUAL_MODE is | ||
803 | * defined, the architecture names for the narrow and wide version of | ||
804 | * the architecture are defined in BIG_ARCH and SMALL_ARCH. Currently | ||
805 | - * only Solaris on sparc/sparcv9 and i586/amd64 is DUAL_MODE; linux | ||
806 | - * i586/amd64 could be defined as DUAL_MODE but that is not the | ||
807 | + * only Solaris on sparc/sparcv9 and x86/amd64 is DUAL_MODE; linux | ||
808 | + * x86/amd64 could be defined as DUAL_MODE but that is not the | ||
809 | * current policy. | ||
810 | */ | ||
811 | |||
812 | @@ -75,8 +75,8 @@ | ||
813 | |||
814 | #else /* 32-bit data model */ | ||
815 | |||
816 | -# ifdef i586 | ||
817 | -# define ARCH "i386" | ||
818 | +# ifdef x86 | ||
819 | +# define ARCH "x86" | ||
820 | # elif defined(__sparc) | ||
821 | # define ARCH "sparc" | ||
822 | # endif | ||
823 | @@ -90,7 +90,7 @@ | ||
824 | # define SMALL_ARCH "sparc" | ||
825 | # else | ||
826 | # define BIG_ARCH "amd64" | ||
827 | -# define SMALL_ARCH "i386" | ||
828 | +# define SMALL_ARCH "x86" | ||
829 | # endif | ||
830 | # include <sys/systeminfo.h> | ||
831 | # include <sys/elf.h> | ||
832 | @@ -1103,7 +1103,7 @@ void PrintMachineDependentOptions() { | ||
833 | * This code is somewhat more confused with #ifdef's than we'd | ||
834 | * like because this file is used by both Solaris and Linux | ||
835 | * platforms, and so needs to be parameterized for SPARC and | ||
836 | - * i586 hardware. The other Linux platforms (amd64 and ia64) | ||
837 | + * x86 hardware. The other Linux platforms (amd64 and ia64) | ||
838 | * don't even ask this question, because they only come with | ||
839 | * server JVMs. */ | ||
840 | |||
841 | @@ -1168,11 +1168,11 @@ solaris_sparc_ServerClassMachine(void) { | ||
842 | |||
843 | #endif /* __sun && __sparc */ | ||
844 | |||
845 | -#if defined(__sun) && defined(i586) | ||
846 | +#if defined(__sun) && defined(x86) | ||
847 | |||
848 | /* | ||
849 | * A utility method for asking the CPU about itself. | ||
850 | - * There's a corresponding version of linux-i586 | ||
851 | + * There's a corresponding version of linux-x86 | ||
852 | * because the compilers are different. | ||
853 | */ | ||
854 | void | ||
855 | @@ -1218,13 +1218,13 @@ get_cpuid(uint32_t arg, | ||
856 | #endif | ||
857 | } | ||
858 | |||
859 | -#endif /* __sun && i586 */ | ||
860 | +#endif /* __sun && x86 */ | ||
861 | |||
862 | -#if defined(__linux__) && defined(i586) | ||
863 | +#if defined(__linux__) && defined(x86) | ||
864 | |||
865 | /* | ||
866 | * A utility method for asking the CPU about itself. | ||
867 | - * There's a corresponding version of solaris-i586 | ||
868 | + * There's a corresponding version of solaris-x86 | ||
869 | * because the compilers are different. | ||
870 | */ | ||
871 | void | ||
872 | @@ -1286,11 +1286,11 @@ get_cpuid(uint32_t arg, | ||
873 | #endif | ||
874 | } | ||
875 | |||
876 | -#endif /* __linux__ && i586 */ | ||
877 | +#endif /* __linux__ && x86 */ | ||
878 | |||
879 | -#ifdef i586 | ||
880 | +#ifdef x86 | ||
881 | /* | ||
882 | - * Routines shared by solaris-i586 and linux-i586. | ||
883 | + * Routines shared by solaris-x86 and linux-x86. | ||
884 | */ | ||
885 | |||
886 | enum HyperThreadingSupport_enum { | ||
887 | @@ -1430,11 +1430,11 @@ physical_processors(void) { | ||
888 | return result; | ||
889 | } | ||
890 | |||
891 | -#endif /* i586 */ | ||
892 | +#endif /* x86 */ | ||
893 | |||
894 | -#if defined(__sun) && defined(i586) | ||
895 | +#if defined(__sun) && defined(x86) | ||
896 | |||
897 | -/* The definition of a server-class machine for solaris-i586/amd64 */ | ||
898 | +/* The definition of a server-class machine for solaris-x86/amd64 */ | ||
899 | jboolean | ||
900 | solaris_i586_ServerClassMachine(void) { | ||
901 | jboolean result = JNI_FALSE; | ||
902 | @@ -1463,11 +1463,11 @@ solaris_i586_ServerClassMachine(void) { | ||
903 | return result; | ||
904 | } | ||
905 | |||
906 | -#endif /* __sun && i586 */ | ||
907 | +#endif /* __sun && x86 */ | ||
908 | |||
909 | -#if defined(__linux__) && defined(i586) | ||
910 | +#if defined(__linux__) && defined(x86) | ||
911 | |||
912 | -/* The definition of a server-class machine for linux-i586 */ | ||
913 | +/* The definition of a server-class machine for linux-x86 */ | ||
914 | jboolean | ||
915 | linux_i586_ServerClassMachine(void) { | ||
916 | jboolean result = JNI_FALSE; | ||
917 | @@ -1496,7 +1496,7 @@ linux_i586_ServerClassMachine(void) { | ||
918 | return result; | ||
919 | } | ||
920 | |||
921 | -#endif /* __linux__ && i586 */ | ||
922 | +#endif /* __linux__ && x86 */ | ||
923 | |||
924 | /* Dispatch to the platform-specific definition of "server-class" */ | ||
925 | jboolean | ||
926 | @@ -1504,9 +1504,9 @@ ServerClassMachine(void) { | ||
927 | jboolean result = JNI_FALSE; | ||
928 | #if defined(__sun) && defined(__sparc) | ||
929 | result = solaris_sparc_ServerClassMachine(); | ||
930 | -#elif defined(__sun) && defined(i586) | ||
931 | +#elif defined(__sun) && defined(x86) | ||
932 | result = solaris_i586_ServerClassMachine(); | ||
933 | -#elif defined(__linux__) && defined(i586) | ||
934 | +#elif defined(__linux__) && defined(x86) | ||
935 | result = linux_i586_ServerClassMachine(); | ||
936 | #else | ||
937 | if (_launcher_debug) { | ||
938 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
939 | index b2b3162..a4bbe70 100644 | ||
940 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
941 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
942 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
943 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
944 | #ifdef __ia64__ | ||
945 | #define SYS_gettid 1105 | ||
946 | -#elif __i386__ | ||
947 | +#elif __x86__ | ||
948 | #define SYS_gettid 224 | ||
949 | #elif __amd64__ | ||
950 | #define SYS_gettid 186 | ||
951 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
952 | #elif defined(IA64) | ||
953 | static char cpu_arch[] = "ia64"; | ||
954 | #elif defined(IA32) | ||
955 | -static char cpu_arch[] = "i386"; | ||
956 | +static char cpu_arch[] = "x86"; | ||
957 | #elif defined(AMD64) | ||
958 | static char cpu_arch[] = "amd64"; | ||
959 | #elif defined(SPARC) | ||
960 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
961 | index 6bdf4b8..fd43c6e 100644 | ||
962 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
963 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
964 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
965 | endif | ||
966 | |||
967 | # Default arch; it is changed below as needed. | ||
968 | -ARCH = i386 | ||
969 | +ARCH = x86 | ||
970 | OS = $(shell uname) | ||
971 | |||
972 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
973 | @@ -87,7 +87,7 @@ endif # SunOS | ||
974 | LIBARCH = $(ARCH) | ||
975 | ifdef LP64 | ||
976 | LIBARCH64/sparc = sparcv9 | ||
977 | -LIBARCH64/i386 = amd64 | ||
978 | +LIBARCH64/x86 = amd64 | ||
979 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
980 | ifneq ($(LIBARCH64),) | ||
981 | LIBARCH = $(LIBARCH64) | ||
982 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
983 | index 75b7efe..62c692b 100644 | ||
984 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
985 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
986 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
987 | else | ||
988 | disassembler_usage(stderr); /* better than nothing */ | ||
989 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
990 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
991 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
992 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
993 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
994 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
995 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
996 | #endif | ||
997 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
998 | static const char* native_arch_name() { | ||
999 | const char* res = HOTSPOT_LIB_ARCH; | ||
1000 | #ifdef LIBARCH_amd64 | ||
1001 | - res = "i386:x86-64"; | ||
1002 | + res = "x86:x86-64"; | ||
1003 | #endif | ||
1004 | #ifdef LIBARCH_sparc | ||
1005 | res = "sparc:v8plusb"; | ||
1006 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/i486.ad openjdk/hotspot/src/share/vm/adlc/Test/i486.ad | ||
1007 | deleted file mode 100644 | ||
1008 | index e69de29..0000000 | ||
1009 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/x86.ad openjdk/hotspot/src/share/vm/adlc/Test/x86.ad | ||
1010 | new file mode 100644 | ||
1011 | index 0000000..e69de29 | ||
1012 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
1013 | index 2596d85..c2f3eb9 100644 | ||
1014 | --- openjdk/hotspot/test/Makefile | ||
1015 | +++ openjdk/hotspot/test/Makefile | ||
1016 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
1017 | PLATFORM = solaris | ||
1018 | ARCH = $(shell uname -p) | ||
1019 | ifeq ($(ARCH), i386) | ||
1020 | - ARCH=i586 | ||
1021 | + ARCH=x86 | ||
1022 | endif | ||
1023 | endif | ||
1024 | ifeq ($(OSNAME), Linux) | ||
1025 | PLATFORM = linux | ||
1026 | ARCH = $(shell uname -m) | ||
1027 | - ifeq ($(ARCH), i386) | ||
1028 | - ARCH = i586 | ||
1029 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
1030 | + ARCH = x86 | ||
1031 | endif | ||
1032 | endif | ||
1033 | ifeq ($(OSNAME), Windows_NT) | ||
1034 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
1035 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
1036 | ARCH = x64 | ||
1037 | else | ||
1038 | - ARCH = i586 | ||
1039 | + ARCH = x86 | ||
1040 | endif | ||
1041 | endif | ||
1042 | endif | ||
1043 | -- | ||
1044 | 1.6.5 | ||
1045 | |||
1046 | diff --git openjdk/hotspot/make/linux/makefiles/i486.make b/hotspot/make/linux/makefiles/i486.make | ||
1047 | deleted file mode 100644 | ||
1048 | index 9dd0b44..0000000 | ||
1049 | --- openjdk/hotspot/make/linux/makefiles/i486.make | ||
1050 | +++ /dev/null | ||
1051 | @@ -1,36 +0,0 @@ | ||
1052 | -# | ||
1053 | -# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1054 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1055 | -# | ||
1056 | -# This code is free software; you can redistribute it and/or modify it | ||
1057 | -# under the terms of the GNU General Public License version 2 only, as | ||
1058 | -# published by the Free Software Foundation. | ||
1059 | -# | ||
1060 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1061 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1062 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1063 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
1064 | -# accompanied this code). | ||
1065 | -# | ||
1066 | -# You should have received a copy of the GNU General Public License version | ||
1067 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
1068 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1069 | -# | ||
1070 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1071 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1072 | -# have any questions. | ||
1073 | -# | ||
1074 | -# | ||
1075 | - | ||
1076 | -# TLS helper, assembled from .s file | ||
1077 | -# Not included in includeDB because it has no dependencies | ||
1078 | -Obj_Files += linux_x86_32.o | ||
1079 | - | ||
1080 | -# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1081 | -OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1082 | -# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1083 | -OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1084 | -# Must also specify if CPU is little endian | ||
1085 | -CFLAGS += -DVM_LITTLE_ENDIAN | ||
1086 | - | ||
1087 | -OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1088 | diff --git openjdk/hotspot/make/linux/makefiles/x86.make openjdk/hotspot/make/linux/makefiles/x86.make | ||
1089 | new file mode 100644 | ||
1090 | index 0000000..9dd0b44 | ||
1091 | --- /dev/null | ||
1092 | +++ openjdk/hotspot/make/linux/makefiles/x86.make | ||
1093 | @@ -0,0 +1,36 @@ | ||
1094 | +# | ||
1095 | +# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1096 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1097 | +# | ||
1098 | +# This code is free software; you can redistribute it and/or modify it | ||
1099 | +# under the terms of the GNU General Public License version 2 only, as | ||
1100 | +# published by the Free Software Foundation. | ||
1101 | +# | ||
1102 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1103 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1104 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1105 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
1106 | +# accompanied this code). | ||
1107 | +# | ||
1108 | +# You should have received a copy of the GNU General Public License version | ||
1109 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
1110 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1111 | +# | ||
1112 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1113 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1114 | +# have any questions. | ||
1115 | +# | ||
1116 | +# | ||
1117 | + | ||
1118 | +# TLS helper, assembled from .s file | ||
1119 | +# Not included in includeDB because it has no dependencies | ||
1120 | +Obj_Files += linux_x86_32.o | ||
1121 | + | ||
1122 | +# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1123 | +OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1124 | +# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1125 | +OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1126 | +# Must also specify if CPU is little endian | ||
1127 | +CFLAGS += -DVM_LITTLE_ENDIAN | ||
1128 | + | ||
1129 | +OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1130 | |||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-javac-in.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-javac-in.patch new file mode 100644 index 0000000..846982c --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-javac-in.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 90688bde5acdb9193f5c381ce332012ff67c0e02 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Fri, 23 Oct 2009 16:10:49 +0200 | ||
4 | Subject: [PATCH 3/3] javac.in: remove fake-jdk rt | ||
5 | |||
6 | --- | ||
7 | javac.in | 4 ++-- | ||
8 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git icedtea6-1.6.1/javac.in icedtea6-1.6.1/javac.in | ||
11 | index a897b39..235d9b5 100644 | ||
12 | --- icedtea6-1.6.1/javac.in | ||
13 | +++ icedtea6-1.6.1/javac.in | ||
14 | @@ -33,9 +33,9 @@ fi | ||
15 | if [ -e @abs_top_builddir@/native-ecj ] ; then | ||
16 | @abs_top_builddir@/native-ecj -1.5 -nowarn $bcoption $NEW_ARGS ; | ||
17 | elif [ ! -z "@ECJ@" ] ; then | ||
18 | - @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS | ||
19 | + @ECJ@ -1.5 -nowarn $NEW_ARGS | ||
20 | else | ||
21 | CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \ | ||
22 | - @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS | ||
23 | + @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $NEW_ARGS | ||
24 | fi | ||
25 | |||
26 | -- | ||
27 | 1.6.5 | ||
28 | |||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch new file mode 100644 index 0000000..5c989f9 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch | |||
@@ -0,0 +1,240 @@ | |||
1 | From 662e11a8b6017f39ceb6d00dcdbfe11473b56174 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Fri, 23 Oct 2009 18:06:43 +0200 | ||
4 | Subject: [PATCH] sane-arch2 | ||
5 | |||
6 | --- | ||
7 | openjdk/jdk/make/common/shared/Compiler-gcc.gmk | 4 ++-- | ||
8 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git openjdk/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
11 | index 8329530..de85a11 100644 | ||
12 | --- openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
13 | +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
14 | @@ -90,8 +90,8 @@ ifeq ($(PLATFORM), linux) | ||
15 | REQUIRED_CC_VER = 3.2 | ||
16 | REQUIRED_GCC_VER = 3.2.* | ||
17 | endif | ||
18 | - ifeq ($(ARCH), i586) | ||
19 | - # i586 | ||
20 | + ifeq ($(ARCH), x86) | ||
21 | + # x86 | ||
22 | REQUIRED_CC_VER = 3.2 | ||
23 | REQUIRED_GCC_VER = 3.2.1* | ||
24 | REQUIRED_GCC_VER_INT = 3.2.1-7a | ||
25 | -- | ||
26 | 1.6.5 | ||
27 | |||
28 | From e2e87228dd36bd737b52ed3daeaed526b5e4d3ea Mon Sep 17 00:00:00 2001 | ||
29 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
30 | Date: Fri, 23 Oct 2009 18:16:54 +0200 | ||
31 | Subject: [PATCH] sane-arch3 | ||
32 | |||
33 | --- | ||
34 | jdk/src/solaris/bin/i586/jvm.cfg | 38 -------------------------------------- | ||
35 | jdk/src/solaris/bin/x86/jvm.cfg | 38 ++++++++++++++++++++++++++++++++++++++ | ||
36 | 2 files changed, 38 insertions(+), 38 deletions(-) | ||
37 | delete mode 100644 jdk/src/solaris/bin/i586/jvm.cfg | ||
38 | create mode 100644 jdk/src/solaris/bin/x86/jvm.cfg | ||
39 | |||
40 | diff --git openjdk/jdk/src/solaris/bin/i586/jvm.cfg openjdk/jdk/src/solaris/bin/i586/jvm.cfg | ||
41 | deleted file mode 100644 | ||
42 | index b97e5ae..0000000 | ||
43 | --- openjdk/jdk/src/solaris/bin/i586/jvm.cfg | ||
44 | +++ /dev/null | ||
45 | @@ -1,38 +0,0 @@ | ||
46 | -# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
47 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
48 | -# | ||
49 | -# This code is free software; you can redistribute it and/or modify it | ||
50 | -# under the terms of the GNU General Public License version 2 only, as | ||
51 | -# published by the Free Software Foundation. Sun designates this | ||
52 | -# particular file as subject to the "Classpath" exception as provided | ||
53 | -# by Sun in the LICENSE file that accompanied this code. | ||
54 | -# | ||
55 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
56 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
57 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
58 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
59 | -# accompanied this code). | ||
60 | -# | ||
61 | -# You should have received a copy of the GNU General Public License version | ||
62 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
63 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
64 | -# | ||
65 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
66 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
67 | -# have any questions. | ||
68 | -# | ||
69 | -# List of JVMs that can be used as an option to java, javac, etc. | ||
70 | -# Order is important -- first in this list is the default JVM. | ||
71 | -# NOTE that this both this file and its format are UNSUPPORTED and | ||
72 | -# WILL GO AWAY in a future release. | ||
73 | -# | ||
74 | -# You may also select a JVM in an arbitrary location with the | ||
75 | -# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
76 | -# and may not be available in a future release. | ||
77 | -# | ||
78 | --client IF_SERVER_CLASS -server | ||
79 | --server KNOWN | ||
80 | --hotspot ALIASED_TO -client | ||
81 | --classic WARN | ||
82 | --native ERROR | ||
83 | --green ERROR | ||
84 | diff --git openjdk/jdk/src/solaris/bin/x86/jvm.cfg openjdk/jdk/src/solaris/bin/x86/jvm.cfg | ||
85 | new file mode 100644 | ||
86 | index 0000000..b97e5ae | ||
87 | --- /dev/null | ||
88 | +++ openjdk/jdk/src/solaris/bin/x86/jvm.cfg | ||
89 | @@ -0,0 +1,38 @@ | ||
90 | +# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
91 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
92 | +# | ||
93 | +# This code is free software; you can redistribute it and/or modify it | ||
94 | +# under the terms of the GNU General Public License version 2 only, as | ||
95 | +# published by the Free Software Foundation. Sun designates this | ||
96 | +# particular file as subject to the "Classpath" exception as provided | ||
97 | +# by Sun in the LICENSE file that accompanied this code. | ||
98 | +# | ||
99 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
100 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
101 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
102 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
103 | +# accompanied this code). | ||
104 | +# | ||
105 | +# You should have received a copy of the GNU General Public License version | ||
106 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
107 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
108 | +# | ||
109 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
110 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
111 | +# have any questions. | ||
112 | +# | ||
113 | +# List of JVMs that can be used as an option to java, javac, etc. | ||
114 | +# Order is important -- first in this list is the default JVM. | ||
115 | +# NOTE that this both this file and its format are UNSUPPORTED and | ||
116 | +# WILL GO AWAY in a future release. | ||
117 | +# | ||
118 | +# You may also select a JVM in an arbitrary location with the | ||
119 | +# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
120 | +# and may not be available in a future release. | ||
121 | +# | ||
122 | +-client IF_SERVER_CLASS -server | ||
123 | +-server KNOWN | ||
124 | +-hotspot ALIASED_TO -client | ||
125 | +-classic WARN | ||
126 | +-native ERROR | ||
127 | +-green ERROR | ||
128 | -- | ||
129 | 1.6.5 | ||
130 | |||
131 | From d5274fb90454c0e40b665d865f456430949791c4 Mon Sep 17 00:00:00 2001 | ||
132 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
133 | Date: Fri, 23 Oct 2009 18:42:11 +0200 | ||
134 | Subject: [PATCH 2/4] sane-arch4 | ||
135 | |||
136 | --- | ||
137 | .../share/native/com/sun/mediopenjdk/sound/SoundDefs.h | 2 +- | ||
138 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
139 | |||
140 | diff --git openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
141 | index 94624e0..6522503 100644 | ||
142 | --- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
143 | +++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
144 | @@ -36,7 +36,7 @@ | ||
145 | #define X_ALPHA 1 | ||
146 | #define X_AMD64 2 | ||
147 | #define X_ARM 3 | ||
148 | -#define X_I586 4 | ||
149 | +#define X_X86 4 | ||
150 | #define X_IA64 5 | ||
151 | #define X_M68K 6 | ||
152 | #define X_MIPS 7 | ||
153 | -- | ||
154 | 1.6.5 | ||
155 | |||
156 | From 251338c93253d1026a37df2793956d7985f9f4eb Mon Sep 17 00:00:00 2001 | ||
157 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
158 | Date: Fri, 23 Oct 2009 18:44:13 +0200 | ||
159 | Subject: [PATCH 4/4] sane-arch4 | ||
160 | |||
161 | --- | ||
162 | jdk/make/javax/sound/SoundDefs.gmk | 6 +++--- | ||
163 | 1 files changed, 3 insertions(+), 3 deletions(-) | ||
164 | |||
165 | diff --git openjdk/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk | ||
166 | index 22ad8e0..a54ecd5 100644 | ||
167 | --- openjdk/jdk/make/javax/sound/SoundDefs.gmk | ||
168 | +++ openjdk/jdk/make/javax/sound/SoundDefs.gmk | ||
169 | @@ -70,9 +70,9 @@ else | ||
170 | CPPFLAGS += -DX_ARCH=X_ARM | ||
171 | endif # ARCH arm | ||
172 | |||
173 | - ifeq ($(ARCH), i586) | ||
174 | - CPPFLAGS += -DX_ARCH=X_I586 | ||
175 | - endif # ARCH i586 | ||
176 | + ifeq ($(ARCH), x86) | ||
177 | + CPPFLAGS += -DX_ARCH=X_X86 | ||
178 | + endif # ARCH x86 | ||
179 | |||
180 | ifeq ($(ARCH), ia64) | ||
181 | CPPFLAGS += -DX_ARCH=X_IA64 | ||
182 | -- | ||
183 | 1.6.5 | ||
184 | |||
185 | Index: openjdk/jdk/make/common/shared/Platform.gmk | ||
186 | =================================================================== | ||
187 | --- openjdk/jdk/make/common/shared/Platform.gmk 2009-10-23 22:17:12.749059413 +0200 | ||
188 | +++ openjdk/jdk/make/common/shared/Platform.gmk 2009-10-23 22:18:16.236579466 +0200 | ||
189 | @@ -56,8 +56,8 @@ | ||
190 | # OS_VENDOR company name | ||
191 | # TEMP_DISK /tmp or C:/temp | ||
192 | # ARCH_DATA_MODEL 32 or 64 | ||
193 | -# ARCH sparc, sparcv9, i586, amd64, or ia64 | ||
194 | -# ARCH_FAMILY sparc or i586 | ||
195 | +# ARCH sparc, sparcv9, x86, amd64, or ia64 | ||
196 | +# ARCH_FAMILY sparc or x86 | ||
197 | # ARCHPROP sparc or x86 | ||
198 | # ARCH_VM_SUBDIR jre/bin, jre/lib/sparc, etc. | ||
199 | # LIBARCH sparc, sparcv9, i386, amd64, or ia64 | ||
200 | @@ -200,7 +200,7 @@ | ||
201 | endif | ||
202 | archExpr = case "$(mach)" in \ | ||
203 | i[3-9]86) \ | ||
204 | - echo i586 \ | ||
205 | + echo x86 \ | ||
206 | ;; \ | ||
207 | ia64) \ | ||
208 | echo ia64 \ | ||
209 | @@ -239,7 +239,7 @@ | ||
210 | ARCH=sparcv9 | ||
211 | endif | ||
212 | else | ||
213 | - # i586 is 32-bit, amd64 is 64-bit | ||
214 | + # x86 is 32-bit, amd64 is 64-bit | ||
215 | ifndef ARCH_DATA_MODEL | ||
216 | ifeq ($(ARCH), alpha) | ||
217 | ARCH_DATA_MODEL=64 | ||
218 | @@ -250,7 +250,7 @@ | ||
219 | ifeq ($(ARCH), arm) | ||
220 | ARCH_DATA_MODEL=32 | ||
221 | endif | ||
222 | - ifeq ($(ARCH), i586) | ||
223 | + ifeq ($(ARCH), x86) | ||
224 | ARCH_DATA_MODEL=32 | ||
225 | endif | ||
226 | ifeq ($(ARCH), ia64) | ||
227 | @@ -280,12 +280,7 @@ | ||
228 | endif | ||
229 | endif | ||
230 | |||
231 | - # Need to maintain the jre/lib/i386 location for 32-bit Intel | ||
232 | - ifeq ($(ARCH), i586) | ||
233 | - LIBARCH = i386 | ||
234 | - else | ||
235 | - LIBARCH = $(ARCH) | ||
236 | - endif | ||
237 | + LIBARCH = $(ARCH) | ||
238 | |||
239 | # Value of Java os.arch property | ||
240 | ARCHPROP = $(LIBARCH) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-sane-x86-arch-name.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-sane-x86-arch-name.patch new file mode 100644 index 0000000..1d67dbf --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-sane-x86-arch-name.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | Index: icedtea6-1.7/acinclude.m4 | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.7.orig/acinclude.m4 2010-01-26 20:37:07.000000000 +0100 | ||
4 | +++ icedtea6-1.7/acinclude.m4 2010-02-02 09:28:43.681373126 +0100 | ||
5 | @@ -8,11 +8,11 @@ | ||
6 | CROSS_TARGET_ARCH=x86_64 | ||
7 | ;; | ||
8 | i?86-*-*) | ||
9 | - BUILD_ARCH_DIR=i586 | ||
10 | - INSTALL_ARCH_DIR=i386 | ||
11 | - JRE_ARCH_DIR=i386 | ||
12 | + BUILD_ARCH_DIR=x86 | ||
13 | + INSTALL_ARCH_DIR=x86 | ||
14 | + JRE_ARCH_DIR=x86 | ||
15 | ARCH_PREFIX=${LINUX32} | ||
16 | - CROSS_TARGET_ARCH=i386 | ||
17 | + CROSS_TARGET_ARCH=x86 | ||
18 | ;; | ||
19 | alpha*-*-*) | ||
20 | BUILD_ARCH_DIR=alpha | ||
21 | @@ -733,7 +733,7 @@ | ||
22 | ZERO_LIBARCH="${INSTALL_ARCH_DIR}" | ||
23 | dnl can't use AC_CHECK_SIZEOF on multilib | ||
24 | case "${ZERO_LIBARCH}" in | ||
25 | - i386|ppc|s390|sparc) | ||
26 | + x86|ppc|s390|sparc) | ||
27 | ZERO_BITSPERWORD=32 | ||
28 | ;; | ||
29 | amd64|ppc64|s390x|sparc64) | ||
30 | @@ -745,7 +745,7 @@ | ||
31 | esac | ||
32 | AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"]) | ||
33 | case "${ZERO_LIBARCH}" in | ||
34 | - i386) | ||
35 | + x86) | ||
36 | ZERO_ARCHDEF="IA32" | ||
37 | ;; | ||
38 | ppc*) | ||
39 | @@ -762,7 +762,7 @@ | ||
40 | esac | ||
41 | dnl multilib machines need telling which mode to build for | ||
42 | case "${ZERO_LIBARCH}" in | ||
43 | - i386|ppc|sparc) | ||
44 | + x86|ppc|sparc) | ||
45 | ZERO_ARCHFLAG="-m32" | ||
46 | ;; | ||
47 | s390) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-unbreak-float.patch b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-unbreak-float.patch new file mode 100644 index 0000000..9f875de --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.10/icedtea-unbreak-float.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100 | ||
4 | +++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100 | ||
5 | @@ -27,13 +27,11 @@ | ||
6 | |||
7 | #include "jfdlibm.h" | ||
8 | |||
9 | -#ifdef __NEWVALID /* special setup for Sun test regime */ | ||
10 | #if defined(i386) || defined(i486) || \ | ||
11 | defined(intel) || defined(x86) || \ | ||
12 | defined(i86pc) || defined(_M_IA64) || defined(ia64) | ||
13 | #define _LITTLE_ENDIAN | ||
14 | #endif | ||
15 | -#endif | ||
16 | |||
17 | #ifdef _LITTLE_ENDIAN | ||
18 | #define __HI(x) *(1+(int*)&x) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/build-hacks-native.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/build-hacks-native.patch new file mode 100644 index 0000000..9432d03 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/build-hacks-native.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Index: icedtea6-1.6.1/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.6.1.orig/Makefile.am 2009-12-24 11:38:06.582572265 +0100 | ||
4 | +++ icedtea6-1.6.1/Makefile.am 2009-12-24 11:57:27.159578486 +0100 | ||
5 | @@ -265,6 +265,10 @@ | ||
6 | FT2_LIB="$(FREETYPE2_LIBS)" \ | ||
7 | ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ | ||
8 | HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | JAVAC="" \ | ||
14 | RHINO_JAR="$(RHINO_JAR)" \ | ||
15 | JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/disable-library-checks.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/disable-library-checks.patch new file mode 100644 index 0000000..23b8bed --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/disable-library-checks.patch | |||
@@ -0,0 +1,141 @@ | |||
1 | Index: icedtea6-1.7/configure.ac | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.7.orig/configure.ac 2010-01-26 04:52:18.000000000 +0100 | ||
4 | +++ icedtea6-1.7/configure.ac 2010-02-08 12:05:51.354556052 +0100 | ||
5 | @@ -205,9 +205,9 @@ | ||
6 | fi | ||
7 | |||
8 | dnl pkgconfig cannot be used to find these headers and libraries. | ||
9 | -AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
10 | - ,[AC_MSG_ERROR("CUPS headers were not found - | ||
11 | - try installing cups-devel.")]) | ||
12 | +#AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
13 | +# ,[AC_MSG_ERROR("CUPS headers were not found - | ||
14 | +# try installing cups-devel.")]) | ||
15 | AC_CHECK_HEADERS([X11/X.h],[] | ||
16 | ,[AC_MSG_ERROR("xorg headers were not found - | ||
17 | try installing xorg-x11-proto-devel.")]) | ||
18 | @@ -239,12 +239,12 @@ | ||
19 | AC_SUBST(XT_LIBS) | ||
20 | |||
21 | dnl Check for libXp headers and libraries. | ||
22 | -PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
23 | -if test "x${XP_FOUND}" = xno | ||
24 | -then | ||
25 | - AC_MSG_ERROR([Could not find Xp - \ | ||
26 | - Try installing libXp-devel.]) | ||
27 | -fi | ||
28 | +#PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
29 | +#if test "x${XP_FOUND}" = xno | ||
30 | +#then | ||
31 | +# AC_MSG_ERROR([Could not find Xp - \ | ||
32 | +# Try installing libXp-devel.]) | ||
33 | +#fi | ||
34 | AC_SUBST(XP_CFLAGS) | ||
35 | AC_SUBST(XP_LIBS) | ||
36 | |||
37 | @@ -258,16 +258,16 @@ | ||
38 | AC_SUBST(X11_CFLAGS) | ||
39 | AC_SUBST(X11_LIBS) | ||
40 | |||
41 | -dnl Check for libXinerama headers and libraries. | ||
42 | -PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
43 | - ,[XINERAMA_FOUND=no]) | ||
44 | -if test "x${XINERAMA_FOUND}" = xno | ||
45 | -then | ||
46 | - AC_MSG_ERROR([Could not find Xinerama - \ | ||
47 | - Try installing libXinerama-devel.]) | ||
48 | -fi | ||
49 | -AC_SUBST(XINERAMA_CFLAGS) | ||
50 | -AC_SUBST(XINERAMA_LIBS) | ||
51 | +#dnl Check for libXinerama headers and libraries. | ||
52 | +#PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
53 | +# ,[XINERAMA_FOUND=no]) | ||
54 | +#if test "x${XINERAMA_FOUND}" = xno | ||
55 | +#then | ||
56 | +# AC_MSG_ERROR([Could not find Xinerama - \ | ||
57 | +# Try installing libXinerama-devel.]) | ||
58 | +#fi | ||
59 | +#AC_SUBST(XINERAMA_CFLAGS) | ||
60 | +#AC_SUBST(XINERAMA_LIBS) | ||
61 | |||
62 | if test "x${ENABLE_XRENDER}" = "xyes" | ||
63 | then | ||
64 | @@ -341,26 +341,26 @@ | ||
65 | AC_CONFIG_FILES([tapset/jstack.stp]) | ||
66 | fi | ||
67 | |||
68 | -dnl Check for libpng headers and libraries. | ||
69 | -PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
70 | - ,[LIBPNG_FOUND=no]) | ||
71 | -if test "x${LIBPNG_FOUND}" = xno | ||
72 | -then | ||
73 | - AC_MSG_ERROR([Could not find libpng - \ | ||
74 | - Try installing libpng-devel.]) | ||
75 | -fi | ||
76 | -AC_SUBST(LIBPNG_CFLAGS) | ||
77 | -AC_SUBST(LIBPNG_LIBS) | ||
78 | - | ||
79 | -dnl Check for libXtst headers and libraries. | ||
80 | -PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
81 | -if test "x${XTST_FOUND}" = xno | ||
82 | -then | ||
83 | - AC_MSG_ERROR([Could not find Xtst - \ | ||
84 | - Try installing libXtst-devel.]) | ||
85 | -fi | ||
86 | -AC_SUBST(XTST_CFLAGS) | ||
87 | -AC_SUBST(XTST_LIBS) | ||
88 | +#dnl Check for libpng headers and libraries. | ||
89 | +#PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
90 | +# ,[LIBPNG_FOUND=no]) | ||
91 | +#if test "x${LIBPNG_FOUND}" = xno | ||
92 | +#then | ||
93 | +# AC_MSG_ERROR([Could not find libpng - \ | ||
94 | +# Try installing libpng-devel.]) | ||
95 | +#fi | ||
96 | +#AC_SUBST(LIBPNG_CFLAGS) | ||
97 | +#AC_SUBST(LIBPNG_LIBS) | ||
98 | + | ||
99 | +#dnl Check for libXtst headers and libraries. | ||
100 | +#PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
101 | +#if test "x${XTST_FOUND}" = xno | ||
102 | +#then | ||
103 | +# AC_MSG_ERROR([Could not find Xtst - \ | ||
104 | +# Try installing libXtst-devel.]) | ||
105 | +#fi | ||
106 | +#AC_SUBST(XTST_CFLAGS) | ||
107 | +#AC_SUBST(XTST_LIBS) | ||
108 | |||
109 | dnl Check for freetype2 headers and libraries. | ||
110 | PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] | ||
111 | @@ -373,18 +373,18 @@ | ||
112 | AC_SUBST(FREETYPE2_CFLAGS) | ||
113 | AC_SUBST(FREETYPE2_LIBS) | ||
114 | |||
115 | -dnl Check for alsa headers and libraries (only required for Linux). | ||
116 | -if test "x${BUILD_OS_DIR}" = "xlinux" | ||
117 | -then | ||
118 | - PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
119 | - if test "x${ALSA_FOUND}" = xno | ||
120 | - then | ||
121 | - AC_MSG_ERROR([Could not find alsa - \ | ||
122 | - Try installing alsa-lib-devel.]) | ||
123 | - fi | ||
124 | -AC_SUBST(ALSA_CFLAGS) | ||
125 | -AC_SUBST(ALSA_LIBS) | ||
126 | -fi | ||
127 | +#dnl Check for alsa headers and libraries (only required for Linux). | ||
128 | +#if test "x${BUILD_OS_DIR}" = "xlinux" | ||
129 | +#then | ||
130 | +# PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
131 | +# if test "x${ALSA_FOUND}" = xno | ||
132 | +# then | ||
133 | +# AC_MSG_ERROR([Could not find alsa - \ | ||
134 | +# Try installing alsa-lib-devel.]) | ||
135 | +# fi | ||
136 | +#AC_SUBST(ALSA_CFLAGS) | ||
137 | +#AC_SUBST(ALSA_LIBS) | ||
138 | +#fi | ||
139 | |||
140 | if test "x${enable_pulse_java}" = "xyes" | ||
141 | then | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-ecj-disable-compilation.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-ecj-disable-compilation.patch new file mode 100644 index 0000000..cd0f68a --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-ecj-disable-compilation.patch | |||
@@ -0,0 +1,513 @@ | |||
1 | Index: openjdk/jdk/make/sun/awt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/sun/awt/Makefile 2009-04-24 09:33:55.000000000 +0200 | ||
4 | +++ openjdk/jdk/make/sun/awt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
5 | @@ -180,7 +180,8 @@ | ||
6 | include $(BUILDDIR)/common/Mapfile-vers.gmk | ||
7 | include $(BUILDDIR)/common/Library.gmk | ||
8 | |||
9 | -build: fontconfigs | ||
10 | +#build: fontconfigs | ||
11 | +build: | ||
12 | |||
13 | |||
14 | ifeq ($(PLATFORM), windows) | ||
15 | @@ -535,9 +536,9 @@ | ||
16 | -I$(PLATFORM_SRC)/native/$(PKGDIR) \ | ||
17 | $(EVENT_MODEL) | ||
18 | |||
19 | -ifeq ($(PLATFORM), linux) | ||
20 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
21 | -endif | ||
22 | +#ifeq ($(PLATFORM), linux) | ||
23 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
24 | +#endif | ||
25 | |||
26 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
27 | $(AWT_RUNPATH) | ||
28 | Index: openjdk/jdk/make/javax/sound/jsoundalsa/Makefile | ||
29 | =================================================================== | ||
30 | --- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:48:34.534565581 +0200 | ||
31 | +++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
32 | @@ -44,34 +44,35 @@ | ||
33 | # Files | ||
34 | # | ||
35 | |||
36 | -FILES_c = \ | ||
37 | - Utilities.c \ | ||
38 | - $(DAUDIOFILES_c) \ | ||
39 | - $(MIDIFILES_c) \ | ||
40 | - $(PORTFILES_c) | ||
41 | +#FILES_c = \ | ||
42 | +# Utilities.c \ | ||
43 | +# $(DAUDIOFILES_c) \ | ||
44 | +# $(MIDIFILES_c) \ | ||
45 | +# $(PORTFILES_c) | ||
46 | |||
47 | # platform dependent files | ||
48 | -FILES_c += \ | ||
49 | - PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
50 | - PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
51 | - PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
52 | - PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
53 | - PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
54 | - PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
55 | - PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
56 | - | ||
57 | -FILES_export = \ | ||
58 | - $(DAUDIOFILES_export) \ | ||
59 | - $(MIDIFILES_export) \ | ||
60 | - $(PORTFILES_export) | ||
61 | +#FILES_c += \ | ||
62 | +# PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
63 | +# PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
64 | +# PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
65 | +# PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
66 | +# PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
67 | +# PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
68 | +# PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
69 | + | ||
70 | +FILES_export = | ||
71 | +#FILES_export = \ | ||
72 | +# $(DAUDIOFILES_export) \ | ||
73 | +# $(MIDIFILES_export) \ | ||
74 | +# $(PORTFILES_export) | ||
75 | |||
76 | -OTHER_LDLIBS += -lasound | ||
77 | +#OTHER_LDLIBS += -lasound | ||
78 | |||
79 | CPPFLAGS += \ | ||
80 | - -DUSE_DAUDIO=TRUE \ | ||
81 | - -DUSE_PORTS=TRUE \ | ||
82 | - -DUSE_PLATFORM_MIDI_OUT=TRUE \ | ||
83 | - -DUSE_PLATFORM_MIDI_IN=TRUE \ | ||
84 | + -DUSE_DAUDIO=FALSE \ | ||
85 | + -DUSE_PORTS=FALSE \ | ||
86 | + -DUSE_PLATFORM_MIDI_OUT=FALSE \ | ||
87 | + -DUSE_PLATFORM_MIDI_IN=FALSE \ | ||
88 | -I$(SHARE_SRC)/native/com/sun/media/sound | ||
89 | |||
90 | # | ||
91 | Index: openjdk/jdk/make/sun/splashscreen/Makefile | ||
92 | =================================================================== | ||
93 | --- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:48:33.738565601 +0200 | ||
94 | +++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
95 | @@ -32,7 +32,8 @@ | ||
96 | # | ||
97 | # Files | ||
98 | # | ||
99 | -include FILES_c.gmk | ||
100 | +#include FILES_c.gmk | ||
101 | +FILES_c = | ||
102 | |||
103 | FILES_java = \ | ||
104 | java/awt/SplashScreen.java | ||
105 | @@ -62,9 +63,9 @@ | ||
106 | CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE | ||
107 | |||
108 | ifneq ($(PLATFORM), windows) | ||
109 | - CFLAGS += -DWITH_X11 | ||
110 | - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
111 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
112 | +# CFLAGS += -DWITH_X11 | ||
113 | +# CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
114 | +# OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
115 | else # PLATFORM | ||
116 | CFLAGS += -DWITH_WIN32 | ||
117 | OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib | ||
118 | @@ -79,7 +80,7 @@ | ||
119 | vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg | ||
120 | vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen | ||
121 | |||
122 | -CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
123 | +#CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
124 | |||
125 | ifeq ($(PLATFORM), linux) | ||
126 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
127 | Index: openjdk/jdk/make/sun/xawt/Makefile | ||
128 | =================================================================== | ||
129 | --- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-04-24 09:33:56.000000000 +0200 | ||
130 | +++ openjdk/jdk/make/sun/xawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
131 | @@ -41,15 +41,16 @@ | ||
132 | # | ||
133 | # Files | ||
134 | # | ||
135 | -include FILES_c_unix.gmk | ||
136 | -include FILES_export_unix.gmk | ||
137 | +#include FILES_c_unix.gmk | ||
138 | +FILES_c = | ||
139 | +#include FILES_export_unix.gmk | ||
140 | AUTO_FILES_JAVA_DIRS = sun/awt/X11 | ||
141 | AUTO_JAVA_PRUNE = WrapperGenerator.java | ||
142 | |||
143 | LDFLAGS += -L$(OPENWIN_LIB) | ||
144 | |||
145 | ifeq ($(PLATFORM), linux) | ||
146 | -LDFLAGS += -lpthread | ||
147 | +#LDFLAGS += -lpthread | ||
148 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
149 | endif | ||
150 | |||
151 | @@ -86,16 +87,19 @@ | ||
152 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl | ||
153 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 | ||
154 | |||
155 | -OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
156 | - $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
157 | +#OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
158 | +# $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
159 | |||
160 | ifeq ($(PLATFORM), solaris) | ||
161 | CPPFLAGS += -DFUNCPROTO=15 | ||
162 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
163 | endif | ||
164 | |||
165 | -CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
166 | +#CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
167 | |||
168 | +# Normally we would like to patch these includes away but | ||
169 | +# we need them for the successfull compilation of the sizer | ||
170 | +# executables. | ||
171 | CPPFLAGS += -DXAWT -DXAWT_HACK \ | ||
172 | -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ | ||
173 | -I$(PLATFORM_SRC)/native/sun/awt \ | ||
174 | @@ -124,10 +128,10 @@ | ||
175 | |||
176 | ifeq ($(PLATFORM), linux) | ||
177 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
178 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
179 | - -I/usr/include/X11/extensions \ | ||
180 | - -I$(MOTIF_DIR)/include \ | ||
181 | - -I$(OPENWIN_HOME)/include | ||
182 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
183 | +# -I/usr/include/X11/extensions \ | ||
184 | +# -I$(MOTIF_DIR)/include \ | ||
185 | +# -I$(OPENWIN_HOME)/include | ||
186 | endif | ||
187 | |||
188 | ifeq ($(PLATFORM), solaris) | ||
189 | @@ -238,18 +242,20 @@ | ||
190 | $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) | ||
191 | |||
192 | $(SIZES): $(SIZERS) | ||
193 | - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
194 | - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
195 | - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
196 | - $(CHMOD) +w $@;\ | ||
197 | - else \ | ||
198 | - $(ECHO) GENERATING $@; \ | ||
199 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
200 | - fi | ||
201 | - @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
202 | - $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
203 | - $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
204 | - fi | ||
205 | + touch $(SIZES) | ||
206 | +# | ||
207 | +# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
208 | +# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
209 | +# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
210 | +# $(CHMOD) +w $@;\ | ||
211 | +# else \ | ||
212 | +# $(ECHO) GENERATING $@; \ | ||
213 | +# $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
214 | +# fi | ||
215 | +# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
216 | +# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
217 | +# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
218 | +# fi | ||
219 | |||
220 | $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) | ||
221 | $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ | ||
222 | Index: openjdk/jdk/make/sun/jawt/Makefile | ||
223 | =================================================================== | ||
224 | --- openjdk.orig/jdk/make/sun/jawt/Makefile 2009-09-29 13:48:34.186565471 +0200 | ||
225 | +++ openjdk/jdk/make/sun/jawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
226 | @@ -36,7 +36,8 @@ | ||
227 | ifeq ($(PLATFORM), windows) | ||
228 | FILES_cpp = jawt.cpp | ||
229 | else # PLATFORM | ||
230 | -FILES_c = jawt.c | ||
231 | +FILES_c = | ||
232 | +#FILES_c = jawt.c | ||
233 | endif # PLATFORM | ||
234 | |||
235 | FILES_h = $(INCLUDEDIR)/jawt.h \ | ||
236 | Index: openjdk/jdk/make/sun/jpeg/Makefile | ||
237 | =================================================================== | ||
238 | --- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-09-29 13:48:33.726565626 +0200 | ||
239 | +++ openjdk/jdk/make/sun/jpeg/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
240 | @@ -37,7 +37,8 @@ | ||
241 | # | ||
242 | # Files | ||
243 | # | ||
244 | -include FILES_c.gmk | ||
245 | +FILES_c = | ||
246 | +#include FILES_c.gmk | ||
247 | |||
248 | AUTO_FILES_JAVA_DIRS = sun/awt/image com/sun/imageio/plugins/jpeg | ||
249 | |||
250 | Index: openjdk/jdk/make/common/shared/Defs-java.gmk | ||
251 | =================================================================== | ||
252 | --- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:48:55.954565215 +0200 | ||
253 | +++ openjdk/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:57:14.446815782 +0200 | ||
254 | @@ -36,14 +36,14 @@ | ||
255 | # Memory related -J flags that all uses of java tools should use. | ||
256 | # | ||
257 | JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m | ||
258 | -ifneq (,$(filter $(ARCH), ia64 s390)) | ||
259 | +#ifneq (,$(filter $(ARCH), ia64 s390)) | ||
260 | # Special flags for javac on ia64 to work around a VM problem with | ||
261 | # bad code generation during inlining (what version had this problem?): | ||
262 | # Suspect this may not be needed anymore. | ||
263 | - JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
264 | -else | ||
265 | - JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
266 | -endif | ||
267 | +# JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
268 | +#else | ||
269 | +# JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
270 | +#endif | ||
271 | |||
272 | # | ||
273 | # All java tools (javac, javah, and javadoc) run faster with certain java | ||
274 | Index: openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java | ||
275 | =================================================================== | ||
276 | --- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-04-24 09:34:04.000000000 +0200 | ||
277 | +++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-09-29 13:57:14.450815511 +0200 | ||
278 | @@ -113,7 +113,7 @@ | ||
279 | * @since 1.4 | ||
280 | */ | ||
281 | public static boolean isHeadless() { | ||
282 | - return getHeadlessProperty(); | ||
283 | + return true; | ||
284 | } | ||
285 | |||
286 | /** | ||
287 | Index: openjdk/corba/make/common/Defs.gmk | ||
288 | =================================================================== | ||
289 | --- openjdk.orig/corba/make/common/Defs.gmk 2009-04-24 09:30:19.000000000 +0200 | ||
290 | +++ openjdk/corba/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
291 | @@ -444,11 +444,11 @@ | ||
292 | # Tool flags | ||
293 | # | ||
294 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
295 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
296 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
297 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
298 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
299 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
300 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
301 | $(DEFINES) $(OPTIONS:%=-D%) | ||
302 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
303 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
304 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
305 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
306 | $(OTHER_LINTFLAGS) | ||
307 | Index: openjdk/jdk/make/common/Defs.gmk | ||
308 | =================================================================== | ||
309 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:48:33.590565061 +0200 | ||
310 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
311 | @@ -662,11 +662,11 @@ | ||
312 | # Tool flags | ||
313 | # | ||
314 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
315 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
316 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
317 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
318 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
319 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
320 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
321 | $(DEFINES) $(OPTIONS:%=-D%) | ||
322 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
323 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
324 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
325 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
326 | $(OTHER_LINTFLAGS) | ||
327 | Index: openjdk/hotspot/make/linux/makefiles/vm.make | ||
328 | =================================================================== | ||
329 | --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:48:34.098565716 +0200 | ||
330 | +++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:57:14.450815511 +0200 | ||
331 | @@ -170,6 +170,7 @@ | ||
332 | LIBS_VM += $(LLVM_LIBS) | ||
333 | endif | ||
334 | |||
335 | +LFLAGS_VM = $(OE_LDFLAGS) | ||
336 | LINK_VM = $(LINK_LIB.c) | ||
337 | |||
338 | # rule for building precompiled header | ||
339 | Index: openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c | ||
340 | =================================================================== | ||
341 | --- openjdk.orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-04-24 09:34:34.000000000 +0200 | ||
342 | +++ openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-09-29 13:57:14.450815511 +0200 | ||
343 | @@ -26,8 +26,10 @@ | ||
344 | #include <jni.h> | ||
345 | #include <jni_util.h> | ||
346 | #include <dlfcn.h> | ||
347 | +#if 0 | ||
348 | #include <cups/cups.h> | ||
349 | #include <cups/ppd.h> | ||
350 | +#endif | ||
351 | |||
352 | //#define CUPS_DEBUG | ||
353 | |||
354 | @@ -37,6 +39,7 @@ | ||
355 | #define DPRINTF(x, y) | ||
356 | #endif | ||
357 | |||
358 | +#if 0 | ||
359 | typedef const char* (*fn_cupsServer)(void); | ||
360 | typedef int (*fn_ippPort)(void); | ||
361 | typedef http_t* (*fn_httpConnect)(const char *, int); | ||
362 | @@ -56,7 +59,7 @@ | ||
363 | fn_ppdClose j2d_ppdClose; | ||
364 | fn_ppdFindOption j2d_ppdFindOption; | ||
365 | fn_ppdPageSize j2d_ppdPageSize; | ||
366 | - | ||
367 | +#endif | ||
368 | |||
369 | /* | ||
370 | * Initialize library functions. | ||
371 | @@ -65,6 +68,7 @@ | ||
372 | JNIEXPORT jboolean JNICALL | ||
373 | Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env, | ||
374 | jobject printObj) { | ||
375 | +#if 0 | ||
376 | void *handle = dlopen("libcups.so.2", RTLD_LAZY | RTLD_GLOBAL); | ||
377 | |||
378 | if (handle == NULL) { | ||
379 | @@ -131,6 +135,8 @@ | ||
380 | } | ||
381 | |||
382 | return JNI_TRUE; | ||
383 | +#endif | ||
384 | + return JNI_FALSE; | ||
385 | } | ||
386 | |||
387 | /* | ||
388 | @@ -141,6 +147,7 @@ | ||
389 | Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env, | ||
390 | jobject printObj) | ||
391 | { | ||
392 | +#if 0 | ||
393 | jstring cServer = NULL; | ||
394 | const char* server = j2d_cupsServer(); | ||
395 | if (server != NULL) { | ||
396 | @@ -152,6 +159,8 @@ | ||
397 | } | ||
398 | } | ||
399 | return cServer; | ||
400 | +#endif | ||
401 | + return NULL; | ||
402 | } | ||
403 | |||
404 | /* | ||
405 | @@ -162,8 +171,11 @@ | ||
406 | Java_sun_print_CUPSPrinter_getCupsPort(JNIEnv *env, | ||
407 | jobject printObj) | ||
408 | { | ||
409 | +#if 0 | ||
410 | int port = j2d_ippPort(); | ||
411 | return (jint) port; | ||
412 | +#endif | ||
413 | + return 0; | ||
414 | } | ||
415 | |||
416 | |||
417 | @@ -177,6 +189,7 @@ | ||
418 | jstring server, | ||
419 | jint port) | ||
420 | { | ||
421 | +#if 0 | ||
422 | const char *serverName; | ||
423 | serverName = (*env)->GetStringUTFChars(env, server, NULL); | ||
424 | if (serverName != NULL) { | ||
425 | @@ -187,6 +200,7 @@ | ||
426 | return JNI_TRUE; | ||
427 | } | ||
428 | } | ||
429 | +#endif | ||
430 | return JNI_FALSE; | ||
431 | } | ||
432 | |||
433 | @@ -199,6 +213,7 @@ | ||
434 | jobject printObj, | ||
435 | jstring printer) | ||
436 | { | ||
437 | +#if 0 | ||
438 | ppd_file_t *ppd; | ||
439 | ppd_option_t *optionTray, *optionPage; | ||
440 | ppd_choice_t *choice; | ||
441 | @@ -304,6 +319,8 @@ | ||
442 | j2d_ppdClose(ppd); | ||
443 | unlink(filename); | ||
444 | return nameArray; | ||
445 | +#endif | ||
446 | + return NULL; | ||
447 | } | ||
448 | |||
449 | |||
450 | @@ -315,6 +332,7 @@ | ||
451 | jobject printObj, | ||
452 | jstring printer) | ||
453 | { | ||
454 | +#if 0 | ||
455 | ppd_file_t *ppd; | ||
456 | ppd_option_t *option; | ||
457 | ppd_choice_t *choice; | ||
458 | @@ -374,4 +392,6 @@ | ||
459 | j2d_ppdClose(ppd); | ||
460 | unlink(filename); | ||
461 | return sizeArray; | ||
462 | +#endif | ||
463 | + return NULL; | ||
464 | } | ||
465 | Index: openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java | ||
466 | =================================================================== | ||
467 | --- openjdk.orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-04-24 09:34:17.000000000 +0200 | ||
468 | +++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
469 | @@ -244,6 +244,8 @@ | ||
470 | * that might be specified. | ||
471 | */ | ||
472 | fontConfig = createFontConfiguration(); | ||
473 | + if (fontConfig == null) | ||
474 | + return null; | ||
475 | getPlatformFontPathFromFontConfig(); | ||
476 | |||
477 | String extraFontPath = fontConfig.getExtraFontPath(); | ||
478 | Index: openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | ||
479 | =================================================================== | ||
480 | --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-04-24 09:34:33.000000000 +0200 | ||
481 | +++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
482 | @@ -899,7 +899,8 @@ | ||
483 | |||
484 | // Implements SunGraphicsEnvironment.createFontConfiguration. | ||
485 | protected FontConfiguration createFontConfiguration() { | ||
486 | - return new MFontConfiguration(this); | ||
487 | +// return new MFontConfiguration(this); | ||
488 | + return null; | ||
489 | } | ||
490 | public FontConfiguration | ||
491 | createFontConfiguration(boolean preferLocaleFonts, | ||
492 | Index: openjdk/jdk/make/launchers/Makefile | ||
493 | =================================================================== | ||
494 | --- openjdk.orig/jdk/make/launchers/Makefile 2009-09-29 13:48:33.490815135 +0200 | ||
495 | +++ openjdk/jdk/make/launchers/Makefile 2009-09-29 13:57:14.454815276 +0200 | ||
496 | @@ -57,7 +57,7 @@ | ||
497 | endif | ||
498 | # Run MAKE $@ for all generic launchers | ||
499 | define make-all-launchers | ||
500 | -$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
501 | +#$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
502 | $(call make-launcher, apt, com.sun.tools.apt.Main, , ) | ||
503 | $(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , ) | ||
504 | $(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , ) | ||
505 | @@ -93,7 +93,7 @@ | ||
506 | -J-Dcom.sun.CORBA.activation.Port=1049 \ | ||
507 | -J-Dcom.sun.CORBA.POA.ORBServerId=1, ) | ||
508 | $(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack) | ||
509 | -$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
510 | +#$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
511 | $(call make-launcher, rmic, sun.rmi.rmic.Main, , ) | ||
512 | $(call make-launcher, rmid, sun.rmi.server.Activation, , ) | ||
513 | $(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , ) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-ecj-fix-freetype.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-ecj-fix-freetype.patch new file mode 100644 index 0000000..3420fbd --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-ecj-fix-freetype.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: openjdk/jdk/make/tools/freetypecheck/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/tools/freetypecheck/Makefile 2009-09-29 13:48:33.590565061 +0200 | ||
4 | +++ openjdk/jdk/make/tools/freetypecheck/Makefile 2009-09-29 14:00:04.470566156 +0200 | ||
5 | @@ -45,7 +45,7 @@ | ||
6 | FT_OPTIONS = $(CFLAGS) | ||
7 | endif | ||
8 | |||
9 | -FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 | ||
10 | +FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 $(FREETYPE2_CFLAGS) $(FREETYPE2_LIBS) $(FREETYPE2_HEADERS) | ||
11 | FT_OPTIONS += $(XARCH) | ||
12 | |||
13 | #add runtime library search path | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-ecj-fix-zlib.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-ecj-fix-zlib.patch new file mode 100644 index 0000000..eff7e48 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-ecj-fix-zlib.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | Index: openjdk/jdk/make/com/sun/java/pack/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-09-29 13:48:34.538565136 +0200 | ||
4 | +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-09-29 14:00:26.226565853 +0200 | ||
5 | @@ -80,7 +80,7 @@ | ||
6 | OTHER_LDLIBS += $(JVMLIB) | ||
7 | endif | ||
8 | |||
9 | -OTHER_LDLIBS += -lz | ||
10 | +OTHER_LDLIBS += -L$(libdir) -lz | ||
11 | CXXFLAGS_DBG += -DFULL | ||
12 | CXXFLAGS_OPT += -DPRODUCT | ||
13 | CXXFLAGS_COMMON += -DFULL | ||
14 | Index: openjdk/jdk/make/common/Defs.gmk | ||
15 | =================================================================== | ||
16 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
17 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
18 | @@ -289,7 +289,7 @@ | ||
19 | |||
20 | endif # PROGRAM | ||
21 | |||
22 | -LDLIBS_COMMON += $(EXTRA_LIBS) | ||
23 | +LDLIBS_COMMON += $(EXTRA_LIBS) -L$(libdir) | ||
24 | |||
25 | # | ||
26 | # Default is to build, not import native binaries | ||
27 | @@ -425,7 +425,7 @@ | ||
28 | CLASSDESTDIR = $(CLASSBINDIR) | ||
29 | endif | ||
30 | |||
31 | -INCLUDES = -I. -I$(CLASSHDRDIR) \ | ||
32 | +INCLUDES = -I$(includedir) -I. -I$(CLASSHDRDIR) \ | ||
33 | $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES) | ||
34 | OTHER_CPPFLAGS = $(INCLUDES) | ||
35 | |||
36 | Index: openjdk/jdk/make/common/Program.gmk | ||
37 | =================================================================== | ||
38 | --- openjdk.orig/jdk/make/common/Program.gmk 2009-09-29 13:48:33.914565255 +0200 | ||
39 | +++ openjdk/jdk/make/common/Program.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
40 | @@ -73,7 +73,7 @@ | ||
41 | # itself, as with all the Windows libraries. | ||
42 | # | ||
43 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
44 | - LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli | ||
45 | + LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli -L $(libdir) | ||
46 | OTHER_LDLIBS += -ljli | ||
47 | ifeq ($(PLATFORM), solaris) | ||
48 | ifeq ($(ARCH_DATA_MODEL), 32) | ||
49 | Index: openjdk/jdk/make/java/jli/Makefile | ||
50 | =================================================================== | ||
51 | --- openjdk.orig/jdk/make/java/jli/Makefile 2009-09-29 13:48:33.806565054 +0200 | ||
52 | +++ openjdk/jdk/make/java/jli/Makefile 2009-09-29 14:00:26.230565844 +0200 | ||
53 | @@ -61,7 +61,7 @@ | ||
54 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
55 | LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli | ||
56 | # Guarantee very limited dependencies | ||
57 | - LDLIBS = -lz -lc | ||
58 | + LDLIBS = -L$(libdir) -lz -lc | ||
59 | endif | ||
60 | |||
61 | ifeq ($(PLATFORM), windows) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-fix-jar-path.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-fix-jar-path.patch new file mode 100644 index 0000000..beeb402 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-fix-jar-path.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | # Backported from | ||
2 | # HG changeset patch | ||
3 | # User Xerxes R?nby <xerxes@zafena.se> | ||
4 | # Date 1275385110 -7200 | ||
5 | # Node ID 7674917fa451a17a38b8cd6930068e8dc3b57b76 | ||
6 | # Parent cf45c29fbe48d2a0c543cbd6d03f4329010011c0 | ||
7 | Use full path to jar application to avoid relying on the one on the path. | ||
8 | |||
9 | 2010-06-01 Xerxes R?nby <xerxes@zafena.se> | ||
10 | |||
11 | * Makefile.am: | ||
12 | (extra-lib/about.jar): Remove redundant | ||
13 | conditional that we don't need any more. | ||
14 | (rewrite-rhino.stamp): Use full path to | ||
15 | jar application to avoid relying on the one | ||
16 | on the path. | ||
17 | |||
18 | diff -uNr icedtea6-1.7.3.orig/Makefile.am icedtea6-1.7.3/Makefile.am | ||
19 | --- icedtea6-1.7.3.orig/Makefile.am 2010-03-31 23:34:07.000000000 +0200 | ||
20 | +++ icedtea6-1.7.3/Makefile.am 2010-07-14 16:52:45.000000000 +0200 | ||
21 | @@ -1636,12 +1636,7 @@ | ||
22 | rm -f extra-source-files.txt | ||
23 | |||
24 | extra-lib/about.jar: stamps/extra-class-files.stamp | ||
25 | - if ! test -d $(ICEDTEA_BOOT_DIR) ; \ | ||
26 | - then \ | ||
27 | - $(JAR) cf $@ -C extra-lib net ; \ | ||
28 | - else \ | ||
29 | - $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \ | ||
30 | - fi | ||
31 | + $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; | ||
32 | |||
33 | # PulseAudio based mixer | ||
34 | # (pulse-java) | ||
35 | @@ -1749,7 +1744,7 @@ | ||
36 | stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR) | ||
37 | if WITH_RHINO | ||
38 | mkdir -p rhino/rhino.{old,new} | ||
39 | - (cd rhino/rhino.old ; jar xf $(RHINO_JAR)) | ||
40 | + (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) | ||
41 | $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \ | ||
42 | com.redhat.rewriter.ClassRewriter \ | ||
43 | $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \ | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-hotspot-make-arch-sane-for-x86.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-hotspot-make-arch-sane-for-x86.patch new file mode 100644 index 0000000..9d7b9bb --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-hotspot-make-arch-sane-for-x86.patch | |||
@@ -0,0 +1,1130 @@ | |||
1 | From b8a51665ada45e3beb0823c03c025d5514f5e745 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Thu, 22 Oct 2009 16:35:25 +0200 | ||
4 | Subject: [PATCH] hotspot: make arch sane for x86 | ||
5 | |||
6 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
7 | index 38e0f78..64c8410 100644 | ||
8 | --- openjdk/hotspot/agent/make/saenv.sh | ||
9 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
10 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
11 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
12 | CPU=amd64 | ||
13 | else | ||
14 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
15 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
16 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
17 | - CPU=i386 | ||
18 | + CPU=x86 | ||
19 | fi | ||
20 | else | ||
21 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
22 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
23 | index 83ddd1a..c20c7eb 100644 | ||
24 | --- openjdk/hotspot/make/defs.make | ||
25 | +++ openjdk/hotspot/make/defs.make | ||
26 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
27 | ifdef LP64 | ||
28 | BUILDARCH = amd64 | ||
29 | else | ||
30 | - BUILDARCH = i486 | ||
31 | + BUILDARCH = x86 | ||
32 | endif | ||
33 | endif | ||
34 | ifeq ($(BUILDARCH), sparc) | ||
35 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
36 | |||
37 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
38 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
39 | - LIBARCH/i486 = i386 | ||
40 | + LIBARCH/x86 = x86 | ||
41 | LIBARCH/amd64 = amd64 | ||
42 | LIBARCH/sparc = sparc | ||
43 | LIBARCH/sparcv9 = sparcv9 | ||
44 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
45 | index bc82543..4a1ef4e 100644 | ||
46 | --- openjdk/hotspot/make/jprt.config | ||
47 | +++ openjdk/hotspot/make/jprt.config | ||
48 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
49 | # LINUX: X86, AMD64 | ||
50 | osarch=`uname -m` | ||
51 | if [ "${osarch}" = i686 ] ; then | ||
52 | - linux_arch=i586 | ||
53 | + linux_arch=x86 | ||
54 | elif [ "${osarch}" = x86_64 ] ; then | ||
55 | linux_arch=amd64 | ||
56 | fi | ||
57 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
58 | index eb2ce82..7193de0 100644 | ||
59 | --- openjdk/hotspot/make/jprt.properties | ||
60 | +++ openjdk/hotspot/make/jprt.properties | ||
61 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
62 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
63 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
64 | |||
65 | -jprt.my.linux.i586=linux_i586 | ||
66 | +jprt.my.linux.x86=linux_x86 | ||
67 | jprt.my.linux.x64=linux_x64 | ||
68 | jprt.my.windows.i586=windows_i586 | ||
69 | jprt.my.windows.x64=windows_x64 | ||
70 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
71 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
72 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
73 | |||
74 | -jprt.my.linux.i586.test.targets = \ | ||
75 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
76 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
77 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
78 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
79 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
80 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
81 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
82 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
83 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
84 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
85 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
86 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
87 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
88 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
89 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
90 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
91 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
92 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
93 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
94 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
95 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
96 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
97 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
98 | +jprt.my.linux.x86.test.targets = \ | ||
99 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
100 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
101 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
102 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
103 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
104 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
105 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
106 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
107 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
108 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
109 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
110 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
111 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
112 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
113 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
114 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
115 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
116 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
117 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
118 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
119 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
120 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
121 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
122 | |||
123 | jprt.my.linux.x64.test.targets = \ | ||
124 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
125 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
126 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
127 | ${jprt.my.solaris.i586.test.targets}, \ | ||
128 | ${jprt.my.solaris.x64.test.targets}, \ | ||
129 | - ${jprt.my.linux.i586.test.targets}, \ | ||
130 | + ${jprt.my.linux.x86.test.targets}, \ | ||
131 | ${jprt.my.linux.x64.test.targets}, \ | ||
132 | ${jprt.my.windows.i586.test.targets}, \ | ||
133 | ${jprt.my.windows.x64.test.targets} | ||
134 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
135 | index e317fdd..5d3b1ff 100644 | ||
136 | --- openjdk/hotspot/make/linux/build.sh | ||
137 | +++ openjdk/hotspot/make/linux/build.sh | ||
138 | @@ -43,7 +43,7 @@ esac | ||
139 | |||
140 | case `uname -m` in | ||
141 | i386|i486|i586|i686) | ||
142 | - mach=i386 | ||
143 | + mach=x86 | ||
144 | ;; | ||
145 | *) | ||
146 | echo "Unsupported machine: " `uname -m` | ||
147 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
148 | index add9823..cbbf81f 100644 | ||
149 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
150 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
151 | @@ -30,7 +30,7 @@ | ||
152 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
153 | # environment or on the command-line: | ||
154 | # | ||
155 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
156 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
157 | # BUILDARCH - build directory | ||
158 | # LIBARCH - the corresponding directory in JDK/JRE | ||
159 | # GAMMADIR - top of workspace | ||
160 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
161 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
162 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
163 | |||
164 | -DATA_MODE/i486 = 32 | ||
165 | +DATA_MODE/x86 = 32 | ||
166 | DATA_MODE/sparc = 32 | ||
167 | DATA_MODE/sparcv9 = 64 | ||
168 | DATA_MODE/amd64 = 64 | ||
169 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
170 | index 113d4f8..d3f06cb 100644 | ||
171 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
172 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
173 | @@ -78,7 +78,7 @@ endif | ||
174 | # Processor-specific files for other processors are excluded by default. Use | ||
175 | # CS_CPU=x to include platform-specific files for other platforms. | ||
176 | ifndef CS_CPU | ||
177 | -CS_CPU = i486 sparc amd64 ia64 | ||
178 | +CS_CPU = x86 sparc amd64 ia64 | ||
179 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
180 | endif | ||
181 | |||
182 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
183 | index 9131c79..138dfb3 100644 | ||
184 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
185 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
186 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
187 | HS_ARCH = sparc | ||
188 | endif | ||
189 | |||
190 | +# x86 | ||
191 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
192 | + ARCH_DATA_MODEL = 32 | ||
193 | + PLATFORM = linux-x86 | ||
194 | + VM_PLATFORM = linux_x86 | ||
195 | + HS_ARCH = x86 | ||
196 | +endif | ||
197 | + | ||
198 | # x86_64 | ||
199 | ifeq ($(ARCH), x86_64) | ||
200 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
201 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
202 | HS_ARCH = x86 | ||
203 | else | ||
204 | ARCH_DATA_MODEL = 32 | ||
205 | - PLATFORM = linux-i586 | ||
206 | - VM_PLATFORM = linux_i486 | ||
207 | + PLATFORM = linux-x86 | ||
208 | + VM_PLATFORM = linux_x86 | ||
209 | HS_ARCH = x86 | ||
210 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
211 | - ARCH = i686 | ||
212 | endif | ||
213 | endif | ||
214 | |||
215 | -# i686 | ||
216 | -ifeq ($(ARCH), i686) | ||
217 | - ARCH_DATA_MODEL = 32 | ||
218 | - PLATFORM = linux-i586 | ||
219 | - VM_PLATFORM = linux_i486 | ||
220 | - HS_ARCH = x86 | ||
221 | -endif | ||
222 | - | ||
223 | JDK_INCLUDE_SUBDIR=linux | ||
224 | |||
225 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
226 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
227 | index 0a9f75b..2e29bb9 100644 | ||
228 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
229 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
230 | @@ -30,7 +30,7 @@ CC = cc | ||
231 | AS = $(CC) -c | ||
232 | |||
233 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
234 | -ARCHFLAG/i486 = -m32 | ||
235 | +ARCHFLAG/x86 = -m32 | ||
236 | ARCHFLAG/amd64 = -m64 | ||
237 | |||
238 | CFLAGS += $(ARCHFLAG) | ||
239 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
240 | deleted file mode 100644 | ||
241 | index 610ac91..0000000 | ||
242 | --- openjdk/hotspot/make/linux/platform_i486 | ||
243 | +++ /dev/null | ||
244 | @@ -1,15 +0,0 @@ | ||
245 | -os_family = linux | ||
246 | - | ||
247 | -arch = x86 | ||
248 | - | ||
249 | -arch_model = x86_32 | ||
250 | - | ||
251 | -os_arch = linux_x86 | ||
252 | - | ||
253 | -os_arch_model = linux_x86_32 | ||
254 | - | ||
255 | -lib_arch = i386 | ||
256 | - | ||
257 | -compiler = gcc | ||
258 | - | ||
259 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
260 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
261 | index 325a3fe..717fc75 100644 | ||
262 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
263 | +++ openjdk/hotspot/make/linux/platform_i486.suncc | ||
264 | @@ -8,10 +8,10 @@ os_arch = linux_x86 | ||
265 | |||
266 | os_arch_model = linux_x86_32 | ||
267 | |||
268 | -lib_arch = i386 | ||
269 | +lib_arch = x86 | ||
270 | |||
271 | compiler = sparcWorks | ||
272 | |||
273 | -gnu_dis_arch = i386 | ||
274 | +gnu_dis_arch = x86 | ||
275 | |||
276 | sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
277 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
278 | new file mode 100644 | ||
279 | index 0000000..5c613fe | ||
280 | --- /dev/null | ||
281 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
282 | @@ -0,0 +1,15 @@ | ||
283 | +os_family = linux | ||
284 | + | ||
285 | +arch = x86 | ||
286 | + | ||
287 | +arch_model = x86_32 | ||
288 | + | ||
289 | +os_arch = linux_x86 | ||
290 | + | ||
291 | +os_arch_model = linux_x86_32 | ||
292 | + | ||
293 | +lib_arch = x86 | ||
294 | + | ||
295 | +compiler = gcc | ||
296 | + | ||
297 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
298 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
299 | index b2b3162..a4bbe70 100644 | ||
300 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
301 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
302 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
303 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
304 | #ifdef __ia64__ | ||
305 | #define SYS_gettid 1105 | ||
306 | -#elif __i386__ | ||
307 | +#elif __x86__ | ||
308 | #define SYS_gettid 224 | ||
309 | #elif __amd64__ | ||
310 | #define SYS_gettid 186 | ||
311 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
312 | #elif defined(IA64) | ||
313 | static char cpu_arch[] = "ia64"; | ||
314 | #elif defined(IA32) | ||
315 | -static char cpu_arch[] = "i386"; | ||
316 | +static char cpu_arch[] = "x86"; | ||
317 | #elif defined(AMD64) | ||
318 | static char cpu_arch[] = "amd64"; | ||
319 | #elif defined(SPARC) | ||
320 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
321 | index 6bdf4b8..fd43c6e 100644 | ||
322 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
323 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
324 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
325 | endif | ||
326 | |||
327 | # Default arch; it is changed below as needed. | ||
328 | -ARCH = i386 | ||
329 | +ARCH = x86 | ||
330 | OS = $(shell uname) | ||
331 | |||
332 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
333 | @@ -87,7 +87,7 @@ endif # SunOS | ||
334 | LIBARCH = $(ARCH) | ||
335 | ifdef LP64 | ||
336 | LIBARCH64/sparc = sparcv9 | ||
337 | -LIBARCH64/i386 = amd64 | ||
338 | +LIBARCH64/x86 = amd64 | ||
339 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
340 | ifneq ($(LIBARCH64),) | ||
341 | LIBARCH = $(LIBARCH64) | ||
342 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
343 | index 75b7efe..62c692b 100644 | ||
344 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
345 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
346 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
347 | else | ||
348 | disassembler_usage(stderr); /* better than nothing */ | ||
349 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
350 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
351 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
352 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
353 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
354 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
355 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
356 | #endif | ||
357 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
358 | static const char* native_arch_name() { | ||
359 | const char* res = HOTSPOT_LIB_ARCH; | ||
360 | #ifdef LIBARCH_amd64 | ||
361 | - res = "i386:x86-64"; | ||
362 | + res = "x86:x86-64"; | ||
363 | #endif | ||
364 | #ifdef LIBARCH_sparc | ||
365 | res = "sparc:v8plusb"; | ||
366 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
367 | index 2596d85..c2f3eb9 100644 | ||
368 | --- openjdk/hotspot/test/Makefile | ||
369 | +++ openjdk/hotspot/test/Makefile | ||
370 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
371 | PLATFORM = solaris | ||
372 | ARCH = $(shell uname -p) | ||
373 | ifeq ($(ARCH), i386) | ||
374 | - ARCH=i586 | ||
375 | + ARCH=x86 | ||
376 | endif | ||
377 | endif | ||
378 | ifeq ($(OSNAME), Linux) | ||
379 | PLATFORM = linux | ||
380 | ARCH = $(shell uname -m) | ||
381 | - ifeq ($(ARCH), i386) | ||
382 | - ARCH = i586 | ||
383 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
384 | + ARCH = x86 | ||
385 | endif | ||
386 | endif | ||
387 | ifeq ($(OSNAME), Windows_NT) | ||
388 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
389 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
390 | ARCH = x64 | ||
391 | else | ||
392 | - ARCH = i586 | ||
393 | + ARCH = x86 | ||
394 | endif | ||
395 | endif | ||
396 | endif | ||
397 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
398 | index 38e0f78..64c8410 100644 | ||
399 | --- openjdk/hotspot/agent/make/saenv.sh | ||
400 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
401 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
402 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
403 | CPU=amd64 | ||
404 | else | ||
405 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
406 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
407 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
408 | - CPU=i386 | ||
409 | + CPU=x86 | ||
410 | fi | ||
411 | else | ||
412 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
413 | diff --git openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
414 | index c4ca7de..54c12ca 100644 | ||
415 | --- openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
416 | +++ openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
417 | @@ -29,7 +29,7 @@ | ||
418 | #define amd64 1 | ||
419 | #endif | ||
420 | |||
421 | -#ifdef i386 | ||
422 | +#ifdef x86 | ||
423 | #include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h" | ||
424 | #endif | ||
425 | |||
426 | @@ -295,7 +295,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
427 | } | ||
428 | |||
429 | #undef NPRGREG | ||
430 | -#ifdef i386 | ||
431 | +#ifdef x86 | ||
432 | #define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG | ||
433 | #endif | ||
434 | #ifdef ia64 | ||
435 | @@ -314,7 +314,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
436 | |||
437 | #undef REG_INDEX | ||
438 | |||
439 | -#ifdef i386 | ||
440 | +#ifdef x86 | ||
441 | #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg | ||
442 | |||
443 | regs[REG_INDEX(GS)] = (uintptr_t) gregs.xgs; | ||
444 | @@ -333,7 +333,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
445 | regs[REG_INDEX(CS)] = (uintptr_t) gregs.xcs; | ||
446 | regs[REG_INDEX(SS)] = (uintptr_t) gregs.xss; | ||
447 | |||
448 | -#endif /* i386 */ | ||
449 | +#endif /* x86 */ | ||
450 | |||
451 | #if ia64 | ||
452 | regs = (*env)->GetLongArrayElements(env, array, &isCopy); | ||
453 | diff --git openjdk/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile | ||
454 | index a16f3a7..85fecb1 100644 | ||
455 | --- openjdk/hotspot/agent/src/os/linux/Makefile | ||
456 | +++ openjdk/hotspot/agent/src/os/linux/Makefile | ||
457 | @@ -22,7 +22,7 @@ | ||
458 | # | ||
459 | # | ||
460 | |||
461 | -ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) | ||
462 | +ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo x86 ; fi ) | ||
463 | GCC = gcc$(GCC_SUFFIX) | ||
464 | |||
465 | JAVAH = ${JAVA_HOME}/bin/javah | ||
466 | diff --git openjdk/hotspot/agent/src/os/linux/ps_core.c openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
467 | index 3562f2d..47ab01b 100644 | ||
468 | --- openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
469 | +++ openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
470 | @@ -540,7 +540,7 @@ static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size | ||
471 | |||
472 | if (is_debug()) { | ||
473 | print_debug("integer regset\n"); | ||
474 | -#ifdef i386 | ||
475 | +#ifdef x86 | ||
476 | // print the regset | ||
477 | print_debug("\teax = 0x%x\n", newthr->regs.eax); | ||
478 | print_debug("\tebx = 0x%x\n", newthr->regs.ebx); | ||
479 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
480 | index 83ddd1a..c20c7eb 100644 | ||
481 | --- openjdk/hotspot/make/defs.make | ||
482 | +++ openjdk/hotspot/make/defs.make | ||
483 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
484 | ifdef LP64 | ||
485 | BUILDARCH = amd64 | ||
486 | else | ||
487 | - BUILDARCH = i486 | ||
488 | + BUILDARCH = x86 | ||
489 | endif | ||
490 | endif | ||
491 | ifeq ($(BUILDARCH), sparc) | ||
492 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
493 | |||
494 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
495 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
496 | - LIBARCH/i486 = i386 | ||
497 | + LIBARCH/x86 = x86 | ||
498 | LIBARCH/amd64 = amd64 | ||
499 | LIBARCH/sparc = sparc | ||
500 | LIBARCH/sparcv9 = sparcv9 | ||
501 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
502 | index bc82543..4a1ef4e 100644 | ||
503 | --- openjdk/hotspot/make/jprt.config | ||
504 | +++ openjdk/hotspot/make/jprt.config | ||
505 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
506 | # LINUX: X86, AMD64 | ||
507 | osarch=`uname -m` | ||
508 | if [ "${osarch}" = i686 ] ; then | ||
509 | - linux_arch=i586 | ||
510 | + linux_arch=x86 | ||
511 | elif [ "${osarch}" = x86_64 ] ; then | ||
512 | linux_arch=amd64 | ||
513 | fi | ||
514 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
515 | index eb2ce82..7193de0 100644 | ||
516 | --- openjdk/hotspot/make/jprt.properties | ||
517 | +++ openjdk/hotspot/make/jprt.properties | ||
518 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
519 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
520 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
521 | |||
522 | -jprt.my.linux.i586=linux_i586 | ||
523 | +jprt.my.linux.x86=linux_x86 | ||
524 | jprt.my.linux.x64=linux_x64 | ||
525 | jprt.my.windows.i586=windows_i586 | ||
526 | jprt.my.windows.x64=windows_x64 | ||
527 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
528 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
529 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
530 | |||
531 | -jprt.my.linux.i586.test.targets = \ | ||
532 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
533 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
534 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
535 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
536 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
537 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
538 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
539 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
540 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
541 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
542 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
543 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
544 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
545 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
546 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
547 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
548 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
549 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
550 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
551 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
552 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
553 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
554 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
555 | +jprt.my.linux.x86.test.targets = \ | ||
556 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
557 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
558 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
559 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
560 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
561 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
562 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
563 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
564 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
565 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
566 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
567 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
568 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
569 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
570 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
571 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
572 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
573 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
574 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
575 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
576 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
577 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
578 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
579 | |||
580 | jprt.my.linux.x64.test.targets = \ | ||
581 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
582 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
583 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
584 | ${jprt.my.solaris.i586.test.targets}, \ | ||
585 | ${jprt.my.solaris.x64.test.targets}, \ | ||
586 | - ${jprt.my.linux.i586.test.targets}, \ | ||
587 | + ${jprt.my.linux.x86.test.targets}, \ | ||
588 | ${jprt.my.linux.x64.test.targets}, \ | ||
589 | ${jprt.my.windows.i586.test.targets}, \ | ||
590 | ${jprt.my.windows.x64.test.targets} | ||
591 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
592 | index e317fdd..5d3b1ff 100644 | ||
593 | --- openjdk/hotspot/make/linux/build.sh | ||
594 | +++ openjdk/hotspot/make/linux/build.sh | ||
595 | @@ -43,7 +43,7 @@ esac | ||
596 | |||
597 | case `uname -m` in | ||
598 | i386|i486|i586|i686) | ||
599 | - mach=i386 | ||
600 | + mach=x86 | ||
601 | ;; | ||
602 | *) | ||
603 | echo "Unsupported machine: " `uname -m` | ||
604 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
605 | index add9823..cbbf81f 100644 | ||
606 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
607 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
608 | @@ -30,7 +30,7 @@ | ||
609 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
610 | # environment or on the command-line: | ||
611 | # | ||
612 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
613 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
614 | # BUILDARCH - build directory | ||
615 | # LIBARCH - the corresponding directory in JDK/JRE | ||
616 | # GAMMADIR - top of workspace | ||
617 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
618 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
619 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
620 | |||
621 | -DATA_MODE/i486 = 32 | ||
622 | +DATA_MODE/x86 = 32 | ||
623 | DATA_MODE/sparc = 32 | ||
624 | DATA_MODE/sparcv9 = 64 | ||
625 | DATA_MODE/amd64 = 64 | ||
626 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
627 | index 113d4f8..d3f06cb 100644 | ||
628 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
629 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
630 | @@ -78,7 +78,7 @@ endif | ||
631 | # Processor-specific files for other processors are excluded by default. Use | ||
632 | # CS_CPU=x to include platform-specific files for other platforms. | ||
633 | ifndef CS_CPU | ||
634 | -CS_CPU = i486 sparc amd64 ia64 | ||
635 | +CS_CPU = x86 sparc amd64 ia64 | ||
636 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
637 | endif | ||
638 | |||
639 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
640 | index 9131c79..138dfb3 100644 | ||
641 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
642 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
643 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
644 | HS_ARCH = sparc | ||
645 | endif | ||
646 | |||
647 | +# x86 | ||
648 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
649 | + ARCH_DATA_MODEL = 32 | ||
650 | + PLATFORM = linux-x86 | ||
651 | + VM_PLATFORM = linux_x86 | ||
652 | + HS_ARCH = x86 | ||
653 | +endif | ||
654 | + | ||
655 | # x86_64 | ||
656 | ifeq ($(ARCH), x86_64) | ||
657 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
658 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
659 | HS_ARCH = x86 | ||
660 | else | ||
661 | ARCH_DATA_MODEL = 32 | ||
662 | - PLATFORM = linux-i586 | ||
663 | - VM_PLATFORM = linux_i486 | ||
664 | + PLATFORM = linux-x86 | ||
665 | + VM_PLATFORM = linux_x86 | ||
666 | HS_ARCH = x86 | ||
667 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
668 | - ARCH = i686 | ||
669 | endif | ||
670 | endif | ||
671 | |||
672 | -# i686 | ||
673 | -ifeq ($(ARCH), i686) | ||
674 | - ARCH_DATA_MODEL = 32 | ||
675 | - PLATFORM = linux-i586 | ||
676 | - VM_PLATFORM = linux_i486 | ||
677 | - HS_ARCH = x86 | ||
678 | -endif | ||
679 | - | ||
680 | JDK_INCLUDE_SUBDIR=linux | ||
681 | |||
682 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
683 | diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make | ||
684 | index a2c24bc..27bad01 100644 | ||
685 | --- openjdk/hotspot/make/linux/makefiles/gcc.make | ||
686 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make | ||
687 | @@ -77,7 +77,7 @@ CFLAGS += -fcheck-new | ||
688 | CFLAGS += -g | ||
689 | |||
690 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
691 | -ARCHFLAG/i486 = -m32 -march=i586 | ||
692 | +ARCHFLAG/x86 = -m32 | ||
693 | ARCHFLAG/amd64 = -m64 | ||
694 | ARCHFLAG/ia64 = | ||
695 | ARCHFLAG/sparc = -m32 -mcpu=v9 | ||
696 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
697 | index 0a9f75b..2e29bb9 100644 | ||
698 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
699 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
700 | @@ -30,7 +30,7 @@ CC = cc | ||
701 | AS = $(CC) -c | ||
702 | |||
703 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
704 | -ARCHFLAG/i486 = -m32 | ||
705 | +ARCHFLAG/x86 = -m32 | ||
706 | ARCHFLAG/amd64 = -m64 | ||
707 | |||
708 | CFLAGS += $(ARCHFLAG) | ||
709 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
710 | deleted file mode 100644 | ||
711 | index 610ac91..0000000 | ||
712 | --- openjdk/hotspot/make/linux/platform_i486 | ||
713 | +++ /dev/null | ||
714 | @@ -1,15 +0,0 @@ | ||
715 | -os_family = linux | ||
716 | - | ||
717 | -arch = x86 | ||
718 | - | ||
719 | -arch_model = x86_32 | ||
720 | - | ||
721 | -os_arch = linux_x86 | ||
722 | - | ||
723 | -os_arch_model = linux_x86_32 | ||
724 | - | ||
725 | -lib_arch = i386 | ||
726 | - | ||
727 | -compiler = gcc | ||
728 | - | ||
729 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
730 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
731 | deleted file mode 100644 | ||
732 | index 325a3fe..0000000 | ||
733 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
734 | +++ /dev/null | ||
735 | @@ -1,17 +0,0 @@ | ||
736 | -os_family = linux | ||
737 | - | ||
738 | -arch = x86 | ||
739 | - | ||
740 | -arch_model = x86_32 | ||
741 | - | ||
742 | -os_arch = linux_x86 | ||
743 | - | ||
744 | -os_arch_model = linux_x86_32 | ||
745 | - | ||
746 | -lib_arch = i386 | ||
747 | - | ||
748 | -compiler = sparcWorks | ||
749 | - | ||
750 | -gnu_dis_arch = i386 | ||
751 | - | ||
752 | -sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
753 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
754 | new file mode 100644 | ||
755 | index 0000000..5c613fe | ||
756 | --- /dev/null | ||
757 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
758 | @@ -0,0 +1,15 @@ | ||
759 | +os_family = linux | ||
760 | + | ||
761 | +arch = x86 | ||
762 | + | ||
763 | +arch_model = x86_32 | ||
764 | + | ||
765 | +os_arch = linux_x86 | ||
766 | + | ||
767 | +os_arch_model = linux_x86_32 | ||
768 | + | ||
769 | +lib_arch = x86 | ||
770 | + | ||
771 | +compiler = gcc | ||
772 | + | ||
773 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
774 | diff --git openjdk/hotspot/make/linux/platform_x86.suncc openjdk/hotspot/make/linux/platform_x86.suncc | ||
775 | new file mode 100644 | ||
776 | index 0000000..717fc75 | ||
777 | --- /dev/null | ||
778 | +++ openjdk/hotspot/make/linux/platform_x86.suncc | ||
779 | @@ -0,0 +1,17 @@ | ||
780 | +os_family = linux | ||
781 | + | ||
782 | +arch = x86 | ||
783 | + | ||
784 | +arch_model = x86_32 | ||
785 | + | ||
786 | +os_arch = linux_x86 | ||
787 | + | ||
788 | +os_arch_model = linux_x86_32 | ||
789 | + | ||
790 | +lib_arch = x86 | ||
791 | + | ||
792 | +compiler = sparcWorks | ||
793 | + | ||
794 | +gnu_dis_arch = x86 | ||
795 | + | ||
796 | +sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
797 | diff --git openjdk/hotspot/src/os/linux/launcher/java_md.c openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
798 | index 50a86cd..48141be 100644 | ||
799 | --- openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
800 | +++ openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
801 | @@ -56,8 +56,8 @@ | ||
802 | * models is supported, then DUAL_MODE is defined. When DUAL_MODE is | ||
803 | * defined, the architecture names for the narrow and wide version of | ||
804 | * the architecture are defined in BIG_ARCH and SMALL_ARCH. Currently | ||
805 | - * only Solaris on sparc/sparcv9 and i586/amd64 is DUAL_MODE; linux | ||
806 | - * i586/amd64 could be defined as DUAL_MODE but that is not the | ||
807 | + * only Solaris on sparc/sparcv9 and x86/amd64 is DUAL_MODE; linux | ||
808 | + * x86/amd64 could be defined as DUAL_MODE but that is not the | ||
809 | * current policy. | ||
810 | */ | ||
811 | |||
812 | @@ -75,8 +75,8 @@ | ||
813 | |||
814 | #else /* 32-bit data model */ | ||
815 | |||
816 | -# ifdef i586 | ||
817 | -# define ARCH "i386" | ||
818 | +# ifdef x86 | ||
819 | +# define ARCH "x86" | ||
820 | # elif defined(__sparc) | ||
821 | # define ARCH "sparc" | ||
822 | # endif | ||
823 | @@ -90,7 +90,7 @@ | ||
824 | # define SMALL_ARCH "sparc" | ||
825 | # else | ||
826 | # define BIG_ARCH "amd64" | ||
827 | -# define SMALL_ARCH "i386" | ||
828 | +# define SMALL_ARCH "x86" | ||
829 | # endif | ||
830 | # include <sys/systeminfo.h> | ||
831 | # include <sys/elf.h> | ||
832 | @@ -1103,7 +1103,7 @@ void PrintMachineDependentOptions() { | ||
833 | * This code is somewhat more confused with #ifdef's than we'd | ||
834 | * like because this file is used by both Solaris and Linux | ||
835 | * platforms, and so needs to be parameterized for SPARC and | ||
836 | - * i586 hardware. The other Linux platforms (amd64 and ia64) | ||
837 | + * x86 hardware. The other Linux platforms (amd64 and ia64) | ||
838 | * don't even ask this question, because they only come with | ||
839 | * server JVMs. */ | ||
840 | |||
841 | @@ -1168,11 +1168,11 @@ solaris_sparc_ServerClassMachine(void) { | ||
842 | |||
843 | #endif /* __sun && __sparc */ | ||
844 | |||
845 | -#if defined(__sun) && defined(i586) | ||
846 | +#if defined(__sun) && defined(x86) | ||
847 | |||
848 | /* | ||
849 | * A utility method for asking the CPU about itself. | ||
850 | - * There's a corresponding version of linux-i586 | ||
851 | + * There's a corresponding version of linux-x86 | ||
852 | * because the compilers are different. | ||
853 | */ | ||
854 | void | ||
855 | @@ -1218,13 +1218,13 @@ get_cpuid(uint32_t arg, | ||
856 | #endif | ||
857 | } | ||
858 | |||
859 | -#endif /* __sun && i586 */ | ||
860 | +#endif /* __sun && x86 */ | ||
861 | |||
862 | -#if defined(__linux__) && defined(i586) | ||
863 | +#if defined(__linux__) && defined(x86) | ||
864 | |||
865 | /* | ||
866 | * A utility method for asking the CPU about itself. | ||
867 | - * There's a corresponding version of solaris-i586 | ||
868 | + * There's a corresponding version of solaris-x86 | ||
869 | * because the compilers are different. | ||
870 | */ | ||
871 | void | ||
872 | @@ -1286,11 +1286,11 @@ get_cpuid(uint32_t arg, | ||
873 | #endif | ||
874 | } | ||
875 | |||
876 | -#endif /* __linux__ && i586 */ | ||
877 | +#endif /* __linux__ && x86 */ | ||
878 | |||
879 | -#ifdef i586 | ||
880 | +#ifdef x86 | ||
881 | /* | ||
882 | - * Routines shared by solaris-i586 and linux-i586. | ||
883 | + * Routines shared by solaris-x86 and linux-x86. | ||
884 | */ | ||
885 | |||
886 | enum HyperThreadingSupport_enum { | ||
887 | @@ -1430,11 +1430,11 @@ physical_processors(void) { | ||
888 | return result; | ||
889 | } | ||
890 | |||
891 | -#endif /* i586 */ | ||
892 | +#endif /* x86 */ | ||
893 | |||
894 | -#if defined(__sun) && defined(i586) | ||
895 | +#if defined(__sun) && defined(x86) | ||
896 | |||
897 | -/* The definition of a server-class machine for solaris-i586/amd64 */ | ||
898 | +/* The definition of a server-class machine for solaris-x86/amd64 */ | ||
899 | jboolean | ||
900 | solaris_i586_ServerClassMachine(void) { | ||
901 | jboolean result = JNI_FALSE; | ||
902 | @@ -1463,11 +1463,11 @@ solaris_i586_ServerClassMachine(void) { | ||
903 | return result; | ||
904 | } | ||
905 | |||
906 | -#endif /* __sun && i586 */ | ||
907 | +#endif /* __sun && x86 */ | ||
908 | |||
909 | -#if defined(__linux__) && defined(i586) | ||
910 | +#if defined(__linux__) && defined(x86) | ||
911 | |||
912 | -/* The definition of a server-class machine for linux-i586 */ | ||
913 | +/* The definition of a server-class machine for linux-x86 */ | ||
914 | jboolean | ||
915 | linux_i586_ServerClassMachine(void) { | ||
916 | jboolean result = JNI_FALSE; | ||
917 | @@ -1496,7 +1496,7 @@ linux_i586_ServerClassMachine(void) { | ||
918 | return result; | ||
919 | } | ||
920 | |||
921 | -#endif /* __linux__ && i586 */ | ||
922 | +#endif /* __linux__ && x86 */ | ||
923 | |||
924 | /* Dispatch to the platform-specific definition of "server-class" */ | ||
925 | jboolean | ||
926 | @@ -1504,9 +1504,9 @@ ServerClassMachine(void) { | ||
927 | jboolean result = JNI_FALSE; | ||
928 | #if defined(__sun) && defined(__sparc) | ||
929 | result = solaris_sparc_ServerClassMachine(); | ||
930 | -#elif defined(__sun) && defined(i586) | ||
931 | +#elif defined(__sun) && defined(x86) | ||
932 | result = solaris_i586_ServerClassMachine(); | ||
933 | -#elif defined(__linux__) && defined(i586) | ||
934 | +#elif defined(__linux__) && defined(x86) | ||
935 | result = linux_i586_ServerClassMachine(); | ||
936 | #else | ||
937 | if (_launcher_debug) { | ||
938 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
939 | index b2b3162..a4bbe70 100644 | ||
940 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
941 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
942 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
943 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
944 | #ifdef __ia64__ | ||
945 | #define SYS_gettid 1105 | ||
946 | -#elif __i386__ | ||
947 | +#elif __x86__ | ||
948 | #define SYS_gettid 224 | ||
949 | #elif __amd64__ | ||
950 | #define SYS_gettid 186 | ||
951 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
952 | #elif defined(IA64) | ||
953 | static char cpu_arch[] = "ia64"; | ||
954 | #elif defined(IA32) | ||
955 | -static char cpu_arch[] = "i386"; | ||
956 | +static char cpu_arch[] = "x86"; | ||
957 | #elif defined(AMD64) | ||
958 | static char cpu_arch[] = "amd64"; | ||
959 | #elif defined(SPARC) | ||
960 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
961 | index 6bdf4b8..fd43c6e 100644 | ||
962 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
963 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
964 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
965 | endif | ||
966 | |||
967 | # Default arch; it is changed below as needed. | ||
968 | -ARCH = i386 | ||
969 | +ARCH = x86 | ||
970 | OS = $(shell uname) | ||
971 | |||
972 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
973 | @@ -87,7 +87,7 @@ endif # SunOS | ||
974 | LIBARCH = $(ARCH) | ||
975 | ifdef LP64 | ||
976 | LIBARCH64/sparc = sparcv9 | ||
977 | -LIBARCH64/i386 = amd64 | ||
978 | +LIBARCH64/x86 = amd64 | ||
979 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
980 | ifneq ($(LIBARCH64),) | ||
981 | LIBARCH = $(LIBARCH64) | ||
982 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
983 | index 75b7efe..62c692b 100644 | ||
984 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
985 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
986 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
987 | else | ||
988 | disassembler_usage(stderr); /* better than nothing */ | ||
989 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
990 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
991 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
992 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
993 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
994 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
995 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
996 | #endif | ||
997 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
998 | static const char* native_arch_name() { | ||
999 | const char* res = HOTSPOT_LIB_ARCH; | ||
1000 | #ifdef LIBARCH_amd64 | ||
1001 | - res = "i386:x86-64"; | ||
1002 | + res = "x86:x86-64"; | ||
1003 | #endif | ||
1004 | #ifdef LIBARCH_sparc | ||
1005 | res = "sparc:v8plusb"; | ||
1006 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/i486.ad openjdk/hotspot/src/share/vm/adlc/Test/i486.ad | ||
1007 | deleted file mode 100644 | ||
1008 | index e69de29..0000000 | ||
1009 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/x86.ad openjdk/hotspot/src/share/vm/adlc/Test/x86.ad | ||
1010 | new file mode 100644 | ||
1011 | index 0000000..e69de29 | ||
1012 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
1013 | index 2596d85..c2f3eb9 100644 | ||
1014 | --- openjdk/hotspot/test/Makefile | ||
1015 | +++ openjdk/hotspot/test/Makefile | ||
1016 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
1017 | PLATFORM = solaris | ||
1018 | ARCH = $(shell uname -p) | ||
1019 | ifeq ($(ARCH), i386) | ||
1020 | - ARCH=i586 | ||
1021 | + ARCH=x86 | ||
1022 | endif | ||
1023 | endif | ||
1024 | ifeq ($(OSNAME), Linux) | ||
1025 | PLATFORM = linux | ||
1026 | ARCH = $(shell uname -m) | ||
1027 | - ifeq ($(ARCH), i386) | ||
1028 | - ARCH = i586 | ||
1029 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
1030 | + ARCH = x86 | ||
1031 | endif | ||
1032 | endif | ||
1033 | ifeq ($(OSNAME), Windows_NT) | ||
1034 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
1035 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
1036 | ARCH = x64 | ||
1037 | else | ||
1038 | - ARCH = i586 | ||
1039 | + ARCH = x86 | ||
1040 | endif | ||
1041 | endif | ||
1042 | endif | ||
1043 | -- | ||
1044 | 1.6.5 | ||
1045 | |||
1046 | diff --git openjdk/hotspot/make/linux/makefiles/i486.make b/hotspot/make/linux/makefiles/i486.make | ||
1047 | deleted file mode 100644 | ||
1048 | index 9dd0b44..0000000 | ||
1049 | --- openjdk/hotspot/make/linux/makefiles/i486.make | ||
1050 | +++ /dev/null | ||
1051 | @@ -1,36 +0,0 @@ | ||
1052 | -# | ||
1053 | -# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1054 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1055 | -# | ||
1056 | -# This code is free software; you can redistribute it and/or modify it | ||
1057 | -# under the terms of the GNU General Public License version 2 only, as | ||
1058 | -# published by the Free Software Foundation. | ||
1059 | -# | ||
1060 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1061 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1062 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1063 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
1064 | -# accompanied this code). | ||
1065 | -# | ||
1066 | -# You should have received a copy of the GNU General Public License version | ||
1067 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
1068 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1069 | -# | ||
1070 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1071 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1072 | -# have any questions. | ||
1073 | -# | ||
1074 | -# | ||
1075 | - | ||
1076 | -# TLS helper, assembled from .s file | ||
1077 | -# Not included in includeDB because it has no dependencies | ||
1078 | -Obj_Files += linux_x86_32.o | ||
1079 | - | ||
1080 | -# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1081 | -OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1082 | -# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1083 | -OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1084 | -# Must also specify if CPU is little endian | ||
1085 | -CFLAGS += -DVM_LITTLE_ENDIAN | ||
1086 | - | ||
1087 | -OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1088 | diff --git openjdk/hotspot/make/linux/makefiles/x86.make openjdk/hotspot/make/linux/makefiles/x86.make | ||
1089 | new file mode 100644 | ||
1090 | index 0000000..9dd0b44 | ||
1091 | --- /dev/null | ||
1092 | +++ openjdk/hotspot/make/linux/makefiles/x86.make | ||
1093 | @@ -0,0 +1,36 @@ | ||
1094 | +# | ||
1095 | +# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1096 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1097 | +# | ||
1098 | +# This code is free software; you can redistribute it and/or modify it | ||
1099 | +# under the terms of the GNU General Public License version 2 only, as | ||
1100 | +# published by the Free Software Foundation. | ||
1101 | +# | ||
1102 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1103 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1104 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1105 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
1106 | +# accompanied this code). | ||
1107 | +# | ||
1108 | +# You should have received a copy of the GNU General Public License version | ||
1109 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
1110 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1111 | +# | ||
1112 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1113 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1114 | +# have any questions. | ||
1115 | +# | ||
1116 | +# | ||
1117 | + | ||
1118 | +# TLS helper, assembled from .s file | ||
1119 | +# Not included in includeDB because it has no dependencies | ||
1120 | +Obj_Files += linux_x86_32.o | ||
1121 | + | ||
1122 | +# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1123 | +OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1124 | +# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1125 | +OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1126 | +# Must also specify if CPU is little endian | ||
1127 | +CFLAGS += -DVM_LITTLE_ENDIAN | ||
1128 | + | ||
1129 | +OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1130 | |||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-javac-in.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-javac-in.patch new file mode 100644 index 0000000..846982c --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-javac-in.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 90688bde5acdb9193f5c381ce332012ff67c0e02 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Fri, 23 Oct 2009 16:10:49 +0200 | ||
4 | Subject: [PATCH 3/3] javac.in: remove fake-jdk rt | ||
5 | |||
6 | --- | ||
7 | javac.in | 4 ++-- | ||
8 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git icedtea6-1.6.1/javac.in icedtea6-1.6.1/javac.in | ||
11 | index a897b39..235d9b5 100644 | ||
12 | --- icedtea6-1.6.1/javac.in | ||
13 | +++ icedtea6-1.6.1/javac.in | ||
14 | @@ -33,9 +33,9 @@ fi | ||
15 | if [ -e @abs_top_builddir@/native-ecj ] ; then | ||
16 | @abs_top_builddir@/native-ecj -1.5 -nowarn $bcoption $NEW_ARGS ; | ||
17 | elif [ ! -z "@ECJ@" ] ; then | ||
18 | - @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS | ||
19 | + @ECJ@ -1.5 -nowarn $NEW_ARGS | ||
20 | else | ||
21 | CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \ | ||
22 | - @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS | ||
23 | + @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $NEW_ARGS | ||
24 | fi | ||
25 | |||
26 | -- | ||
27 | 1.6.5 | ||
28 | |||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-jdk-build-sizer-32-on-amd64.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-jdk-build-sizer-32-on-amd64.patch new file mode 100644 index 0000000..3baeb5d --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-jdk-build-sizer-32-on-amd64.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Build the xawt sizer.32 binary on Linux/x86_64 so we can use it when | ||
2 | compiling openjdk for 32-bit platforms. | ||
3 | |||
4 | --- openjdk/jdk/make/sun/xawt/Makefile.orig 2011-01-08 01:53:22.000000000 -0500 | ||
5 | +++ openjdk/jdk/make/sun/xawt/Makefile 2011-01-11 15:12:17.000000000 -0500 | ||
6 | @@ -184,6 +184,22 @@ | ||
7 | |||
8 | else # !solaris | ||
9 | |||
10 | +ifeq ($(PLATFORM), linux) | ||
11 | + | ||
12 | +ifeq ($(ARCH), amd64) | ||
13 | +# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL. | ||
14 | +SIZERS = $(SIZER).32 $(SIZER).64 | ||
15 | +SIZERS_C = $(SIZER_32_C) $(SIZER_64_C) | ||
16 | +SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64 | ||
17 | +CFLAGS_32 = $(CFLAGS) -m32 | ||
18 | +else # !amd64 | ||
19 | +SIZERS = $(SIZER).32 | ||
20 | +SIZERS_C = $(SIZER_32_C) | ||
21 | +SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 | ||
22 | +endif # amd64 | ||
23 | + | ||
24 | +else # !linux | ||
25 | + | ||
26 | ifeq ($(ARCH_DATA_MODEL), 32) | ||
27 | SIZERS = $(SIZER).32 | ||
28 | SIZERS_C = $(SIZER_32_C) | ||
29 | @@ -194,6 +210,7 @@ | ||
30 | SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64 | ||
31 | endif # 32 | ||
32 | |||
33 | +endif # linux | ||
34 | endif # solaris | ||
35 | |||
36 | # XXX Hack for 6185483 - use hard-coded sizes. | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-jdk-sane-x86-arch.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-jdk-sane-x86-arch.patch new file mode 100644 index 0000000..5c989f9 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-jdk-sane-x86-arch.patch | |||
@@ -0,0 +1,240 @@ | |||
1 | From 662e11a8b6017f39ceb6d00dcdbfe11473b56174 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Fri, 23 Oct 2009 18:06:43 +0200 | ||
4 | Subject: [PATCH] sane-arch2 | ||
5 | |||
6 | --- | ||
7 | openjdk/jdk/make/common/shared/Compiler-gcc.gmk | 4 ++-- | ||
8 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git openjdk/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
11 | index 8329530..de85a11 100644 | ||
12 | --- openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
13 | +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
14 | @@ -90,8 +90,8 @@ ifeq ($(PLATFORM), linux) | ||
15 | REQUIRED_CC_VER = 3.2 | ||
16 | REQUIRED_GCC_VER = 3.2.* | ||
17 | endif | ||
18 | - ifeq ($(ARCH), i586) | ||
19 | - # i586 | ||
20 | + ifeq ($(ARCH), x86) | ||
21 | + # x86 | ||
22 | REQUIRED_CC_VER = 3.2 | ||
23 | REQUIRED_GCC_VER = 3.2.1* | ||
24 | REQUIRED_GCC_VER_INT = 3.2.1-7a | ||
25 | -- | ||
26 | 1.6.5 | ||
27 | |||
28 | From e2e87228dd36bd737b52ed3daeaed526b5e4d3ea Mon Sep 17 00:00:00 2001 | ||
29 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
30 | Date: Fri, 23 Oct 2009 18:16:54 +0200 | ||
31 | Subject: [PATCH] sane-arch3 | ||
32 | |||
33 | --- | ||
34 | jdk/src/solaris/bin/i586/jvm.cfg | 38 -------------------------------------- | ||
35 | jdk/src/solaris/bin/x86/jvm.cfg | 38 ++++++++++++++++++++++++++++++++++++++ | ||
36 | 2 files changed, 38 insertions(+), 38 deletions(-) | ||
37 | delete mode 100644 jdk/src/solaris/bin/i586/jvm.cfg | ||
38 | create mode 100644 jdk/src/solaris/bin/x86/jvm.cfg | ||
39 | |||
40 | diff --git openjdk/jdk/src/solaris/bin/i586/jvm.cfg openjdk/jdk/src/solaris/bin/i586/jvm.cfg | ||
41 | deleted file mode 100644 | ||
42 | index b97e5ae..0000000 | ||
43 | --- openjdk/jdk/src/solaris/bin/i586/jvm.cfg | ||
44 | +++ /dev/null | ||
45 | @@ -1,38 +0,0 @@ | ||
46 | -# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
47 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
48 | -# | ||
49 | -# This code is free software; you can redistribute it and/or modify it | ||
50 | -# under the terms of the GNU General Public License version 2 only, as | ||
51 | -# published by the Free Software Foundation. Sun designates this | ||
52 | -# particular file as subject to the "Classpath" exception as provided | ||
53 | -# by Sun in the LICENSE file that accompanied this code. | ||
54 | -# | ||
55 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
56 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
57 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
58 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
59 | -# accompanied this code). | ||
60 | -# | ||
61 | -# You should have received a copy of the GNU General Public License version | ||
62 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
63 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
64 | -# | ||
65 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
66 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
67 | -# have any questions. | ||
68 | -# | ||
69 | -# List of JVMs that can be used as an option to java, javac, etc. | ||
70 | -# Order is important -- first in this list is the default JVM. | ||
71 | -# NOTE that this both this file and its format are UNSUPPORTED and | ||
72 | -# WILL GO AWAY in a future release. | ||
73 | -# | ||
74 | -# You may also select a JVM in an arbitrary location with the | ||
75 | -# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
76 | -# and may not be available in a future release. | ||
77 | -# | ||
78 | --client IF_SERVER_CLASS -server | ||
79 | --server KNOWN | ||
80 | --hotspot ALIASED_TO -client | ||
81 | --classic WARN | ||
82 | --native ERROR | ||
83 | --green ERROR | ||
84 | diff --git openjdk/jdk/src/solaris/bin/x86/jvm.cfg openjdk/jdk/src/solaris/bin/x86/jvm.cfg | ||
85 | new file mode 100644 | ||
86 | index 0000000..b97e5ae | ||
87 | --- /dev/null | ||
88 | +++ openjdk/jdk/src/solaris/bin/x86/jvm.cfg | ||
89 | @@ -0,0 +1,38 @@ | ||
90 | +# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
91 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
92 | +# | ||
93 | +# This code is free software; you can redistribute it and/or modify it | ||
94 | +# under the terms of the GNU General Public License version 2 only, as | ||
95 | +# published by the Free Software Foundation. Sun designates this | ||
96 | +# particular file as subject to the "Classpath" exception as provided | ||
97 | +# by Sun in the LICENSE file that accompanied this code. | ||
98 | +# | ||
99 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
100 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
101 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
102 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
103 | +# accompanied this code). | ||
104 | +# | ||
105 | +# You should have received a copy of the GNU General Public License version | ||
106 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
107 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
108 | +# | ||
109 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
110 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
111 | +# have any questions. | ||
112 | +# | ||
113 | +# List of JVMs that can be used as an option to java, javac, etc. | ||
114 | +# Order is important -- first in this list is the default JVM. | ||
115 | +# NOTE that this both this file and its format are UNSUPPORTED and | ||
116 | +# WILL GO AWAY in a future release. | ||
117 | +# | ||
118 | +# You may also select a JVM in an arbitrary location with the | ||
119 | +# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
120 | +# and may not be available in a future release. | ||
121 | +# | ||
122 | +-client IF_SERVER_CLASS -server | ||
123 | +-server KNOWN | ||
124 | +-hotspot ALIASED_TO -client | ||
125 | +-classic WARN | ||
126 | +-native ERROR | ||
127 | +-green ERROR | ||
128 | -- | ||
129 | 1.6.5 | ||
130 | |||
131 | From d5274fb90454c0e40b665d865f456430949791c4 Mon Sep 17 00:00:00 2001 | ||
132 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
133 | Date: Fri, 23 Oct 2009 18:42:11 +0200 | ||
134 | Subject: [PATCH 2/4] sane-arch4 | ||
135 | |||
136 | --- | ||
137 | .../share/native/com/sun/mediopenjdk/sound/SoundDefs.h | 2 +- | ||
138 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
139 | |||
140 | diff --git openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
141 | index 94624e0..6522503 100644 | ||
142 | --- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
143 | +++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
144 | @@ -36,7 +36,7 @@ | ||
145 | #define X_ALPHA 1 | ||
146 | #define X_AMD64 2 | ||
147 | #define X_ARM 3 | ||
148 | -#define X_I586 4 | ||
149 | +#define X_X86 4 | ||
150 | #define X_IA64 5 | ||
151 | #define X_M68K 6 | ||
152 | #define X_MIPS 7 | ||
153 | -- | ||
154 | 1.6.5 | ||
155 | |||
156 | From 251338c93253d1026a37df2793956d7985f9f4eb Mon Sep 17 00:00:00 2001 | ||
157 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
158 | Date: Fri, 23 Oct 2009 18:44:13 +0200 | ||
159 | Subject: [PATCH 4/4] sane-arch4 | ||
160 | |||
161 | --- | ||
162 | jdk/make/javax/sound/SoundDefs.gmk | 6 +++--- | ||
163 | 1 files changed, 3 insertions(+), 3 deletions(-) | ||
164 | |||
165 | diff --git openjdk/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk | ||
166 | index 22ad8e0..a54ecd5 100644 | ||
167 | --- openjdk/jdk/make/javax/sound/SoundDefs.gmk | ||
168 | +++ openjdk/jdk/make/javax/sound/SoundDefs.gmk | ||
169 | @@ -70,9 +70,9 @@ else | ||
170 | CPPFLAGS += -DX_ARCH=X_ARM | ||
171 | endif # ARCH arm | ||
172 | |||
173 | - ifeq ($(ARCH), i586) | ||
174 | - CPPFLAGS += -DX_ARCH=X_I586 | ||
175 | - endif # ARCH i586 | ||
176 | + ifeq ($(ARCH), x86) | ||
177 | + CPPFLAGS += -DX_ARCH=X_X86 | ||
178 | + endif # ARCH x86 | ||
179 | |||
180 | ifeq ($(ARCH), ia64) | ||
181 | CPPFLAGS += -DX_ARCH=X_IA64 | ||
182 | -- | ||
183 | 1.6.5 | ||
184 | |||
185 | Index: openjdk/jdk/make/common/shared/Platform.gmk | ||
186 | =================================================================== | ||
187 | --- openjdk/jdk/make/common/shared/Platform.gmk 2009-10-23 22:17:12.749059413 +0200 | ||
188 | +++ openjdk/jdk/make/common/shared/Platform.gmk 2009-10-23 22:18:16.236579466 +0200 | ||
189 | @@ -56,8 +56,8 @@ | ||
190 | # OS_VENDOR company name | ||
191 | # TEMP_DISK /tmp or C:/temp | ||
192 | # ARCH_DATA_MODEL 32 or 64 | ||
193 | -# ARCH sparc, sparcv9, i586, amd64, or ia64 | ||
194 | -# ARCH_FAMILY sparc or i586 | ||
195 | +# ARCH sparc, sparcv9, x86, amd64, or ia64 | ||
196 | +# ARCH_FAMILY sparc or x86 | ||
197 | # ARCHPROP sparc or x86 | ||
198 | # ARCH_VM_SUBDIR jre/bin, jre/lib/sparc, etc. | ||
199 | # LIBARCH sparc, sparcv9, i386, amd64, or ia64 | ||
200 | @@ -200,7 +200,7 @@ | ||
201 | endif | ||
202 | archExpr = case "$(mach)" in \ | ||
203 | i[3-9]86) \ | ||
204 | - echo i586 \ | ||
205 | + echo x86 \ | ||
206 | ;; \ | ||
207 | ia64) \ | ||
208 | echo ia64 \ | ||
209 | @@ -239,7 +239,7 @@ | ||
210 | ARCH=sparcv9 | ||
211 | endif | ||
212 | else | ||
213 | - # i586 is 32-bit, amd64 is 64-bit | ||
214 | + # x86 is 32-bit, amd64 is 64-bit | ||
215 | ifndef ARCH_DATA_MODEL | ||
216 | ifeq ($(ARCH), alpha) | ||
217 | ARCH_DATA_MODEL=64 | ||
218 | @@ -250,7 +250,7 @@ | ||
219 | ifeq ($(ARCH), arm) | ||
220 | ARCH_DATA_MODEL=32 | ||
221 | endif | ||
222 | - ifeq ($(ARCH), i586) | ||
223 | + ifeq ($(ARCH), x86) | ||
224 | ARCH_DATA_MODEL=32 | ||
225 | endif | ||
226 | ifeq ($(ARCH), ia64) | ||
227 | @@ -280,12 +280,7 @@ | ||
228 | endif | ||
229 | endif | ||
230 | |||
231 | - # Need to maintain the jre/lib/i386 location for 32-bit Intel | ||
232 | - ifeq ($(ARCH), i586) | ||
233 | - LIBARCH = i386 | ||
234 | - else | ||
235 | - LIBARCH = $(ARCH) | ||
236 | - endif | ||
237 | + LIBARCH = $(ARCH) | ||
238 | |||
239 | # Value of Java os.arch property | ||
240 | ARCHPROP = $(LIBARCH) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-sane-x86-arch-name.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-sane-x86-arch-name.patch new file mode 100644 index 0000000..1d67dbf --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-sane-x86-arch-name.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | Index: icedtea6-1.7/acinclude.m4 | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.7.orig/acinclude.m4 2010-01-26 20:37:07.000000000 +0100 | ||
4 | +++ icedtea6-1.7/acinclude.m4 2010-02-02 09:28:43.681373126 +0100 | ||
5 | @@ -8,11 +8,11 @@ | ||
6 | CROSS_TARGET_ARCH=x86_64 | ||
7 | ;; | ||
8 | i?86-*-*) | ||
9 | - BUILD_ARCH_DIR=i586 | ||
10 | - INSTALL_ARCH_DIR=i386 | ||
11 | - JRE_ARCH_DIR=i386 | ||
12 | + BUILD_ARCH_DIR=x86 | ||
13 | + INSTALL_ARCH_DIR=x86 | ||
14 | + JRE_ARCH_DIR=x86 | ||
15 | ARCH_PREFIX=${LINUX32} | ||
16 | - CROSS_TARGET_ARCH=i386 | ||
17 | + CROSS_TARGET_ARCH=x86 | ||
18 | ;; | ||
19 | alpha*-*-*) | ||
20 | BUILD_ARCH_DIR=alpha | ||
21 | @@ -733,7 +733,7 @@ | ||
22 | ZERO_LIBARCH="${INSTALL_ARCH_DIR}" | ||
23 | dnl can't use AC_CHECK_SIZEOF on multilib | ||
24 | case "${ZERO_LIBARCH}" in | ||
25 | - i386|ppc|s390|sparc) | ||
26 | + x86|ppc|s390|sparc) | ||
27 | ZERO_BITSPERWORD=32 | ||
28 | ;; | ||
29 | amd64|ppc64|s390x|sparc64) | ||
30 | @@ -745,7 +745,7 @@ | ||
31 | esac | ||
32 | AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"]) | ||
33 | case "${ZERO_LIBARCH}" in | ||
34 | - i386) | ||
35 | + x86) | ||
36 | ZERO_ARCHDEF="IA32" | ||
37 | ;; | ||
38 | ppc*) | ||
39 | @@ -762,7 +762,7 @@ | ||
40 | esac | ||
41 | dnl multilib machines need telling which mode to build for | ||
42 | case "${ZERO_LIBARCH}" in | ||
43 | - i386|ppc|sparc) | ||
44 | + x86|ppc|sparc) | ||
45 | ZERO_ARCHFLAG="-m32" | ||
46 | ;; | ||
47 | s390) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-unbreak-float.patch b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-unbreak-float.patch new file mode 100644 index 0000000..9f875de --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.7.5/icedtea-unbreak-float.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100 | ||
4 | +++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100 | ||
5 | @@ -27,13 +27,11 @@ | ||
6 | |||
7 | #include "jfdlibm.h" | ||
8 | |||
9 | -#ifdef __NEWVALID /* special setup for Sun test regime */ | ||
10 | #if defined(i386) || defined(i486) || \ | ||
11 | defined(intel) || defined(x86) || \ | ||
12 | defined(i86pc) || defined(_M_IA64) || defined(ia64) | ||
13 | #define _LITTLE_ENDIAN | ||
14 | #endif | ||
15 | -#endif | ||
16 | |||
17 | #ifdef _LITTLE_ENDIAN | ||
18 | #define __HI(x) *(1+(int*)&x) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/build-hacks-native.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/build-hacks-native.patch new file mode 100644 index 0000000..9432d03 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/build-hacks-native.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Index: icedtea6-1.6.1/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.6.1.orig/Makefile.am 2009-12-24 11:38:06.582572265 +0100 | ||
4 | +++ icedtea6-1.6.1/Makefile.am 2009-12-24 11:57:27.159578486 +0100 | ||
5 | @@ -265,6 +265,10 @@ | ||
6 | FT2_LIB="$(FREETYPE2_LIBS)" \ | ||
7 | ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ | ||
8 | HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | JAVAC="" \ | ||
14 | RHINO_JAR="$(RHINO_JAR)" \ | ||
15 | JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/disable-library-checks.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/disable-library-checks.patch new file mode 100644 index 0000000..23b8bed --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/disable-library-checks.patch | |||
@@ -0,0 +1,141 @@ | |||
1 | Index: icedtea6-1.7/configure.ac | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.7.orig/configure.ac 2010-01-26 04:52:18.000000000 +0100 | ||
4 | +++ icedtea6-1.7/configure.ac 2010-02-08 12:05:51.354556052 +0100 | ||
5 | @@ -205,9 +205,9 @@ | ||
6 | fi | ||
7 | |||
8 | dnl pkgconfig cannot be used to find these headers and libraries. | ||
9 | -AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
10 | - ,[AC_MSG_ERROR("CUPS headers were not found - | ||
11 | - try installing cups-devel.")]) | ||
12 | +#AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
13 | +# ,[AC_MSG_ERROR("CUPS headers were not found - | ||
14 | +# try installing cups-devel.")]) | ||
15 | AC_CHECK_HEADERS([X11/X.h],[] | ||
16 | ,[AC_MSG_ERROR("xorg headers were not found - | ||
17 | try installing xorg-x11-proto-devel.")]) | ||
18 | @@ -239,12 +239,12 @@ | ||
19 | AC_SUBST(XT_LIBS) | ||
20 | |||
21 | dnl Check for libXp headers and libraries. | ||
22 | -PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
23 | -if test "x${XP_FOUND}" = xno | ||
24 | -then | ||
25 | - AC_MSG_ERROR([Could not find Xp - \ | ||
26 | - Try installing libXp-devel.]) | ||
27 | -fi | ||
28 | +#PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
29 | +#if test "x${XP_FOUND}" = xno | ||
30 | +#then | ||
31 | +# AC_MSG_ERROR([Could not find Xp - \ | ||
32 | +# Try installing libXp-devel.]) | ||
33 | +#fi | ||
34 | AC_SUBST(XP_CFLAGS) | ||
35 | AC_SUBST(XP_LIBS) | ||
36 | |||
37 | @@ -258,16 +258,16 @@ | ||
38 | AC_SUBST(X11_CFLAGS) | ||
39 | AC_SUBST(X11_LIBS) | ||
40 | |||
41 | -dnl Check for libXinerama headers and libraries. | ||
42 | -PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
43 | - ,[XINERAMA_FOUND=no]) | ||
44 | -if test "x${XINERAMA_FOUND}" = xno | ||
45 | -then | ||
46 | - AC_MSG_ERROR([Could not find Xinerama - \ | ||
47 | - Try installing libXinerama-devel.]) | ||
48 | -fi | ||
49 | -AC_SUBST(XINERAMA_CFLAGS) | ||
50 | -AC_SUBST(XINERAMA_LIBS) | ||
51 | +#dnl Check for libXinerama headers and libraries. | ||
52 | +#PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
53 | +# ,[XINERAMA_FOUND=no]) | ||
54 | +#if test "x${XINERAMA_FOUND}" = xno | ||
55 | +#then | ||
56 | +# AC_MSG_ERROR([Could not find Xinerama - \ | ||
57 | +# Try installing libXinerama-devel.]) | ||
58 | +#fi | ||
59 | +#AC_SUBST(XINERAMA_CFLAGS) | ||
60 | +#AC_SUBST(XINERAMA_LIBS) | ||
61 | |||
62 | if test "x${ENABLE_XRENDER}" = "xyes" | ||
63 | then | ||
64 | @@ -341,26 +341,26 @@ | ||
65 | AC_CONFIG_FILES([tapset/jstack.stp]) | ||
66 | fi | ||
67 | |||
68 | -dnl Check for libpng headers and libraries. | ||
69 | -PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
70 | - ,[LIBPNG_FOUND=no]) | ||
71 | -if test "x${LIBPNG_FOUND}" = xno | ||
72 | -then | ||
73 | - AC_MSG_ERROR([Could not find libpng - \ | ||
74 | - Try installing libpng-devel.]) | ||
75 | -fi | ||
76 | -AC_SUBST(LIBPNG_CFLAGS) | ||
77 | -AC_SUBST(LIBPNG_LIBS) | ||
78 | - | ||
79 | -dnl Check for libXtst headers and libraries. | ||
80 | -PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
81 | -if test "x${XTST_FOUND}" = xno | ||
82 | -then | ||
83 | - AC_MSG_ERROR([Could not find Xtst - \ | ||
84 | - Try installing libXtst-devel.]) | ||
85 | -fi | ||
86 | -AC_SUBST(XTST_CFLAGS) | ||
87 | -AC_SUBST(XTST_LIBS) | ||
88 | +#dnl Check for libpng headers and libraries. | ||
89 | +#PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
90 | +# ,[LIBPNG_FOUND=no]) | ||
91 | +#if test "x${LIBPNG_FOUND}" = xno | ||
92 | +#then | ||
93 | +# AC_MSG_ERROR([Could not find libpng - \ | ||
94 | +# Try installing libpng-devel.]) | ||
95 | +#fi | ||
96 | +#AC_SUBST(LIBPNG_CFLAGS) | ||
97 | +#AC_SUBST(LIBPNG_LIBS) | ||
98 | + | ||
99 | +#dnl Check for libXtst headers and libraries. | ||
100 | +#PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
101 | +#if test "x${XTST_FOUND}" = xno | ||
102 | +#then | ||
103 | +# AC_MSG_ERROR([Could not find Xtst - \ | ||
104 | +# Try installing libXtst-devel.]) | ||
105 | +#fi | ||
106 | +#AC_SUBST(XTST_CFLAGS) | ||
107 | +#AC_SUBST(XTST_LIBS) | ||
108 | |||
109 | dnl Check for freetype2 headers and libraries. | ||
110 | PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] | ||
111 | @@ -373,18 +373,18 @@ | ||
112 | AC_SUBST(FREETYPE2_CFLAGS) | ||
113 | AC_SUBST(FREETYPE2_LIBS) | ||
114 | |||
115 | -dnl Check for alsa headers and libraries (only required for Linux). | ||
116 | -if test "x${BUILD_OS_DIR}" = "xlinux" | ||
117 | -then | ||
118 | - PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
119 | - if test "x${ALSA_FOUND}" = xno | ||
120 | - then | ||
121 | - AC_MSG_ERROR([Could not find alsa - \ | ||
122 | - Try installing alsa-lib-devel.]) | ||
123 | - fi | ||
124 | -AC_SUBST(ALSA_CFLAGS) | ||
125 | -AC_SUBST(ALSA_LIBS) | ||
126 | -fi | ||
127 | +#dnl Check for alsa headers and libraries (only required for Linux). | ||
128 | +#if test "x${BUILD_OS_DIR}" = "xlinux" | ||
129 | +#then | ||
130 | +# PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
131 | +# if test "x${ALSA_FOUND}" = xno | ||
132 | +# then | ||
133 | +# AC_MSG_ERROR([Could not find alsa - \ | ||
134 | +# Try installing alsa-lib-devel.]) | ||
135 | +# fi | ||
136 | +#AC_SUBST(ALSA_CFLAGS) | ||
137 | +#AC_SUBST(ALSA_LIBS) | ||
138 | +#fi | ||
139 | |||
140 | if test "x${enable_pulse_java}" = "xyes" | ||
141 | then | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-disable-compilation.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-disable-compilation.patch new file mode 100644 index 0000000..cd0f68a --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-disable-compilation.patch | |||
@@ -0,0 +1,513 @@ | |||
1 | Index: openjdk/jdk/make/sun/awt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/sun/awt/Makefile 2009-04-24 09:33:55.000000000 +0200 | ||
4 | +++ openjdk/jdk/make/sun/awt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
5 | @@ -180,7 +180,8 @@ | ||
6 | include $(BUILDDIR)/common/Mapfile-vers.gmk | ||
7 | include $(BUILDDIR)/common/Library.gmk | ||
8 | |||
9 | -build: fontconfigs | ||
10 | +#build: fontconfigs | ||
11 | +build: | ||
12 | |||
13 | |||
14 | ifeq ($(PLATFORM), windows) | ||
15 | @@ -535,9 +536,9 @@ | ||
16 | -I$(PLATFORM_SRC)/native/$(PKGDIR) \ | ||
17 | $(EVENT_MODEL) | ||
18 | |||
19 | -ifeq ($(PLATFORM), linux) | ||
20 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
21 | -endif | ||
22 | +#ifeq ($(PLATFORM), linux) | ||
23 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
24 | +#endif | ||
25 | |||
26 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
27 | $(AWT_RUNPATH) | ||
28 | Index: openjdk/jdk/make/javax/sound/jsoundalsa/Makefile | ||
29 | =================================================================== | ||
30 | --- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:48:34.534565581 +0200 | ||
31 | +++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
32 | @@ -44,34 +44,35 @@ | ||
33 | # Files | ||
34 | # | ||
35 | |||
36 | -FILES_c = \ | ||
37 | - Utilities.c \ | ||
38 | - $(DAUDIOFILES_c) \ | ||
39 | - $(MIDIFILES_c) \ | ||
40 | - $(PORTFILES_c) | ||
41 | +#FILES_c = \ | ||
42 | +# Utilities.c \ | ||
43 | +# $(DAUDIOFILES_c) \ | ||
44 | +# $(MIDIFILES_c) \ | ||
45 | +# $(PORTFILES_c) | ||
46 | |||
47 | # platform dependent files | ||
48 | -FILES_c += \ | ||
49 | - PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
50 | - PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
51 | - PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
52 | - PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
53 | - PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
54 | - PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
55 | - PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
56 | - | ||
57 | -FILES_export = \ | ||
58 | - $(DAUDIOFILES_export) \ | ||
59 | - $(MIDIFILES_export) \ | ||
60 | - $(PORTFILES_export) | ||
61 | +#FILES_c += \ | ||
62 | +# PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
63 | +# PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
64 | +# PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
65 | +# PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
66 | +# PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
67 | +# PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
68 | +# PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
69 | + | ||
70 | +FILES_export = | ||
71 | +#FILES_export = \ | ||
72 | +# $(DAUDIOFILES_export) \ | ||
73 | +# $(MIDIFILES_export) \ | ||
74 | +# $(PORTFILES_export) | ||
75 | |||
76 | -OTHER_LDLIBS += -lasound | ||
77 | +#OTHER_LDLIBS += -lasound | ||
78 | |||
79 | CPPFLAGS += \ | ||
80 | - -DUSE_DAUDIO=TRUE \ | ||
81 | - -DUSE_PORTS=TRUE \ | ||
82 | - -DUSE_PLATFORM_MIDI_OUT=TRUE \ | ||
83 | - -DUSE_PLATFORM_MIDI_IN=TRUE \ | ||
84 | + -DUSE_DAUDIO=FALSE \ | ||
85 | + -DUSE_PORTS=FALSE \ | ||
86 | + -DUSE_PLATFORM_MIDI_OUT=FALSE \ | ||
87 | + -DUSE_PLATFORM_MIDI_IN=FALSE \ | ||
88 | -I$(SHARE_SRC)/native/com/sun/media/sound | ||
89 | |||
90 | # | ||
91 | Index: openjdk/jdk/make/sun/splashscreen/Makefile | ||
92 | =================================================================== | ||
93 | --- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:48:33.738565601 +0200 | ||
94 | +++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
95 | @@ -32,7 +32,8 @@ | ||
96 | # | ||
97 | # Files | ||
98 | # | ||
99 | -include FILES_c.gmk | ||
100 | +#include FILES_c.gmk | ||
101 | +FILES_c = | ||
102 | |||
103 | FILES_java = \ | ||
104 | java/awt/SplashScreen.java | ||
105 | @@ -62,9 +63,9 @@ | ||
106 | CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE | ||
107 | |||
108 | ifneq ($(PLATFORM), windows) | ||
109 | - CFLAGS += -DWITH_X11 | ||
110 | - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
111 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
112 | +# CFLAGS += -DWITH_X11 | ||
113 | +# CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
114 | +# OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
115 | else # PLATFORM | ||
116 | CFLAGS += -DWITH_WIN32 | ||
117 | OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib | ||
118 | @@ -79,7 +80,7 @@ | ||
119 | vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg | ||
120 | vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen | ||
121 | |||
122 | -CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
123 | +#CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
124 | |||
125 | ifeq ($(PLATFORM), linux) | ||
126 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
127 | Index: openjdk/jdk/make/sun/xawt/Makefile | ||
128 | =================================================================== | ||
129 | --- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-04-24 09:33:56.000000000 +0200 | ||
130 | +++ openjdk/jdk/make/sun/xawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
131 | @@ -41,15 +41,16 @@ | ||
132 | # | ||
133 | # Files | ||
134 | # | ||
135 | -include FILES_c_unix.gmk | ||
136 | -include FILES_export_unix.gmk | ||
137 | +#include FILES_c_unix.gmk | ||
138 | +FILES_c = | ||
139 | +#include FILES_export_unix.gmk | ||
140 | AUTO_FILES_JAVA_DIRS = sun/awt/X11 | ||
141 | AUTO_JAVA_PRUNE = WrapperGenerator.java | ||
142 | |||
143 | LDFLAGS += -L$(OPENWIN_LIB) | ||
144 | |||
145 | ifeq ($(PLATFORM), linux) | ||
146 | -LDFLAGS += -lpthread | ||
147 | +#LDFLAGS += -lpthread | ||
148 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
149 | endif | ||
150 | |||
151 | @@ -86,16 +87,19 @@ | ||
152 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl | ||
153 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 | ||
154 | |||
155 | -OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
156 | - $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
157 | +#OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
158 | +# $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
159 | |||
160 | ifeq ($(PLATFORM), solaris) | ||
161 | CPPFLAGS += -DFUNCPROTO=15 | ||
162 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
163 | endif | ||
164 | |||
165 | -CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
166 | +#CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
167 | |||
168 | +# Normally we would like to patch these includes away but | ||
169 | +# we need them for the successfull compilation of the sizer | ||
170 | +# executables. | ||
171 | CPPFLAGS += -DXAWT -DXAWT_HACK \ | ||
172 | -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ | ||
173 | -I$(PLATFORM_SRC)/native/sun/awt \ | ||
174 | @@ -124,10 +128,10 @@ | ||
175 | |||
176 | ifeq ($(PLATFORM), linux) | ||
177 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
178 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
179 | - -I/usr/include/X11/extensions \ | ||
180 | - -I$(MOTIF_DIR)/include \ | ||
181 | - -I$(OPENWIN_HOME)/include | ||
182 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
183 | +# -I/usr/include/X11/extensions \ | ||
184 | +# -I$(MOTIF_DIR)/include \ | ||
185 | +# -I$(OPENWIN_HOME)/include | ||
186 | endif | ||
187 | |||
188 | ifeq ($(PLATFORM), solaris) | ||
189 | @@ -238,18 +242,20 @@ | ||
190 | $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) | ||
191 | |||
192 | $(SIZES): $(SIZERS) | ||
193 | - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
194 | - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
195 | - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
196 | - $(CHMOD) +w $@;\ | ||
197 | - else \ | ||
198 | - $(ECHO) GENERATING $@; \ | ||
199 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
200 | - fi | ||
201 | - @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
202 | - $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
203 | - $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
204 | - fi | ||
205 | + touch $(SIZES) | ||
206 | +# | ||
207 | +# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
208 | +# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
209 | +# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
210 | +# $(CHMOD) +w $@;\ | ||
211 | +# else \ | ||
212 | +# $(ECHO) GENERATING $@; \ | ||
213 | +# $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
214 | +# fi | ||
215 | +# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
216 | +# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
217 | +# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
218 | +# fi | ||
219 | |||
220 | $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) | ||
221 | $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ | ||
222 | Index: openjdk/jdk/make/sun/jawt/Makefile | ||
223 | =================================================================== | ||
224 | --- openjdk.orig/jdk/make/sun/jawt/Makefile 2009-09-29 13:48:34.186565471 +0200 | ||
225 | +++ openjdk/jdk/make/sun/jawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
226 | @@ -36,7 +36,8 @@ | ||
227 | ifeq ($(PLATFORM), windows) | ||
228 | FILES_cpp = jawt.cpp | ||
229 | else # PLATFORM | ||
230 | -FILES_c = jawt.c | ||
231 | +FILES_c = | ||
232 | +#FILES_c = jawt.c | ||
233 | endif # PLATFORM | ||
234 | |||
235 | FILES_h = $(INCLUDEDIR)/jawt.h \ | ||
236 | Index: openjdk/jdk/make/sun/jpeg/Makefile | ||
237 | =================================================================== | ||
238 | --- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-09-29 13:48:33.726565626 +0200 | ||
239 | +++ openjdk/jdk/make/sun/jpeg/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
240 | @@ -37,7 +37,8 @@ | ||
241 | # | ||
242 | # Files | ||
243 | # | ||
244 | -include FILES_c.gmk | ||
245 | +FILES_c = | ||
246 | +#include FILES_c.gmk | ||
247 | |||
248 | AUTO_FILES_JAVA_DIRS = sun/awt/image com/sun/imageio/plugins/jpeg | ||
249 | |||
250 | Index: openjdk/jdk/make/common/shared/Defs-java.gmk | ||
251 | =================================================================== | ||
252 | --- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:48:55.954565215 +0200 | ||
253 | +++ openjdk/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:57:14.446815782 +0200 | ||
254 | @@ -36,14 +36,14 @@ | ||
255 | # Memory related -J flags that all uses of java tools should use. | ||
256 | # | ||
257 | JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m | ||
258 | -ifneq (,$(filter $(ARCH), ia64 s390)) | ||
259 | +#ifneq (,$(filter $(ARCH), ia64 s390)) | ||
260 | # Special flags for javac on ia64 to work around a VM problem with | ||
261 | # bad code generation during inlining (what version had this problem?): | ||
262 | # Suspect this may not be needed anymore. | ||
263 | - JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
264 | -else | ||
265 | - JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
266 | -endif | ||
267 | +# JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
268 | +#else | ||
269 | +# JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
270 | +#endif | ||
271 | |||
272 | # | ||
273 | # All java tools (javac, javah, and javadoc) run faster with certain java | ||
274 | Index: openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java | ||
275 | =================================================================== | ||
276 | --- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-04-24 09:34:04.000000000 +0200 | ||
277 | +++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-09-29 13:57:14.450815511 +0200 | ||
278 | @@ -113,7 +113,7 @@ | ||
279 | * @since 1.4 | ||
280 | */ | ||
281 | public static boolean isHeadless() { | ||
282 | - return getHeadlessProperty(); | ||
283 | + return true; | ||
284 | } | ||
285 | |||
286 | /** | ||
287 | Index: openjdk/corba/make/common/Defs.gmk | ||
288 | =================================================================== | ||
289 | --- openjdk.orig/corba/make/common/Defs.gmk 2009-04-24 09:30:19.000000000 +0200 | ||
290 | +++ openjdk/corba/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
291 | @@ -444,11 +444,11 @@ | ||
292 | # Tool flags | ||
293 | # | ||
294 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
295 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
296 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
297 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
298 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
299 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
300 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
301 | $(DEFINES) $(OPTIONS:%=-D%) | ||
302 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
303 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
304 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
305 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
306 | $(OTHER_LINTFLAGS) | ||
307 | Index: openjdk/jdk/make/common/Defs.gmk | ||
308 | =================================================================== | ||
309 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:48:33.590565061 +0200 | ||
310 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
311 | @@ -662,11 +662,11 @@ | ||
312 | # Tool flags | ||
313 | # | ||
314 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
315 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
316 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
317 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
318 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
319 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
320 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
321 | $(DEFINES) $(OPTIONS:%=-D%) | ||
322 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
323 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
324 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
325 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
326 | $(OTHER_LINTFLAGS) | ||
327 | Index: openjdk/hotspot/make/linux/makefiles/vm.make | ||
328 | =================================================================== | ||
329 | --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:48:34.098565716 +0200 | ||
330 | +++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:57:14.450815511 +0200 | ||
331 | @@ -170,6 +170,7 @@ | ||
332 | LIBS_VM += $(LLVM_LIBS) | ||
333 | endif | ||
334 | |||
335 | +LFLAGS_VM = $(OE_LDFLAGS) | ||
336 | LINK_VM = $(LINK_LIB.c) | ||
337 | |||
338 | # rule for building precompiled header | ||
339 | Index: openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c | ||
340 | =================================================================== | ||
341 | --- openjdk.orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-04-24 09:34:34.000000000 +0200 | ||
342 | +++ openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-09-29 13:57:14.450815511 +0200 | ||
343 | @@ -26,8 +26,10 @@ | ||
344 | #include <jni.h> | ||
345 | #include <jni_util.h> | ||
346 | #include <dlfcn.h> | ||
347 | +#if 0 | ||
348 | #include <cups/cups.h> | ||
349 | #include <cups/ppd.h> | ||
350 | +#endif | ||
351 | |||
352 | //#define CUPS_DEBUG | ||
353 | |||
354 | @@ -37,6 +39,7 @@ | ||
355 | #define DPRINTF(x, y) | ||
356 | #endif | ||
357 | |||
358 | +#if 0 | ||
359 | typedef const char* (*fn_cupsServer)(void); | ||
360 | typedef int (*fn_ippPort)(void); | ||
361 | typedef http_t* (*fn_httpConnect)(const char *, int); | ||
362 | @@ -56,7 +59,7 @@ | ||
363 | fn_ppdClose j2d_ppdClose; | ||
364 | fn_ppdFindOption j2d_ppdFindOption; | ||
365 | fn_ppdPageSize j2d_ppdPageSize; | ||
366 | - | ||
367 | +#endif | ||
368 | |||
369 | /* | ||
370 | * Initialize library functions. | ||
371 | @@ -65,6 +68,7 @@ | ||
372 | JNIEXPORT jboolean JNICALL | ||
373 | Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env, | ||
374 | jobject printObj) { | ||
375 | +#if 0 | ||
376 | void *handle = dlopen("libcups.so.2", RTLD_LAZY | RTLD_GLOBAL); | ||
377 | |||
378 | if (handle == NULL) { | ||
379 | @@ -131,6 +135,8 @@ | ||
380 | } | ||
381 | |||
382 | return JNI_TRUE; | ||
383 | +#endif | ||
384 | + return JNI_FALSE; | ||
385 | } | ||
386 | |||
387 | /* | ||
388 | @@ -141,6 +147,7 @@ | ||
389 | Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env, | ||
390 | jobject printObj) | ||
391 | { | ||
392 | +#if 0 | ||
393 | jstring cServer = NULL; | ||
394 | const char* server = j2d_cupsServer(); | ||
395 | if (server != NULL) { | ||
396 | @@ -152,6 +159,8 @@ | ||
397 | } | ||
398 | } | ||
399 | return cServer; | ||
400 | +#endif | ||
401 | + return NULL; | ||
402 | } | ||
403 | |||
404 | /* | ||
405 | @@ -162,8 +171,11 @@ | ||
406 | Java_sun_print_CUPSPrinter_getCupsPort(JNIEnv *env, | ||
407 | jobject printObj) | ||
408 | { | ||
409 | +#if 0 | ||
410 | int port = j2d_ippPort(); | ||
411 | return (jint) port; | ||
412 | +#endif | ||
413 | + return 0; | ||
414 | } | ||
415 | |||
416 | |||
417 | @@ -177,6 +189,7 @@ | ||
418 | jstring server, | ||
419 | jint port) | ||
420 | { | ||
421 | +#if 0 | ||
422 | const char *serverName; | ||
423 | serverName = (*env)->GetStringUTFChars(env, server, NULL); | ||
424 | if (serverName != NULL) { | ||
425 | @@ -187,6 +200,7 @@ | ||
426 | return JNI_TRUE; | ||
427 | } | ||
428 | } | ||
429 | +#endif | ||
430 | return JNI_FALSE; | ||
431 | } | ||
432 | |||
433 | @@ -199,6 +213,7 @@ | ||
434 | jobject printObj, | ||
435 | jstring printer) | ||
436 | { | ||
437 | +#if 0 | ||
438 | ppd_file_t *ppd; | ||
439 | ppd_option_t *optionTray, *optionPage; | ||
440 | ppd_choice_t *choice; | ||
441 | @@ -304,6 +319,8 @@ | ||
442 | j2d_ppdClose(ppd); | ||
443 | unlink(filename); | ||
444 | return nameArray; | ||
445 | +#endif | ||
446 | + return NULL; | ||
447 | } | ||
448 | |||
449 | |||
450 | @@ -315,6 +332,7 @@ | ||
451 | jobject printObj, | ||
452 | jstring printer) | ||
453 | { | ||
454 | +#if 0 | ||
455 | ppd_file_t *ppd; | ||
456 | ppd_option_t *option; | ||
457 | ppd_choice_t *choice; | ||
458 | @@ -374,4 +392,6 @@ | ||
459 | j2d_ppdClose(ppd); | ||
460 | unlink(filename); | ||
461 | return sizeArray; | ||
462 | +#endif | ||
463 | + return NULL; | ||
464 | } | ||
465 | Index: openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java | ||
466 | =================================================================== | ||
467 | --- openjdk.orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-04-24 09:34:17.000000000 +0200 | ||
468 | +++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
469 | @@ -244,6 +244,8 @@ | ||
470 | * that might be specified. | ||
471 | */ | ||
472 | fontConfig = createFontConfiguration(); | ||
473 | + if (fontConfig == null) | ||
474 | + return null; | ||
475 | getPlatformFontPathFromFontConfig(); | ||
476 | |||
477 | String extraFontPath = fontConfig.getExtraFontPath(); | ||
478 | Index: openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | ||
479 | =================================================================== | ||
480 | --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-04-24 09:34:33.000000000 +0200 | ||
481 | +++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
482 | @@ -899,7 +899,8 @@ | ||
483 | |||
484 | // Implements SunGraphicsEnvironment.createFontConfiguration. | ||
485 | protected FontConfiguration createFontConfiguration() { | ||
486 | - return new MFontConfiguration(this); | ||
487 | +// return new MFontConfiguration(this); | ||
488 | + return null; | ||
489 | } | ||
490 | public FontConfiguration | ||
491 | createFontConfiguration(boolean preferLocaleFonts, | ||
492 | Index: openjdk/jdk/make/launchers/Makefile | ||
493 | =================================================================== | ||
494 | --- openjdk.orig/jdk/make/launchers/Makefile 2009-09-29 13:48:33.490815135 +0200 | ||
495 | +++ openjdk/jdk/make/launchers/Makefile 2009-09-29 13:57:14.454815276 +0200 | ||
496 | @@ -57,7 +57,7 @@ | ||
497 | endif | ||
498 | # Run MAKE $@ for all generic launchers | ||
499 | define make-all-launchers | ||
500 | -$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
501 | +#$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
502 | $(call make-launcher, apt, com.sun.tools.apt.Main, , ) | ||
503 | $(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , ) | ||
504 | $(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , ) | ||
505 | @@ -93,7 +93,7 @@ | ||
506 | -J-Dcom.sun.CORBA.activation.Port=1049 \ | ||
507 | -J-Dcom.sun.CORBA.POA.ORBServerId=1, ) | ||
508 | $(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack) | ||
509 | -$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
510 | +#$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
511 | $(call make-launcher, rmic, sun.rmi.rmic.Main, , ) | ||
512 | $(call make-launcher, rmid, sun.rmi.server.Activation, , ) | ||
513 | $(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , ) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-freetype.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-freetype.patch new file mode 100644 index 0000000..3420fbd --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-freetype.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: openjdk/jdk/make/tools/freetypecheck/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/tools/freetypecheck/Makefile 2009-09-29 13:48:33.590565061 +0200 | ||
4 | +++ openjdk/jdk/make/tools/freetypecheck/Makefile 2009-09-29 14:00:04.470566156 +0200 | ||
5 | @@ -45,7 +45,7 @@ | ||
6 | FT_OPTIONS = $(CFLAGS) | ||
7 | endif | ||
8 | |||
9 | -FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 | ||
10 | +FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 $(FREETYPE2_CFLAGS) $(FREETYPE2_LIBS) $(FREETYPE2_HEADERS) | ||
11 | FT_OPTIONS += $(XARCH) | ||
12 | |||
13 | #add runtime library search path | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch new file mode 100644 index 0000000..eff7e48 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | Index: openjdk/jdk/make/com/sun/java/pack/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-09-29 13:48:34.538565136 +0200 | ||
4 | +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-09-29 14:00:26.226565853 +0200 | ||
5 | @@ -80,7 +80,7 @@ | ||
6 | OTHER_LDLIBS += $(JVMLIB) | ||
7 | endif | ||
8 | |||
9 | -OTHER_LDLIBS += -lz | ||
10 | +OTHER_LDLIBS += -L$(libdir) -lz | ||
11 | CXXFLAGS_DBG += -DFULL | ||
12 | CXXFLAGS_OPT += -DPRODUCT | ||
13 | CXXFLAGS_COMMON += -DFULL | ||
14 | Index: openjdk/jdk/make/common/Defs.gmk | ||
15 | =================================================================== | ||
16 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
17 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
18 | @@ -289,7 +289,7 @@ | ||
19 | |||
20 | endif # PROGRAM | ||
21 | |||
22 | -LDLIBS_COMMON += $(EXTRA_LIBS) | ||
23 | +LDLIBS_COMMON += $(EXTRA_LIBS) -L$(libdir) | ||
24 | |||
25 | # | ||
26 | # Default is to build, not import native binaries | ||
27 | @@ -425,7 +425,7 @@ | ||
28 | CLASSDESTDIR = $(CLASSBINDIR) | ||
29 | endif | ||
30 | |||
31 | -INCLUDES = -I. -I$(CLASSHDRDIR) \ | ||
32 | +INCLUDES = -I$(includedir) -I. -I$(CLASSHDRDIR) \ | ||
33 | $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES) | ||
34 | OTHER_CPPFLAGS = $(INCLUDES) | ||
35 | |||
36 | Index: openjdk/jdk/make/common/Program.gmk | ||
37 | =================================================================== | ||
38 | --- openjdk.orig/jdk/make/common/Program.gmk 2009-09-29 13:48:33.914565255 +0200 | ||
39 | +++ openjdk/jdk/make/common/Program.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
40 | @@ -73,7 +73,7 @@ | ||
41 | # itself, as with all the Windows libraries. | ||
42 | # | ||
43 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
44 | - LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli | ||
45 | + LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli -L $(libdir) | ||
46 | OTHER_LDLIBS += -ljli | ||
47 | ifeq ($(PLATFORM), solaris) | ||
48 | ifeq ($(ARCH_DATA_MODEL), 32) | ||
49 | Index: openjdk/jdk/make/java/jli/Makefile | ||
50 | =================================================================== | ||
51 | --- openjdk.orig/jdk/make/java/jli/Makefile 2009-09-29 13:48:33.806565054 +0200 | ||
52 | +++ openjdk/jdk/make/java/jli/Makefile 2009-09-29 14:00:26.230565844 +0200 | ||
53 | @@ -61,7 +61,7 @@ | ||
54 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
55 | LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli | ||
56 | # Guarantee very limited dependencies | ||
57 | - LDLIBS = -lz -lc | ||
58 | + LDLIBS = -L$(libdir) -lz -lc | ||
59 | endif | ||
60 | |||
61 | ifeq ($(PLATFORM), windows) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-make-arch-sane-for-x86.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-make-arch-sane-for-x86.patch new file mode 100644 index 0000000..9d7b9bb --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-make-arch-sane-for-x86.patch | |||
@@ -0,0 +1,1130 @@ | |||
1 | From b8a51665ada45e3beb0823c03c025d5514f5e745 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Thu, 22 Oct 2009 16:35:25 +0200 | ||
4 | Subject: [PATCH] hotspot: make arch sane for x86 | ||
5 | |||
6 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
7 | index 38e0f78..64c8410 100644 | ||
8 | --- openjdk/hotspot/agent/make/saenv.sh | ||
9 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
10 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
11 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
12 | CPU=amd64 | ||
13 | else | ||
14 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
15 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
16 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
17 | - CPU=i386 | ||
18 | + CPU=x86 | ||
19 | fi | ||
20 | else | ||
21 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
22 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
23 | index 83ddd1a..c20c7eb 100644 | ||
24 | --- openjdk/hotspot/make/defs.make | ||
25 | +++ openjdk/hotspot/make/defs.make | ||
26 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
27 | ifdef LP64 | ||
28 | BUILDARCH = amd64 | ||
29 | else | ||
30 | - BUILDARCH = i486 | ||
31 | + BUILDARCH = x86 | ||
32 | endif | ||
33 | endif | ||
34 | ifeq ($(BUILDARCH), sparc) | ||
35 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
36 | |||
37 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
38 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
39 | - LIBARCH/i486 = i386 | ||
40 | + LIBARCH/x86 = x86 | ||
41 | LIBARCH/amd64 = amd64 | ||
42 | LIBARCH/sparc = sparc | ||
43 | LIBARCH/sparcv9 = sparcv9 | ||
44 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
45 | index bc82543..4a1ef4e 100644 | ||
46 | --- openjdk/hotspot/make/jprt.config | ||
47 | +++ openjdk/hotspot/make/jprt.config | ||
48 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
49 | # LINUX: X86, AMD64 | ||
50 | osarch=`uname -m` | ||
51 | if [ "${osarch}" = i686 ] ; then | ||
52 | - linux_arch=i586 | ||
53 | + linux_arch=x86 | ||
54 | elif [ "${osarch}" = x86_64 ] ; then | ||
55 | linux_arch=amd64 | ||
56 | fi | ||
57 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
58 | index eb2ce82..7193de0 100644 | ||
59 | --- openjdk/hotspot/make/jprt.properties | ||
60 | +++ openjdk/hotspot/make/jprt.properties | ||
61 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
62 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
63 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
64 | |||
65 | -jprt.my.linux.i586=linux_i586 | ||
66 | +jprt.my.linux.x86=linux_x86 | ||
67 | jprt.my.linux.x64=linux_x64 | ||
68 | jprt.my.windows.i586=windows_i586 | ||
69 | jprt.my.windows.x64=windows_x64 | ||
70 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
71 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
72 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
73 | |||
74 | -jprt.my.linux.i586.test.targets = \ | ||
75 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
76 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
77 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
78 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
79 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
80 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
81 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
82 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
83 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
84 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
85 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
86 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
87 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
88 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
89 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
90 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
91 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
92 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
93 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
94 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
95 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
96 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
97 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
98 | +jprt.my.linux.x86.test.targets = \ | ||
99 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
100 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
101 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
102 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
103 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
104 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
105 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
106 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
107 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
108 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
109 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
110 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
111 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
112 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
113 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
114 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
115 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
116 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
117 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
118 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
119 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
120 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
121 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
122 | |||
123 | jprt.my.linux.x64.test.targets = \ | ||
124 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
125 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
126 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
127 | ${jprt.my.solaris.i586.test.targets}, \ | ||
128 | ${jprt.my.solaris.x64.test.targets}, \ | ||
129 | - ${jprt.my.linux.i586.test.targets}, \ | ||
130 | + ${jprt.my.linux.x86.test.targets}, \ | ||
131 | ${jprt.my.linux.x64.test.targets}, \ | ||
132 | ${jprt.my.windows.i586.test.targets}, \ | ||
133 | ${jprt.my.windows.x64.test.targets} | ||
134 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
135 | index e317fdd..5d3b1ff 100644 | ||
136 | --- openjdk/hotspot/make/linux/build.sh | ||
137 | +++ openjdk/hotspot/make/linux/build.sh | ||
138 | @@ -43,7 +43,7 @@ esac | ||
139 | |||
140 | case `uname -m` in | ||
141 | i386|i486|i586|i686) | ||
142 | - mach=i386 | ||
143 | + mach=x86 | ||
144 | ;; | ||
145 | *) | ||
146 | echo "Unsupported machine: " `uname -m` | ||
147 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
148 | index add9823..cbbf81f 100644 | ||
149 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
150 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
151 | @@ -30,7 +30,7 @@ | ||
152 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
153 | # environment or on the command-line: | ||
154 | # | ||
155 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
156 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
157 | # BUILDARCH - build directory | ||
158 | # LIBARCH - the corresponding directory in JDK/JRE | ||
159 | # GAMMADIR - top of workspace | ||
160 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
161 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
162 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
163 | |||
164 | -DATA_MODE/i486 = 32 | ||
165 | +DATA_MODE/x86 = 32 | ||
166 | DATA_MODE/sparc = 32 | ||
167 | DATA_MODE/sparcv9 = 64 | ||
168 | DATA_MODE/amd64 = 64 | ||
169 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
170 | index 113d4f8..d3f06cb 100644 | ||
171 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
172 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
173 | @@ -78,7 +78,7 @@ endif | ||
174 | # Processor-specific files for other processors are excluded by default. Use | ||
175 | # CS_CPU=x to include platform-specific files for other platforms. | ||
176 | ifndef CS_CPU | ||
177 | -CS_CPU = i486 sparc amd64 ia64 | ||
178 | +CS_CPU = x86 sparc amd64 ia64 | ||
179 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
180 | endif | ||
181 | |||
182 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
183 | index 9131c79..138dfb3 100644 | ||
184 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
185 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
186 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
187 | HS_ARCH = sparc | ||
188 | endif | ||
189 | |||
190 | +# x86 | ||
191 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
192 | + ARCH_DATA_MODEL = 32 | ||
193 | + PLATFORM = linux-x86 | ||
194 | + VM_PLATFORM = linux_x86 | ||
195 | + HS_ARCH = x86 | ||
196 | +endif | ||
197 | + | ||
198 | # x86_64 | ||
199 | ifeq ($(ARCH), x86_64) | ||
200 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
201 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
202 | HS_ARCH = x86 | ||
203 | else | ||
204 | ARCH_DATA_MODEL = 32 | ||
205 | - PLATFORM = linux-i586 | ||
206 | - VM_PLATFORM = linux_i486 | ||
207 | + PLATFORM = linux-x86 | ||
208 | + VM_PLATFORM = linux_x86 | ||
209 | HS_ARCH = x86 | ||
210 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
211 | - ARCH = i686 | ||
212 | endif | ||
213 | endif | ||
214 | |||
215 | -# i686 | ||
216 | -ifeq ($(ARCH), i686) | ||
217 | - ARCH_DATA_MODEL = 32 | ||
218 | - PLATFORM = linux-i586 | ||
219 | - VM_PLATFORM = linux_i486 | ||
220 | - HS_ARCH = x86 | ||
221 | -endif | ||
222 | - | ||
223 | JDK_INCLUDE_SUBDIR=linux | ||
224 | |||
225 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
226 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
227 | index 0a9f75b..2e29bb9 100644 | ||
228 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
229 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
230 | @@ -30,7 +30,7 @@ CC = cc | ||
231 | AS = $(CC) -c | ||
232 | |||
233 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
234 | -ARCHFLAG/i486 = -m32 | ||
235 | +ARCHFLAG/x86 = -m32 | ||
236 | ARCHFLAG/amd64 = -m64 | ||
237 | |||
238 | CFLAGS += $(ARCHFLAG) | ||
239 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
240 | deleted file mode 100644 | ||
241 | index 610ac91..0000000 | ||
242 | --- openjdk/hotspot/make/linux/platform_i486 | ||
243 | +++ /dev/null | ||
244 | @@ -1,15 +0,0 @@ | ||
245 | -os_family = linux | ||
246 | - | ||
247 | -arch = x86 | ||
248 | - | ||
249 | -arch_model = x86_32 | ||
250 | - | ||
251 | -os_arch = linux_x86 | ||
252 | - | ||
253 | -os_arch_model = linux_x86_32 | ||
254 | - | ||
255 | -lib_arch = i386 | ||
256 | - | ||
257 | -compiler = gcc | ||
258 | - | ||
259 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
260 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
261 | index 325a3fe..717fc75 100644 | ||
262 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
263 | +++ openjdk/hotspot/make/linux/platform_i486.suncc | ||
264 | @@ -8,10 +8,10 @@ os_arch = linux_x86 | ||
265 | |||
266 | os_arch_model = linux_x86_32 | ||
267 | |||
268 | -lib_arch = i386 | ||
269 | +lib_arch = x86 | ||
270 | |||
271 | compiler = sparcWorks | ||
272 | |||
273 | -gnu_dis_arch = i386 | ||
274 | +gnu_dis_arch = x86 | ||
275 | |||
276 | sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
277 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
278 | new file mode 100644 | ||
279 | index 0000000..5c613fe | ||
280 | --- /dev/null | ||
281 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
282 | @@ -0,0 +1,15 @@ | ||
283 | +os_family = linux | ||
284 | + | ||
285 | +arch = x86 | ||
286 | + | ||
287 | +arch_model = x86_32 | ||
288 | + | ||
289 | +os_arch = linux_x86 | ||
290 | + | ||
291 | +os_arch_model = linux_x86_32 | ||
292 | + | ||
293 | +lib_arch = x86 | ||
294 | + | ||
295 | +compiler = gcc | ||
296 | + | ||
297 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
298 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
299 | index b2b3162..a4bbe70 100644 | ||
300 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
301 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
302 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
303 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
304 | #ifdef __ia64__ | ||
305 | #define SYS_gettid 1105 | ||
306 | -#elif __i386__ | ||
307 | +#elif __x86__ | ||
308 | #define SYS_gettid 224 | ||
309 | #elif __amd64__ | ||
310 | #define SYS_gettid 186 | ||
311 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
312 | #elif defined(IA64) | ||
313 | static char cpu_arch[] = "ia64"; | ||
314 | #elif defined(IA32) | ||
315 | -static char cpu_arch[] = "i386"; | ||
316 | +static char cpu_arch[] = "x86"; | ||
317 | #elif defined(AMD64) | ||
318 | static char cpu_arch[] = "amd64"; | ||
319 | #elif defined(SPARC) | ||
320 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
321 | index 6bdf4b8..fd43c6e 100644 | ||
322 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
323 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
324 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
325 | endif | ||
326 | |||
327 | # Default arch; it is changed below as needed. | ||
328 | -ARCH = i386 | ||
329 | +ARCH = x86 | ||
330 | OS = $(shell uname) | ||
331 | |||
332 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
333 | @@ -87,7 +87,7 @@ endif # SunOS | ||
334 | LIBARCH = $(ARCH) | ||
335 | ifdef LP64 | ||
336 | LIBARCH64/sparc = sparcv9 | ||
337 | -LIBARCH64/i386 = amd64 | ||
338 | +LIBARCH64/x86 = amd64 | ||
339 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
340 | ifneq ($(LIBARCH64),) | ||
341 | LIBARCH = $(LIBARCH64) | ||
342 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
343 | index 75b7efe..62c692b 100644 | ||
344 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
345 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
346 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
347 | else | ||
348 | disassembler_usage(stderr); /* better than nothing */ | ||
349 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
350 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
351 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
352 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
353 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
354 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
355 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
356 | #endif | ||
357 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
358 | static const char* native_arch_name() { | ||
359 | const char* res = HOTSPOT_LIB_ARCH; | ||
360 | #ifdef LIBARCH_amd64 | ||
361 | - res = "i386:x86-64"; | ||
362 | + res = "x86:x86-64"; | ||
363 | #endif | ||
364 | #ifdef LIBARCH_sparc | ||
365 | res = "sparc:v8plusb"; | ||
366 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
367 | index 2596d85..c2f3eb9 100644 | ||
368 | --- openjdk/hotspot/test/Makefile | ||
369 | +++ openjdk/hotspot/test/Makefile | ||
370 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
371 | PLATFORM = solaris | ||
372 | ARCH = $(shell uname -p) | ||
373 | ifeq ($(ARCH), i386) | ||
374 | - ARCH=i586 | ||
375 | + ARCH=x86 | ||
376 | endif | ||
377 | endif | ||
378 | ifeq ($(OSNAME), Linux) | ||
379 | PLATFORM = linux | ||
380 | ARCH = $(shell uname -m) | ||
381 | - ifeq ($(ARCH), i386) | ||
382 | - ARCH = i586 | ||
383 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
384 | + ARCH = x86 | ||
385 | endif | ||
386 | endif | ||
387 | ifeq ($(OSNAME), Windows_NT) | ||
388 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
389 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
390 | ARCH = x64 | ||
391 | else | ||
392 | - ARCH = i586 | ||
393 | + ARCH = x86 | ||
394 | endif | ||
395 | endif | ||
396 | endif | ||
397 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
398 | index 38e0f78..64c8410 100644 | ||
399 | --- openjdk/hotspot/agent/make/saenv.sh | ||
400 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
401 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
402 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
403 | CPU=amd64 | ||
404 | else | ||
405 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
406 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
407 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
408 | - CPU=i386 | ||
409 | + CPU=x86 | ||
410 | fi | ||
411 | else | ||
412 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
413 | diff --git openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
414 | index c4ca7de..54c12ca 100644 | ||
415 | --- openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
416 | +++ openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
417 | @@ -29,7 +29,7 @@ | ||
418 | #define amd64 1 | ||
419 | #endif | ||
420 | |||
421 | -#ifdef i386 | ||
422 | +#ifdef x86 | ||
423 | #include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h" | ||
424 | #endif | ||
425 | |||
426 | @@ -295,7 +295,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
427 | } | ||
428 | |||
429 | #undef NPRGREG | ||
430 | -#ifdef i386 | ||
431 | +#ifdef x86 | ||
432 | #define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG | ||
433 | #endif | ||
434 | #ifdef ia64 | ||
435 | @@ -314,7 +314,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
436 | |||
437 | #undef REG_INDEX | ||
438 | |||
439 | -#ifdef i386 | ||
440 | +#ifdef x86 | ||
441 | #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg | ||
442 | |||
443 | regs[REG_INDEX(GS)] = (uintptr_t) gregs.xgs; | ||
444 | @@ -333,7 +333,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
445 | regs[REG_INDEX(CS)] = (uintptr_t) gregs.xcs; | ||
446 | regs[REG_INDEX(SS)] = (uintptr_t) gregs.xss; | ||
447 | |||
448 | -#endif /* i386 */ | ||
449 | +#endif /* x86 */ | ||
450 | |||
451 | #if ia64 | ||
452 | regs = (*env)->GetLongArrayElements(env, array, &isCopy); | ||
453 | diff --git openjdk/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile | ||
454 | index a16f3a7..85fecb1 100644 | ||
455 | --- openjdk/hotspot/agent/src/os/linux/Makefile | ||
456 | +++ openjdk/hotspot/agent/src/os/linux/Makefile | ||
457 | @@ -22,7 +22,7 @@ | ||
458 | # | ||
459 | # | ||
460 | |||
461 | -ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) | ||
462 | +ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo x86 ; fi ) | ||
463 | GCC = gcc$(GCC_SUFFIX) | ||
464 | |||
465 | JAVAH = ${JAVA_HOME}/bin/javah | ||
466 | diff --git openjdk/hotspot/agent/src/os/linux/ps_core.c openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
467 | index 3562f2d..47ab01b 100644 | ||
468 | --- openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
469 | +++ openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
470 | @@ -540,7 +540,7 @@ static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size | ||
471 | |||
472 | if (is_debug()) { | ||
473 | print_debug("integer regset\n"); | ||
474 | -#ifdef i386 | ||
475 | +#ifdef x86 | ||
476 | // print the regset | ||
477 | print_debug("\teax = 0x%x\n", newthr->regs.eax); | ||
478 | print_debug("\tebx = 0x%x\n", newthr->regs.ebx); | ||
479 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
480 | index 83ddd1a..c20c7eb 100644 | ||
481 | --- openjdk/hotspot/make/defs.make | ||
482 | +++ openjdk/hotspot/make/defs.make | ||
483 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
484 | ifdef LP64 | ||
485 | BUILDARCH = amd64 | ||
486 | else | ||
487 | - BUILDARCH = i486 | ||
488 | + BUILDARCH = x86 | ||
489 | endif | ||
490 | endif | ||
491 | ifeq ($(BUILDARCH), sparc) | ||
492 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
493 | |||
494 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
495 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
496 | - LIBARCH/i486 = i386 | ||
497 | + LIBARCH/x86 = x86 | ||
498 | LIBARCH/amd64 = amd64 | ||
499 | LIBARCH/sparc = sparc | ||
500 | LIBARCH/sparcv9 = sparcv9 | ||
501 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
502 | index bc82543..4a1ef4e 100644 | ||
503 | --- openjdk/hotspot/make/jprt.config | ||
504 | +++ openjdk/hotspot/make/jprt.config | ||
505 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
506 | # LINUX: X86, AMD64 | ||
507 | osarch=`uname -m` | ||
508 | if [ "${osarch}" = i686 ] ; then | ||
509 | - linux_arch=i586 | ||
510 | + linux_arch=x86 | ||
511 | elif [ "${osarch}" = x86_64 ] ; then | ||
512 | linux_arch=amd64 | ||
513 | fi | ||
514 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
515 | index eb2ce82..7193de0 100644 | ||
516 | --- openjdk/hotspot/make/jprt.properties | ||
517 | +++ openjdk/hotspot/make/jprt.properties | ||
518 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
519 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
520 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
521 | |||
522 | -jprt.my.linux.i586=linux_i586 | ||
523 | +jprt.my.linux.x86=linux_x86 | ||
524 | jprt.my.linux.x64=linux_x64 | ||
525 | jprt.my.windows.i586=windows_i586 | ||
526 | jprt.my.windows.x64=windows_x64 | ||
527 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
528 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
529 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
530 | |||
531 | -jprt.my.linux.i586.test.targets = \ | ||
532 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
533 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
534 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
535 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
536 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
537 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
538 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
539 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
540 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
541 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
542 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
543 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
544 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
545 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
546 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
547 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
548 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
549 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
550 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
551 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
552 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
553 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
554 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
555 | +jprt.my.linux.x86.test.targets = \ | ||
556 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
557 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
558 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
559 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
560 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
561 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
562 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
563 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
564 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
565 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
566 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
567 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
568 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
569 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
570 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
571 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
572 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
573 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
574 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
575 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
576 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
577 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
578 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
579 | |||
580 | jprt.my.linux.x64.test.targets = \ | ||
581 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
582 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
583 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
584 | ${jprt.my.solaris.i586.test.targets}, \ | ||
585 | ${jprt.my.solaris.x64.test.targets}, \ | ||
586 | - ${jprt.my.linux.i586.test.targets}, \ | ||
587 | + ${jprt.my.linux.x86.test.targets}, \ | ||
588 | ${jprt.my.linux.x64.test.targets}, \ | ||
589 | ${jprt.my.windows.i586.test.targets}, \ | ||
590 | ${jprt.my.windows.x64.test.targets} | ||
591 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
592 | index e317fdd..5d3b1ff 100644 | ||
593 | --- openjdk/hotspot/make/linux/build.sh | ||
594 | +++ openjdk/hotspot/make/linux/build.sh | ||
595 | @@ -43,7 +43,7 @@ esac | ||
596 | |||
597 | case `uname -m` in | ||
598 | i386|i486|i586|i686) | ||
599 | - mach=i386 | ||
600 | + mach=x86 | ||
601 | ;; | ||
602 | *) | ||
603 | echo "Unsupported machine: " `uname -m` | ||
604 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
605 | index add9823..cbbf81f 100644 | ||
606 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
607 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
608 | @@ -30,7 +30,7 @@ | ||
609 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
610 | # environment or on the command-line: | ||
611 | # | ||
612 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
613 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
614 | # BUILDARCH - build directory | ||
615 | # LIBARCH - the corresponding directory in JDK/JRE | ||
616 | # GAMMADIR - top of workspace | ||
617 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
618 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
619 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
620 | |||
621 | -DATA_MODE/i486 = 32 | ||
622 | +DATA_MODE/x86 = 32 | ||
623 | DATA_MODE/sparc = 32 | ||
624 | DATA_MODE/sparcv9 = 64 | ||
625 | DATA_MODE/amd64 = 64 | ||
626 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
627 | index 113d4f8..d3f06cb 100644 | ||
628 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
629 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
630 | @@ -78,7 +78,7 @@ endif | ||
631 | # Processor-specific files for other processors are excluded by default. Use | ||
632 | # CS_CPU=x to include platform-specific files for other platforms. | ||
633 | ifndef CS_CPU | ||
634 | -CS_CPU = i486 sparc amd64 ia64 | ||
635 | +CS_CPU = x86 sparc amd64 ia64 | ||
636 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
637 | endif | ||
638 | |||
639 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
640 | index 9131c79..138dfb3 100644 | ||
641 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
642 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
643 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
644 | HS_ARCH = sparc | ||
645 | endif | ||
646 | |||
647 | +# x86 | ||
648 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
649 | + ARCH_DATA_MODEL = 32 | ||
650 | + PLATFORM = linux-x86 | ||
651 | + VM_PLATFORM = linux_x86 | ||
652 | + HS_ARCH = x86 | ||
653 | +endif | ||
654 | + | ||
655 | # x86_64 | ||
656 | ifeq ($(ARCH), x86_64) | ||
657 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
658 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
659 | HS_ARCH = x86 | ||
660 | else | ||
661 | ARCH_DATA_MODEL = 32 | ||
662 | - PLATFORM = linux-i586 | ||
663 | - VM_PLATFORM = linux_i486 | ||
664 | + PLATFORM = linux-x86 | ||
665 | + VM_PLATFORM = linux_x86 | ||
666 | HS_ARCH = x86 | ||
667 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
668 | - ARCH = i686 | ||
669 | endif | ||
670 | endif | ||
671 | |||
672 | -# i686 | ||
673 | -ifeq ($(ARCH), i686) | ||
674 | - ARCH_DATA_MODEL = 32 | ||
675 | - PLATFORM = linux-i586 | ||
676 | - VM_PLATFORM = linux_i486 | ||
677 | - HS_ARCH = x86 | ||
678 | -endif | ||
679 | - | ||
680 | JDK_INCLUDE_SUBDIR=linux | ||
681 | |||
682 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
683 | diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make | ||
684 | index a2c24bc..27bad01 100644 | ||
685 | --- openjdk/hotspot/make/linux/makefiles/gcc.make | ||
686 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make | ||
687 | @@ -77,7 +77,7 @@ CFLAGS += -fcheck-new | ||
688 | CFLAGS += -g | ||
689 | |||
690 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
691 | -ARCHFLAG/i486 = -m32 -march=i586 | ||
692 | +ARCHFLAG/x86 = -m32 | ||
693 | ARCHFLAG/amd64 = -m64 | ||
694 | ARCHFLAG/ia64 = | ||
695 | ARCHFLAG/sparc = -m32 -mcpu=v9 | ||
696 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
697 | index 0a9f75b..2e29bb9 100644 | ||
698 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
699 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
700 | @@ -30,7 +30,7 @@ CC = cc | ||
701 | AS = $(CC) -c | ||
702 | |||
703 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
704 | -ARCHFLAG/i486 = -m32 | ||
705 | +ARCHFLAG/x86 = -m32 | ||
706 | ARCHFLAG/amd64 = -m64 | ||
707 | |||
708 | CFLAGS += $(ARCHFLAG) | ||
709 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
710 | deleted file mode 100644 | ||
711 | index 610ac91..0000000 | ||
712 | --- openjdk/hotspot/make/linux/platform_i486 | ||
713 | +++ /dev/null | ||
714 | @@ -1,15 +0,0 @@ | ||
715 | -os_family = linux | ||
716 | - | ||
717 | -arch = x86 | ||
718 | - | ||
719 | -arch_model = x86_32 | ||
720 | - | ||
721 | -os_arch = linux_x86 | ||
722 | - | ||
723 | -os_arch_model = linux_x86_32 | ||
724 | - | ||
725 | -lib_arch = i386 | ||
726 | - | ||
727 | -compiler = gcc | ||
728 | - | ||
729 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
730 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
731 | deleted file mode 100644 | ||
732 | index 325a3fe..0000000 | ||
733 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
734 | +++ /dev/null | ||
735 | @@ -1,17 +0,0 @@ | ||
736 | -os_family = linux | ||
737 | - | ||
738 | -arch = x86 | ||
739 | - | ||
740 | -arch_model = x86_32 | ||
741 | - | ||
742 | -os_arch = linux_x86 | ||
743 | - | ||
744 | -os_arch_model = linux_x86_32 | ||
745 | - | ||
746 | -lib_arch = i386 | ||
747 | - | ||
748 | -compiler = sparcWorks | ||
749 | - | ||
750 | -gnu_dis_arch = i386 | ||
751 | - | ||
752 | -sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
753 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
754 | new file mode 100644 | ||
755 | index 0000000..5c613fe | ||
756 | --- /dev/null | ||
757 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
758 | @@ -0,0 +1,15 @@ | ||
759 | +os_family = linux | ||
760 | + | ||
761 | +arch = x86 | ||
762 | + | ||
763 | +arch_model = x86_32 | ||
764 | + | ||
765 | +os_arch = linux_x86 | ||
766 | + | ||
767 | +os_arch_model = linux_x86_32 | ||
768 | + | ||
769 | +lib_arch = x86 | ||
770 | + | ||
771 | +compiler = gcc | ||
772 | + | ||
773 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
774 | diff --git openjdk/hotspot/make/linux/platform_x86.suncc openjdk/hotspot/make/linux/platform_x86.suncc | ||
775 | new file mode 100644 | ||
776 | index 0000000..717fc75 | ||
777 | --- /dev/null | ||
778 | +++ openjdk/hotspot/make/linux/platform_x86.suncc | ||
779 | @@ -0,0 +1,17 @@ | ||
780 | +os_family = linux | ||
781 | + | ||
782 | +arch = x86 | ||
783 | + | ||
784 | +arch_model = x86_32 | ||
785 | + | ||
786 | +os_arch = linux_x86 | ||
787 | + | ||
788 | +os_arch_model = linux_x86_32 | ||
789 | + | ||
790 | +lib_arch = x86 | ||
791 | + | ||
792 | +compiler = sparcWorks | ||
793 | + | ||
794 | +gnu_dis_arch = x86 | ||
795 | + | ||
796 | +sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
797 | diff --git openjdk/hotspot/src/os/linux/launcher/java_md.c openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
798 | index 50a86cd..48141be 100644 | ||
799 | --- openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
800 | +++ openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
801 | @@ -56,8 +56,8 @@ | ||
802 | * models is supported, then DUAL_MODE is defined. When DUAL_MODE is | ||
803 | * defined, the architecture names for the narrow and wide version of | ||
804 | * the architecture are defined in BIG_ARCH and SMALL_ARCH. Currently | ||
805 | - * only Solaris on sparc/sparcv9 and i586/amd64 is DUAL_MODE; linux | ||
806 | - * i586/amd64 could be defined as DUAL_MODE but that is not the | ||
807 | + * only Solaris on sparc/sparcv9 and x86/amd64 is DUAL_MODE; linux | ||
808 | + * x86/amd64 could be defined as DUAL_MODE but that is not the | ||
809 | * current policy. | ||
810 | */ | ||
811 | |||
812 | @@ -75,8 +75,8 @@ | ||
813 | |||
814 | #else /* 32-bit data model */ | ||
815 | |||
816 | -# ifdef i586 | ||
817 | -# define ARCH "i386" | ||
818 | +# ifdef x86 | ||
819 | +# define ARCH "x86" | ||
820 | # elif defined(__sparc) | ||
821 | # define ARCH "sparc" | ||
822 | # endif | ||
823 | @@ -90,7 +90,7 @@ | ||
824 | # define SMALL_ARCH "sparc" | ||
825 | # else | ||
826 | # define BIG_ARCH "amd64" | ||
827 | -# define SMALL_ARCH "i386" | ||
828 | +# define SMALL_ARCH "x86" | ||
829 | # endif | ||
830 | # include <sys/systeminfo.h> | ||
831 | # include <sys/elf.h> | ||
832 | @@ -1103,7 +1103,7 @@ void PrintMachineDependentOptions() { | ||
833 | * This code is somewhat more confused with #ifdef's than we'd | ||
834 | * like because this file is used by both Solaris and Linux | ||
835 | * platforms, and so needs to be parameterized for SPARC and | ||
836 | - * i586 hardware. The other Linux platforms (amd64 and ia64) | ||
837 | + * x86 hardware. The other Linux platforms (amd64 and ia64) | ||
838 | * don't even ask this question, because they only come with | ||
839 | * server JVMs. */ | ||
840 | |||
841 | @@ -1168,11 +1168,11 @@ solaris_sparc_ServerClassMachine(void) { | ||
842 | |||
843 | #endif /* __sun && __sparc */ | ||
844 | |||
845 | -#if defined(__sun) && defined(i586) | ||
846 | +#if defined(__sun) && defined(x86) | ||
847 | |||
848 | /* | ||
849 | * A utility method for asking the CPU about itself. | ||
850 | - * There's a corresponding version of linux-i586 | ||
851 | + * There's a corresponding version of linux-x86 | ||
852 | * because the compilers are different. | ||
853 | */ | ||
854 | void | ||
855 | @@ -1218,13 +1218,13 @@ get_cpuid(uint32_t arg, | ||
856 | #endif | ||
857 | } | ||
858 | |||
859 | -#endif /* __sun && i586 */ | ||
860 | +#endif /* __sun && x86 */ | ||
861 | |||
862 | -#if defined(__linux__) && defined(i586) | ||
863 | +#if defined(__linux__) && defined(x86) | ||
864 | |||
865 | /* | ||
866 | * A utility method for asking the CPU about itself. | ||
867 | - * There's a corresponding version of solaris-i586 | ||
868 | + * There's a corresponding version of solaris-x86 | ||
869 | * because the compilers are different. | ||
870 | */ | ||
871 | void | ||
872 | @@ -1286,11 +1286,11 @@ get_cpuid(uint32_t arg, | ||
873 | #endif | ||
874 | } | ||
875 | |||
876 | -#endif /* __linux__ && i586 */ | ||
877 | +#endif /* __linux__ && x86 */ | ||
878 | |||
879 | -#ifdef i586 | ||
880 | +#ifdef x86 | ||
881 | /* | ||
882 | - * Routines shared by solaris-i586 and linux-i586. | ||
883 | + * Routines shared by solaris-x86 and linux-x86. | ||
884 | */ | ||
885 | |||
886 | enum HyperThreadingSupport_enum { | ||
887 | @@ -1430,11 +1430,11 @@ physical_processors(void) { | ||
888 | return result; | ||
889 | } | ||
890 | |||
891 | -#endif /* i586 */ | ||
892 | +#endif /* x86 */ | ||
893 | |||
894 | -#if defined(__sun) && defined(i586) | ||
895 | +#if defined(__sun) && defined(x86) | ||
896 | |||
897 | -/* The definition of a server-class machine for solaris-i586/amd64 */ | ||
898 | +/* The definition of a server-class machine for solaris-x86/amd64 */ | ||
899 | jboolean | ||
900 | solaris_i586_ServerClassMachine(void) { | ||
901 | jboolean result = JNI_FALSE; | ||
902 | @@ -1463,11 +1463,11 @@ solaris_i586_ServerClassMachine(void) { | ||
903 | return result; | ||
904 | } | ||
905 | |||
906 | -#endif /* __sun && i586 */ | ||
907 | +#endif /* __sun && x86 */ | ||
908 | |||
909 | -#if defined(__linux__) && defined(i586) | ||
910 | +#if defined(__linux__) && defined(x86) | ||
911 | |||
912 | -/* The definition of a server-class machine for linux-i586 */ | ||
913 | +/* The definition of a server-class machine for linux-x86 */ | ||
914 | jboolean | ||
915 | linux_i586_ServerClassMachine(void) { | ||
916 | jboolean result = JNI_FALSE; | ||
917 | @@ -1496,7 +1496,7 @@ linux_i586_ServerClassMachine(void) { | ||
918 | return result; | ||
919 | } | ||
920 | |||
921 | -#endif /* __linux__ && i586 */ | ||
922 | +#endif /* __linux__ && x86 */ | ||
923 | |||
924 | /* Dispatch to the platform-specific definition of "server-class" */ | ||
925 | jboolean | ||
926 | @@ -1504,9 +1504,9 @@ ServerClassMachine(void) { | ||
927 | jboolean result = JNI_FALSE; | ||
928 | #if defined(__sun) && defined(__sparc) | ||
929 | result = solaris_sparc_ServerClassMachine(); | ||
930 | -#elif defined(__sun) && defined(i586) | ||
931 | +#elif defined(__sun) && defined(x86) | ||
932 | result = solaris_i586_ServerClassMachine(); | ||
933 | -#elif defined(__linux__) && defined(i586) | ||
934 | +#elif defined(__linux__) && defined(x86) | ||
935 | result = linux_i586_ServerClassMachine(); | ||
936 | #else | ||
937 | if (_launcher_debug) { | ||
938 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
939 | index b2b3162..a4bbe70 100644 | ||
940 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
941 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
942 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
943 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
944 | #ifdef __ia64__ | ||
945 | #define SYS_gettid 1105 | ||
946 | -#elif __i386__ | ||
947 | +#elif __x86__ | ||
948 | #define SYS_gettid 224 | ||
949 | #elif __amd64__ | ||
950 | #define SYS_gettid 186 | ||
951 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
952 | #elif defined(IA64) | ||
953 | static char cpu_arch[] = "ia64"; | ||
954 | #elif defined(IA32) | ||
955 | -static char cpu_arch[] = "i386"; | ||
956 | +static char cpu_arch[] = "x86"; | ||
957 | #elif defined(AMD64) | ||
958 | static char cpu_arch[] = "amd64"; | ||
959 | #elif defined(SPARC) | ||
960 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
961 | index 6bdf4b8..fd43c6e 100644 | ||
962 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
963 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
964 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
965 | endif | ||
966 | |||
967 | # Default arch; it is changed below as needed. | ||
968 | -ARCH = i386 | ||
969 | +ARCH = x86 | ||
970 | OS = $(shell uname) | ||
971 | |||
972 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
973 | @@ -87,7 +87,7 @@ endif # SunOS | ||
974 | LIBARCH = $(ARCH) | ||
975 | ifdef LP64 | ||
976 | LIBARCH64/sparc = sparcv9 | ||
977 | -LIBARCH64/i386 = amd64 | ||
978 | +LIBARCH64/x86 = amd64 | ||
979 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
980 | ifneq ($(LIBARCH64),) | ||
981 | LIBARCH = $(LIBARCH64) | ||
982 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
983 | index 75b7efe..62c692b 100644 | ||
984 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
985 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
986 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
987 | else | ||
988 | disassembler_usage(stderr); /* better than nothing */ | ||
989 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
990 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
991 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
992 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
993 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
994 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
995 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
996 | #endif | ||
997 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
998 | static const char* native_arch_name() { | ||
999 | const char* res = HOTSPOT_LIB_ARCH; | ||
1000 | #ifdef LIBARCH_amd64 | ||
1001 | - res = "i386:x86-64"; | ||
1002 | + res = "x86:x86-64"; | ||
1003 | #endif | ||
1004 | #ifdef LIBARCH_sparc | ||
1005 | res = "sparc:v8plusb"; | ||
1006 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/i486.ad openjdk/hotspot/src/share/vm/adlc/Test/i486.ad | ||
1007 | deleted file mode 100644 | ||
1008 | index e69de29..0000000 | ||
1009 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/x86.ad openjdk/hotspot/src/share/vm/adlc/Test/x86.ad | ||
1010 | new file mode 100644 | ||
1011 | index 0000000..e69de29 | ||
1012 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
1013 | index 2596d85..c2f3eb9 100644 | ||
1014 | --- openjdk/hotspot/test/Makefile | ||
1015 | +++ openjdk/hotspot/test/Makefile | ||
1016 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
1017 | PLATFORM = solaris | ||
1018 | ARCH = $(shell uname -p) | ||
1019 | ifeq ($(ARCH), i386) | ||
1020 | - ARCH=i586 | ||
1021 | + ARCH=x86 | ||
1022 | endif | ||
1023 | endif | ||
1024 | ifeq ($(OSNAME), Linux) | ||
1025 | PLATFORM = linux | ||
1026 | ARCH = $(shell uname -m) | ||
1027 | - ifeq ($(ARCH), i386) | ||
1028 | - ARCH = i586 | ||
1029 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
1030 | + ARCH = x86 | ||
1031 | endif | ||
1032 | endif | ||
1033 | ifeq ($(OSNAME), Windows_NT) | ||
1034 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
1035 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
1036 | ARCH = x64 | ||
1037 | else | ||
1038 | - ARCH = i586 | ||
1039 | + ARCH = x86 | ||
1040 | endif | ||
1041 | endif | ||
1042 | endif | ||
1043 | -- | ||
1044 | 1.6.5 | ||
1045 | |||
1046 | diff --git openjdk/hotspot/make/linux/makefiles/i486.make b/hotspot/make/linux/makefiles/i486.make | ||
1047 | deleted file mode 100644 | ||
1048 | index 9dd0b44..0000000 | ||
1049 | --- openjdk/hotspot/make/linux/makefiles/i486.make | ||
1050 | +++ /dev/null | ||
1051 | @@ -1,36 +0,0 @@ | ||
1052 | -# | ||
1053 | -# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1054 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1055 | -# | ||
1056 | -# This code is free software; you can redistribute it and/or modify it | ||
1057 | -# under the terms of the GNU General Public License version 2 only, as | ||
1058 | -# published by the Free Software Foundation. | ||
1059 | -# | ||
1060 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1061 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1062 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1063 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
1064 | -# accompanied this code). | ||
1065 | -# | ||
1066 | -# You should have received a copy of the GNU General Public License version | ||
1067 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
1068 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1069 | -# | ||
1070 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1071 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1072 | -# have any questions. | ||
1073 | -# | ||
1074 | -# | ||
1075 | - | ||
1076 | -# TLS helper, assembled from .s file | ||
1077 | -# Not included in includeDB because it has no dependencies | ||
1078 | -Obj_Files += linux_x86_32.o | ||
1079 | - | ||
1080 | -# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1081 | -OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1082 | -# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1083 | -OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1084 | -# Must also specify if CPU is little endian | ||
1085 | -CFLAGS += -DVM_LITTLE_ENDIAN | ||
1086 | - | ||
1087 | -OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1088 | diff --git openjdk/hotspot/make/linux/makefiles/x86.make openjdk/hotspot/make/linux/makefiles/x86.make | ||
1089 | new file mode 100644 | ||
1090 | index 0000000..9dd0b44 | ||
1091 | --- /dev/null | ||
1092 | +++ openjdk/hotspot/make/linux/makefiles/x86.make | ||
1093 | @@ -0,0 +1,36 @@ | ||
1094 | +# | ||
1095 | +# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1096 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1097 | +# | ||
1098 | +# This code is free software; you can redistribute it and/or modify it | ||
1099 | +# under the terms of the GNU General Public License version 2 only, as | ||
1100 | +# published by the Free Software Foundation. | ||
1101 | +# | ||
1102 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1103 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1104 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1105 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
1106 | +# accompanied this code). | ||
1107 | +# | ||
1108 | +# You should have received a copy of the GNU General Public License version | ||
1109 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
1110 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1111 | +# | ||
1112 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1113 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1114 | +# have any questions. | ||
1115 | +# | ||
1116 | +# | ||
1117 | + | ||
1118 | +# TLS helper, assembled from .s file | ||
1119 | +# Not included in includeDB because it has no dependencies | ||
1120 | +Obj_Files += linux_x86_32.o | ||
1121 | + | ||
1122 | +# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1123 | +OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1124 | +# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1125 | +OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1126 | +# Must also specify if CPU is little endian | ||
1127 | +CFLAGS += -DVM_LITTLE_ENDIAN | ||
1128 | + | ||
1129 | +OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1130 | |||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-sane-x86-arch.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-sane-x86-arch.patch new file mode 100644 index 0000000..af8b33e --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-sane-x86-arch.patch | |||
@@ -0,0 +1,216 @@ | |||
1 | From 662e11a8b6017f39ceb6d00dcdbfe11473b56174 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Fri, 23 Oct 2009 18:06:43 +0200 | ||
4 | Subject: [PATCH] sane-arch2 | ||
5 | |||
6 | --- | ||
7 | openjdk/jdk/make/common/shared/Compiler-gcc.gmk | 4 ++-- | ||
8 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | Index: openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
11 | =================================================================== | ||
12 | --- openjdk/jdk/make/common/shared/Compiler-gcc.gmk.orig 2010-04-22 12:04:08.000000000 +0200 | ||
13 | +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2010-04-22 12:13:53.335169757 +0200 | ||
14 | @@ -85,8 +85,8 @@ | ||
15 | REQUIRED_CC_VER = 3.2 | ||
16 | REQUIRED_GCC_VER = 3.2.* | ||
17 | endif | ||
18 | - ifeq ($(ARCH), i586) | ||
19 | - # i586 | ||
20 | + ifeq ($(ARCH), x86) | ||
21 | + # x86 | ||
22 | REQUIRED_CC_VER = 3.2 | ||
23 | REQUIRED_GCC_VER = 3.2.1* | ||
24 | REQUIRED_GCC_VER_INT = 3.2.1-7a | ||
25 | Index: openjdk/jdk/src/solaris/bin/i586/jvm.cfg | ||
26 | =================================================================== | ||
27 | --- openjdk/jdk/src/solaris/bin/i586/jvm.cfg 2010-02-17 04:14:46.000000000 +0100 | ||
28 | +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
29 | @@ -1,38 +0,0 @@ | ||
30 | -# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
31 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
32 | -# | ||
33 | -# This code is free software; you can redistribute it and/or modify it | ||
34 | -# under the terms of the GNU General Public License version 2 only, as | ||
35 | -# published by the Free Software Foundation. Sun designates this | ||
36 | -# particular file as subject to the "Classpath" exception as provided | ||
37 | -# by Sun in the LICENSE file that accompanied this code. | ||
38 | -# | ||
39 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
40 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
41 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
42 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
43 | -# accompanied this code). | ||
44 | -# | ||
45 | -# You should have received a copy of the GNU General Public License version | ||
46 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
47 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
48 | -# | ||
49 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
50 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
51 | -# have any questions. | ||
52 | -# | ||
53 | -# List of JVMs that can be used as an option to java, javac, etc. | ||
54 | -# Order is important -- first in this list is the default JVM. | ||
55 | -# NOTE that this both this file and its format are UNSUPPORTED and | ||
56 | -# WILL GO AWAY in a future release. | ||
57 | -# | ||
58 | -# You may also select a JVM in an arbitrary location with the | ||
59 | -# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
60 | -# and may not be available in a future release. | ||
61 | -# | ||
62 | --client IF_SERVER_CLASS -server | ||
63 | --server KNOWN | ||
64 | --hotspot ALIASED_TO -client | ||
65 | --classic WARN | ||
66 | --native ERROR | ||
67 | --green ERROR | ||
68 | Index: openjdk/jdk/src/solaris/bin/x86/jvm.cfg | ||
69 | =================================================================== | ||
70 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
71 | +++ openjdk/jdk/src/solaris/bin/x86/jvm.cfg 2010-04-22 12:12:10.545603344 +0200 | ||
72 | @@ -0,0 +1,38 @@ | ||
73 | +# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
74 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
75 | +# | ||
76 | +# This code is free software; you can redistribute it and/or modify it | ||
77 | +# under the terms of the GNU General Public License version 2 only, as | ||
78 | +# published by the Free Software Foundation. Sun designates this | ||
79 | +# particular file as subject to the "Classpath" exception as provided | ||
80 | +# by Sun in the LICENSE file that accompanied this code. | ||
81 | +# | ||
82 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
83 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
84 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
85 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
86 | +# accompanied this code). | ||
87 | +# | ||
88 | +# You should have received a copy of the GNU General Public License version | ||
89 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
90 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
91 | +# | ||
92 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
93 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
94 | +# have any questions. | ||
95 | +# | ||
96 | +# List of JVMs that can be used as an option to java, javac, etc. | ||
97 | +# Order is important -- first in this list is the default JVM. | ||
98 | +# NOTE that this both this file and its format are UNSUPPORTED and | ||
99 | +# WILL GO AWAY in a future release. | ||
100 | +# | ||
101 | +# You may also select a JVM in an arbitrary location with the | ||
102 | +# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
103 | +# and may not be available in a future release. | ||
104 | +# | ||
105 | +-client IF_SERVER_CLASS -server | ||
106 | +-server KNOWN | ||
107 | +-hotspot ALIASED_TO -client | ||
108 | +-classic WARN | ||
109 | +-native ERROR | ||
110 | +-green ERROR | ||
111 | Index: openjdk/jdk/make/common/shared/Platform.gmk | ||
112 | =================================================================== | ||
113 | --- openjdk/jdk/make/common/shared/Platform.gmk.orig 2010-04-22 12:04:08.000000000 +0200 | ||
114 | +++ openjdk/jdk/make/common/shared/Platform.gmk 2010-04-22 12:16:43.848486263 +0200 | ||
115 | @@ -56,8 +56,8 @@ | ||
116 | # OS_VENDOR company name | ||
117 | # TEMP_DISK /tmp or C:/temp | ||
118 | # ARCH_DATA_MODEL 32 or 64 | ||
119 | -# ARCH sparc, sparcv9, i586, amd64, or ia64 | ||
120 | -# ARCH_FAMILY sparc or i586 | ||
121 | +# ARCH sparc, sparcv9, x86, amd64, or ia64 | ||
122 | +# ARCH_FAMILY sparc or x86 | ||
123 | # ARCHPROP sparc or x86 | ||
124 | # ARCH_VM_SUBDIR jre/bin, jre/lib/sparc, etc. | ||
125 | # LIBARCH sparc, sparcv9, i386, amd64, or ia64 | ||
126 | @@ -124,7 +124,7 @@ | ||
127 | processor := $(shell uname -p) | ||
128 | archExpr = case "$(processor)" in \ | ||
129 | i[3-9]86) \ | ||
130 | - echo i586 \ | ||
131 | + echo 586 \ | ||
132 | ;; \ | ||
133 | sparc*) \ | ||
134 | echo sparc \ | ||
135 | @@ -200,7 +200,7 @@ | ||
136 | endif | ||
137 | archExpr = case "$(mach)" in \ | ||
138 | i[3-9]86) \ | ||
139 | - echo i586 \ | ||
140 | + echo x86 \ | ||
141 | ;; \ | ||
142 | ia64) \ | ||
143 | echo ia64 \ | ||
144 | @@ -237,7 +237,7 @@ | ||
145 | ARCH=sparcv9 | ||
146 | endif | ||
147 | else | ||
148 | - # i586 is 32-bit, amd64 is 64-bit | ||
149 | + # x86 is 32-bit, amd64 is 64-bit | ||
150 | ifndef ARCH_DATA_MODEL | ||
151 | ifeq ($(ARCH), alpha) | ||
152 | ARCH_DATA_MODEL=64 | ||
153 | @@ -248,7 +248,7 @@ | ||
154 | ifeq ($(ARCH), arm) | ||
155 | ARCH_DATA_MODEL=32 | ||
156 | endif | ||
157 | - ifeq ($(ARCH), i586) | ||
158 | + ifeq ($(ARCH), x86) | ||
159 | ARCH_DATA_MODEL=32 | ||
160 | endif | ||
161 | ifeq ($(ARCH), ia64) | ||
162 | @@ -281,12 +281,7 @@ | ||
163 | endif | ||
164 | endif | ||
165 | |||
166 | - # Need to maintain the jre/lib/i386 location for 32-bit Intel | ||
167 | - ifeq ($(ARCH), i586) | ||
168 | - LIBARCH = i386 | ||
169 | - else | ||
170 | - LIBARCH = $(ARCH) | ||
171 | - endif | ||
172 | + LIBARCH = $(ARCH) | ||
173 | |||
174 | # Value of Java os.arch property | ||
175 | ARCHPROP = $(LIBARCH) | ||
176 | @@ -378,8 +373,8 @@ | ||
177 | REQUIRED_WINDOWS_VERSION=2000 or Unknown | ||
178 | #REQUIRED_WINDOWS_VERSION=XP Professional | ||
179 | # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel | ||
180 | - ARCH=i586 | ||
181 | - LIBARCH=i386 | ||
182 | + ARCH=x86 | ||
183 | + LIBARCH=x86 | ||
184 | # Value of Java os.arch property | ||
185 | ARCHPROP=x86 | ||
186 | endif | ||
187 | Index: icedtea6-1.8.11/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
188 | =================================================================== | ||
189 | --- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-11-12 18:26:21.867320576 +0100 | ||
190 | +++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-11-12 19:42:57.310058108 +0100 | ||
191 | @@ -36,7 +36,7 @@ | ||
192 | #define X_ALPHA 1 | ||
193 | #define X_AMD64 2 | ||
194 | #define X_ARM 3 | ||
195 | -#define X_I586 4 | ||
196 | +#define X_X86 4 | ||
197 | #define X_IA64 5 | ||
198 | #define X_M68K 6 | ||
199 | #define X_MIPS 7 | ||
200 | Index: icedtea6-1.8.11/openjdk-ecj/jdk/make/javax/sound/SoundDefs.gmk | ||
201 | =================================================================== | ||
202 | --- openjdk/jdk/make/javax/sound/SoundDefs.gmk 2011-11-12 18:26:21.870653670 +0100 | ||
203 | +++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2011-11-12 20:00:37.693679490 +0100 | ||
204 | @@ -70,9 +70,9 @@ | ||
205 | CPPFLAGS += -DX_ARCH=X_ARM | ||
206 | endif # ARCH arm | ||
207 | |||
208 | - ifeq ($(ARCH), i586) | ||
209 | - CPPFLAGS += -DX_ARCH=X_I586 | ||
210 | - endif # ARCH i586 | ||
211 | + ifeq ($(ARCH), x86) | ||
212 | + CPPFLAGS += -DX_ARCH=X_X86 | ||
213 | + endif # ARCH x86 | ||
214 | |||
215 | ifeq ($(ARCH), ia64) | ||
216 | CPPFLAGS += -DX_ARCH=X_IA64 | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-sane-x86-arch-name.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-sane-x86-arch-name.patch new file mode 100644 index 0000000..b4c6857 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-sane-x86-arch-name.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Index: icedtea6-1.8/acinclude.m4 | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/acinclude.m4 2010-04-10 21:58:40.000000000 +0200 | ||
4 | +++ icedtea6-1.8/acinclude.m4 2010-04-22 10:09:42.752587915 +0200 | ||
5 | @@ -9,11 +9,11 @@ | ||
6 | ARCHFLAG="-m64" | ||
7 | ;; | ||
8 | i?86) | ||
9 | - BUILD_ARCH_DIR=i586 | ||
10 | - INSTALL_ARCH_DIR=i386 | ||
11 | - JRE_ARCH_DIR=i386 | ||
12 | + BUILD_ARCH_DIR=x86 | ||
13 | + INSTALL_ARCH_DIR=x86 | ||
14 | + JRE_ARCH_DIR=x86 | ||
15 | ARCH_PREFIX=${LINUX32} | ||
16 | - CROSS_TARGET_ARCH=i386 | ||
17 | + CROSS_TARGET_ARCH=x86 | ||
18 | ARCHFLAG="-m32" | ||
19 | ;; | ||
20 | alpha*) | ||
21 | @@ -765,7 +765,7 @@ | ||
22 | ZERO_LIBARCH="${INSTALL_ARCH_DIR}" | ||
23 | dnl can't use AC_CHECK_SIZEOF on multilib | ||
24 | case "${ZERO_LIBARCH}" in | ||
25 | - i386|ppc|s390|sparc) | ||
26 | + x86|ppc|s390|sparc) | ||
27 | ZERO_BITSPERWORD=32 | ||
28 | ;; | ||
29 | amd64|ppc64|s390x|sparc64) | ||
30 | @@ -777,7 +777,7 @@ | ||
31 | esac | ||
32 | AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"]) | ||
33 | case "${ZERO_LIBARCH}" in | ||
34 | - i386) | ||
35 | + x86) | ||
36 | ZERO_ARCHDEF="IA32" | ||
37 | ;; | ||
38 | ppc*) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-unbreak-float.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-unbreak-float.patch new file mode 100644 index 0000000..9f875de --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-unbreak-float.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100 | ||
4 | +++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100 | ||
5 | @@ -27,13 +27,11 @@ | ||
6 | |||
7 | #include "jfdlibm.h" | ||
8 | |||
9 | -#ifdef __NEWVALID /* special setup for Sun test regime */ | ||
10 | #if defined(i386) || defined(i486) || \ | ||
11 | defined(intel) || defined(x86) || \ | ||
12 | defined(i86pc) || defined(_M_IA64) || defined(ia64) | ||
13 | #define _LITTLE_ENDIAN | ||
14 | #endif | ||
15 | -#endif | ||
16 | |||
17 | #ifdef _LITTLE_ENDIAN | ||
18 | #define __HI(x) *(1+(int*)&x) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8/build-hacks-native.patch b/recipes-core/icedtea/icedtea6-native-1.8/build-hacks-native.patch new file mode 100644 index 0000000..9432d03 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8/build-hacks-native.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Index: icedtea6-1.6.1/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.6.1.orig/Makefile.am 2009-12-24 11:38:06.582572265 +0100 | ||
4 | +++ icedtea6-1.6.1/Makefile.am 2009-12-24 11:57:27.159578486 +0100 | ||
5 | @@ -265,6 +265,10 @@ | ||
6 | FT2_LIB="$(FREETYPE2_LIBS)" \ | ||
7 | ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ | ||
8 | HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | JAVAC="" \ | ||
14 | RHINO_JAR="$(RHINO_JAR)" \ | ||
15 | JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8/disable-library-checks.patch b/recipes-core/icedtea/icedtea6-native-1.8/disable-library-checks.patch new file mode 100644 index 0000000..23b8bed --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8/disable-library-checks.patch | |||
@@ -0,0 +1,141 @@ | |||
1 | Index: icedtea6-1.7/configure.ac | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.7.orig/configure.ac 2010-01-26 04:52:18.000000000 +0100 | ||
4 | +++ icedtea6-1.7/configure.ac 2010-02-08 12:05:51.354556052 +0100 | ||
5 | @@ -205,9 +205,9 @@ | ||
6 | fi | ||
7 | |||
8 | dnl pkgconfig cannot be used to find these headers and libraries. | ||
9 | -AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
10 | - ,[AC_MSG_ERROR("CUPS headers were not found - | ||
11 | - try installing cups-devel.")]) | ||
12 | +#AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
13 | +# ,[AC_MSG_ERROR("CUPS headers were not found - | ||
14 | +# try installing cups-devel.")]) | ||
15 | AC_CHECK_HEADERS([X11/X.h],[] | ||
16 | ,[AC_MSG_ERROR("xorg headers were not found - | ||
17 | try installing xorg-x11-proto-devel.")]) | ||
18 | @@ -239,12 +239,12 @@ | ||
19 | AC_SUBST(XT_LIBS) | ||
20 | |||
21 | dnl Check for libXp headers and libraries. | ||
22 | -PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
23 | -if test "x${XP_FOUND}" = xno | ||
24 | -then | ||
25 | - AC_MSG_ERROR([Could not find Xp - \ | ||
26 | - Try installing libXp-devel.]) | ||
27 | -fi | ||
28 | +#PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
29 | +#if test "x${XP_FOUND}" = xno | ||
30 | +#then | ||
31 | +# AC_MSG_ERROR([Could not find Xp - \ | ||
32 | +# Try installing libXp-devel.]) | ||
33 | +#fi | ||
34 | AC_SUBST(XP_CFLAGS) | ||
35 | AC_SUBST(XP_LIBS) | ||
36 | |||
37 | @@ -258,16 +258,16 @@ | ||
38 | AC_SUBST(X11_CFLAGS) | ||
39 | AC_SUBST(X11_LIBS) | ||
40 | |||
41 | -dnl Check for libXinerama headers and libraries. | ||
42 | -PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
43 | - ,[XINERAMA_FOUND=no]) | ||
44 | -if test "x${XINERAMA_FOUND}" = xno | ||
45 | -then | ||
46 | - AC_MSG_ERROR([Could not find Xinerama - \ | ||
47 | - Try installing libXinerama-devel.]) | ||
48 | -fi | ||
49 | -AC_SUBST(XINERAMA_CFLAGS) | ||
50 | -AC_SUBST(XINERAMA_LIBS) | ||
51 | +#dnl Check for libXinerama headers and libraries. | ||
52 | +#PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
53 | +# ,[XINERAMA_FOUND=no]) | ||
54 | +#if test "x${XINERAMA_FOUND}" = xno | ||
55 | +#then | ||
56 | +# AC_MSG_ERROR([Could not find Xinerama - \ | ||
57 | +# Try installing libXinerama-devel.]) | ||
58 | +#fi | ||
59 | +#AC_SUBST(XINERAMA_CFLAGS) | ||
60 | +#AC_SUBST(XINERAMA_LIBS) | ||
61 | |||
62 | if test "x${ENABLE_XRENDER}" = "xyes" | ||
63 | then | ||
64 | @@ -341,26 +341,26 @@ | ||
65 | AC_CONFIG_FILES([tapset/jstack.stp]) | ||
66 | fi | ||
67 | |||
68 | -dnl Check for libpng headers and libraries. | ||
69 | -PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
70 | - ,[LIBPNG_FOUND=no]) | ||
71 | -if test "x${LIBPNG_FOUND}" = xno | ||
72 | -then | ||
73 | - AC_MSG_ERROR([Could not find libpng - \ | ||
74 | - Try installing libpng-devel.]) | ||
75 | -fi | ||
76 | -AC_SUBST(LIBPNG_CFLAGS) | ||
77 | -AC_SUBST(LIBPNG_LIBS) | ||
78 | - | ||
79 | -dnl Check for libXtst headers and libraries. | ||
80 | -PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
81 | -if test "x${XTST_FOUND}" = xno | ||
82 | -then | ||
83 | - AC_MSG_ERROR([Could not find Xtst - \ | ||
84 | - Try installing libXtst-devel.]) | ||
85 | -fi | ||
86 | -AC_SUBST(XTST_CFLAGS) | ||
87 | -AC_SUBST(XTST_LIBS) | ||
88 | +#dnl Check for libpng headers and libraries. | ||
89 | +#PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
90 | +# ,[LIBPNG_FOUND=no]) | ||
91 | +#if test "x${LIBPNG_FOUND}" = xno | ||
92 | +#then | ||
93 | +# AC_MSG_ERROR([Could not find libpng - \ | ||
94 | +# Try installing libpng-devel.]) | ||
95 | +#fi | ||
96 | +#AC_SUBST(LIBPNG_CFLAGS) | ||
97 | +#AC_SUBST(LIBPNG_LIBS) | ||
98 | + | ||
99 | +#dnl Check for libXtst headers and libraries. | ||
100 | +#PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
101 | +#if test "x${XTST_FOUND}" = xno | ||
102 | +#then | ||
103 | +# AC_MSG_ERROR([Could not find Xtst - \ | ||
104 | +# Try installing libXtst-devel.]) | ||
105 | +#fi | ||
106 | +#AC_SUBST(XTST_CFLAGS) | ||
107 | +#AC_SUBST(XTST_LIBS) | ||
108 | |||
109 | dnl Check for freetype2 headers and libraries. | ||
110 | PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] | ||
111 | @@ -373,18 +373,18 @@ | ||
112 | AC_SUBST(FREETYPE2_CFLAGS) | ||
113 | AC_SUBST(FREETYPE2_LIBS) | ||
114 | |||
115 | -dnl Check for alsa headers and libraries (only required for Linux). | ||
116 | -if test "x${BUILD_OS_DIR}" = "xlinux" | ||
117 | -then | ||
118 | - PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
119 | - if test "x${ALSA_FOUND}" = xno | ||
120 | - then | ||
121 | - AC_MSG_ERROR([Could not find alsa - \ | ||
122 | - Try installing alsa-lib-devel.]) | ||
123 | - fi | ||
124 | -AC_SUBST(ALSA_CFLAGS) | ||
125 | -AC_SUBST(ALSA_LIBS) | ||
126 | -fi | ||
127 | +#dnl Check for alsa headers and libraries (only required for Linux). | ||
128 | +#if test "x${BUILD_OS_DIR}" = "xlinux" | ||
129 | +#then | ||
130 | +# PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
131 | +# if test "x${ALSA_FOUND}" = xno | ||
132 | +# then | ||
133 | +# AC_MSG_ERROR([Could not find alsa - \ | ||
134 | +# Try installing alsa-lib-devel.]) | ||
135 | +# fi | ||
136 | +#AC_SUBST(ALSA_CFLAGS) | ||
137 | +#AC_SUBST(ALSA_LIBS) | ||
138 | +#fi | ||
139 | |||
140 | if test "x${enable_pulse_java}" = "xyes" | ||
141 | then | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8/icedtea-ecj-disable-compilation.patch b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-ecj-disable-compilation.patch new file mode 100644 index 0000000..cd0f68a --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-ecj-disable-compilation.patch | |||
@@ -0,0 +1,513 @@ | |||
1 | Index: openjdk/jdk/make/sun/awt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/sun/awt/Makefile 2009-04-24 09:33:55.000000000 +0200 | ||
4 | +++ openjdk/jdk/make/sun/awt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
5 | @@ -180,7 +180,8 @@ | ||
6 | include $(BUILDDIR)/common/Mapfile-vers.gmk | ||
7 | include $(BUILDDIR)/common/Library.gmk | ||
8 | |||
9 | -build: fontconfigs | ||
10 | +#build: fontconfigs | ||
11 | +build: | ||
12 | |||
13 | |||
14 | ifeq ($(PLATFORM), windows) | ||
15 | @@ -535,9 +536,9 @@ | ||
16 | -I$(PLATFORM_SRC)/native/$(PKGDIR) \ | ||
17 | $(EVENT_MODEL) | ||
18 | |||
19 | -ifeq ($(PLATFORM), linux) | ||
20 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
21 | -endif | ||
22 | +#ifeq ($(PLATFORM), linux) | ||
23 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
24 | +#endif | ||
25 | |||
26 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
27 | $(AWT_RUNPATH) | ||
28 | Index: openjdk/jdk/make/javax/sound/jsoundalsa/Makefile | ||
29 | =================================================================== | ||
30 | --- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:48:34.534565581 +0200 | ||
31 | +++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
32 | @@ -44,34 +44,35 @@ | ||
33 | # Files | ||
34 | # | ||
35 | |||
36 | -FILES_c = \ | ||
37 | - Utilities.c \ | ||
38 | - $(DAUDIOFILES_c) \ | ||
39 | - $(MIDIFILES_c) \ | ||
40 | - $(PORTFILES_c) | ||
41 | +#FILES_c = \ | ||
42 | +# Utilities.c \ | ||
43 | +# $(DAUDIOFILES_c) \ | ||
44 | +# $(MIDIFILES_c) \ | ||
45 | +# $(PORTFILES_c) | ||
46 | |||
47 | # platform dependent files | ||
48 | -FILES_c += \ | ||
49 | - PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
50 | - PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
51 | - PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
52 | - PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
53 | - PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
54 | - PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
55 | - PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
56 | - | ||
57 | -FILES_export = \ | ||
58 | - $(DAUDIOFILES_export) \ | ||
59 | - $(MIDIFILES_export) \ | ||
60 | - $(PORTFILES_export) | ||
61 | +#FILES_c += \ | ||
62 | +# PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
63 | +# PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
64 | +# PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
65 | +# PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
66 | +# PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
67 | +# PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
68 | +# PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
69 | + | ||
70 | +FILES_export = | ||
71 | +#FILES_export = \ | ||
72 | +# $(DAUDIOFILES_export) \ | ||
73 | +# $(MIDIFILES_export) \ | ||
74 | +# $(PORTFILES_export) | ||
75 | |||
76 | -OTHER_LDLIBS += -lasound | ||
77 | +#OTHER_LDLIBS += -lasound | ||
78 | |||
79 | CPPFLAGS += \ | ||
80 | - -DUSE_DAUDIO=TRUE \ | ||
81 | - -DUSE_PORTS=TRUE \ | ||
82 | - -DUSE_PLATFORM_MIDI_OUT=TRUE \ | ||
83 | - -DUSE_PLATFORM_MIDI_IN=TRUE \ | ||
84 | + -DUSE_DAUDIO=FALSE \ | ||
85 | + -DUSE_PORTS=FALSE \ | ||
86 | + -DUSE_PLATFORM_MIDI_OUT=FALSE \ | ||
87 | + -DUSE_PLATFORM_MIDI_IN=FALSE \ | ||
88 | -I$(SHARE_SRC)/native/com/sun/media/sound | ||
89 | |||
90 | # | ||
91 | Index: openjdk/jdk/make/sun/splashscreen/Makefile | ||
92 | =================================================================== | ||
93 | --- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:48:33.738565601 +0200 | ||
94 | +++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
95 | @@ -32,7 +32,8 @@ | ||
96 | # | ||
97 | # Files | ||
98 | # | ||
99 | -include FILES_c.gmk | ||
100 | +#include FILES_c.gmk | ||
101 | +FILES_c = | ||
102 | |||
103 | FILES_java = \ | ||
104 | java/awt/SplashScreen.java | ||
105 | @@ -62,9 +63,9 @@ | ||
106 | CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE | ||
107 | |||
108 | ifneq ($(PLATFORM), windows) | ||
109 | - CFLAGS += -DWITH_X11 | ||
110 | - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
111 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
112 | +# CFLAGS += -DWITH_X11 | ||
113 | +# CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
114 | +# OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
115 | else # PLATFORM | ||
116 | CFLAGS += -DWITH_WIN32 | ||
117 | OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib | ||
118 | @@ -79,7 +80,7 @@ | ||
119 | vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg | ||
120 | vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen | ||
121 | |||
122 | -CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
123 | +#CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
124 | |||
125 | ifeq ($(PLATFORM), linux) | ||
126 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
127 | Index: openjdk/jdk/make/sun/xawt/Makefile | ||
128 | =================================================================== | ||
129 | --- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-04-24 09:33:56.000000000 +0200 | ||
130 | +++ openjdk/jdk/make/sun/xawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
131 | @@ -41,15 +41,16 @@ | ||
132 | # | ||
133 | # Files | ||
134 | # | ||
135 | -include FILES_c_unix.gmk | ||
136 | -include FILES_export_unix.gmk | ||
137 | +#include FILES_c_unix.gmk | ||
138 | +FILES_c = | ||
139 | +#include FILES_export_unix.gmk | ||
140 | AUTO_FILES_JAVA_DIRS = sun/awt/X11 | ||
141 | AUTO_JAVA_PRUNE = WrapperGenerator.java | ||
142 | |||
143 | LDFLAGS += -L$(OPENWIN_LIB) | ||
144 | |||
145 | ifeq ($(PLATFORM), linux) | ||
146 | -LDFLAGS += -lpthread | ||
147 | +#LDFLAGS += -lpthread | ||
148 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
149 | endif | ||
150 | |||
151 | @@ -86,16 +87,19 @@ | ||
152 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl | ||
153 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 | ||
154 | |||
155 | -OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
156 | - $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
157 | +#OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
158 | +# $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
159 | |||
160 | ifeq ($(PLATFORM), solaris) | ||
161 | CPPFLAGS += -DFUNCPROTO=15 | ||
162 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
163 | endif | ||
164 | |||
165 | -CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
166 | +#CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
167 | |||
168 | +# Normally we would like to patch these includes away but | ||
169 | +# we need them for the successfull compilation of the sizer | ||
170 | +# executables. | ||
171 | CPPFLAGS += -DXAWT -DXAWT_HACK \ | ||
172 | -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ | ||
173 | -I$(PLATFORM_SRC)/native/sun/awt \ | ||
174 | @@ -124,10 +128,10 @@ | ||
175 | |||
176 | ifeq ($(PLATFORM), linux) | ||
177 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
178 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
179 | - -I/usr/include/X11/extensions \ | ||
180 | - -I$(MOTIF_DIR)/include \ | ||
181 | - -I$(OPENWIN_HOME)/include | ||
182 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
183 | +# -I/usr/include/X11/extensions \ | ||
184 | +# -I$(MOTIF_DIR)/include \ | ||
185 | +# -I$(OPENWIN_HOME)/include | ||
186 | endif | ||
187 | |||
188 | ifeq ($(PLATFORM), solaris) | ||
189 | @@ -238,18 +242,20 @@ | ||
190 | $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) | ||
191 | |||
192 | $(SIZES): $(SIZERS) | ||
193 | - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
194 | - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
195 | - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
196 | - $(CHMOD) +w $@;\ | ||
197 | - else \ | ||
198 | - $(ECHO) GENERATING $@; \ | ||
199 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
200 | - fi | ||
201 | - @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
202 | - $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
203 | - $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
204 | - fi | ||
205 | + touch $(SIZES) | ||
206 | +# | ||
207 | +# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
208 | +# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
209 | +# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
210 | +# $(CHMOD) +w $@;\ | ||
211 | +# else \ | ||
212 | +# $(ECHO) GENERATING $@; \ | ||
213 | +# $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
214 | +# fi | ||
215 | +# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
216 | +# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
217 | +# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
218 | +# fi | ||
219 | |||
220 | $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) | ||
221 | $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ | ||
222 | Index: openjdk/jdk/make/sun/jawt/Makefile | ||
223 | =================================================================== | ||
224 | --- openjdk.orig/jdk/make/sun/jawt/Makefile 2009-09-29 13:48:34.186565471 +0200 | ||
225 | +++ openjdk/jdk/make/sun/jawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
226 | @@ -36,7 +36,8 @@ | ||
227 | ifeq ($(PLATFORM), windows) | ||
228 | FILES_cpp = jawt.cpp | ||
229 | else # PLATFORM | ||
230 | -FILES_c = jawt.c | ||
231 | +FILES_c = | ||
232 | +#FILES_c = jawt.c | ||
233 | endif # PLATFORM | ||
234 | |||
235 | FILES_h = $(INCLUDEDIR)/jawt.h \ | ||
236 | Index: openjdk/jdk/make/sun/jpeg/Makefile | ||
237 | =================================================================== | ||
238 | --- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-09-29 13:48:33.726565626 +0200 | ||
239 | +++ openjdk/jdk/make/sun/jpeg/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
240 | @@ -37,7 +37,8 @@ | ||
241 | # | ||
242 | # Files | ||
243 | # | ||
244 | -include FILES_c.gmk | ||
245 | +FILES_c = | ||
246 | +#include FILES_c.gmk | ||
247 | |||
248 | AUTO_FILES_JAVA_DIRS = sun/awt/image com/sun/imageio/plugins/jpeg | ||
249 | |||
250 | Index: openjdk/jdk/make/common/shared/Defs-java.gmk | ||
251 | =================================================================== | ||
252 | --- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:48:55.954565215 +0200 | ||
253 | +++ openjdk/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:57:14.446815782 +0200 | ||
254 | @@ -36,14 +36,14 @@ | ||
255 | # Memory related -J flags that all uses of java tools should use. | ||
256 | # | ||
257 | JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m | ||
258 | -ifneq (,$(filter $(ARCH), ia64 s390)) | ||
259 | +#ifneq (,$(filter $(ARCH), ia64 s390)) | ||
260 | # Special flags for javac on ia64 to work around a VM problem with | ||
261 | # bad code generation during inlining (what version had this problem?): | ||
262 | # Suspect this may not be needed anymore. | ||
263 | - JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
264 | -else | ||
265 | - JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
266 | -endif | ||
267 | +# JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
268 | +#else | ||
269 | +# JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
270 | +#endif | ||
271 | |||
272 | # | ||
273 | # All java tools (javac, javah, and javadoc) run faster with certain java | ||
274 | Index: openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java | ||
275 | =================================================================== | ||
276 | --- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-04-24 09:34:04.000000000 +0200 | ||
277 | +++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-09-29 13:57:14.450815511 +0200 | ||
278 | @@ -113,7 +113,7 @@ | ||
279 | * @since 1.4 | ||
280 | */ | ||
281 | public static boolean isHeadless() { | ||
282 | - return getHeadlessProperty(); | ||
283 | + return true; | ||
284 | } | ||
285 | |||
286 | /** | ||
287 | Index: openjdk/corba/make/common/Defs.gmk | ||
288 | =================================================================== | ||
289 | --- openjdk.orig/corba/make/common/Defs.gmk 2009-04-24 09:30:19.000000000 +0200 | ||
290 | +++ openjdk/corba/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
291 | @@ -444,11 +444,11 @@ | ||
292 | # Tool flags | ||
293 | # | ||
294 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
295 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
296 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
297 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
298 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
299 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
300 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
301 | $(DEFINES) $(OPTIONS:%=-D%) | ||
302 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
303 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
304 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
305 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
306 | $(OTHER_LINTFLAGS) | ||
307 | Index: openjdk/jdk/make/common/Defs.gmk | ||
308 | =================================================================== | ||
309 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:48:33.590565061 +0200 | ||
310 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
311 | @@ -662,11 +662,11 @@ | ||
312 | # Tool flags | ||
313 | # | ||
314 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
315 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
316 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
317 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
318 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
319 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
320 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
321 | $(DEFINES) $(OPTIONS:%=-D%) | ||
322 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
323 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
324 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
325 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
326 | $(OTHER_LINTFLAGS) | ||
327 | Index: openjdk/hotspot/make/linux/makefiles/vm.make | ||
328 | =================================================================== | ||
329 | --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:48:34.098565716 +0200 | ||
330 | +++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:57:14.450815511 +0200 | ||
331 | @@ -170,6 +170,7 @@ | ||
332 | LIBS_VM += $(LLVM_LIBS) | ||
333 | endif | ||
334 | |||
335 | +LFLAGS_VM = $(OE_LDFLAGS) | ||
336 | LINK_VM = $(LINK_LIB.c) | ||
337 | |||
338 | # rule for building precompiled header | ||
339 | Index: openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c | ||
340 | =================================================================== | ||
341 | --- openjdk.orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-04-24 09:34:34.000000000 +0200 | ||
342 | +++ openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-09-29 13:57:14.450815511 +0200 | ||
343 | @@ -26,8 +26,10 @@ | ||
344 | #include <jni.h> | ||
345 | #include <jni_util.h> | ||
346 | #include <dlfcn.h> | ||
347 | +#if 0 | ||
348 | #include <cups/cups.h> | ||
349 | #include <cups/ppd.h> | ||
350 | +#endif | ||
351 | |||
352 | //#define CUPS_DEBUG | ||
353 | |||
354 | @@ -37,6 +39,7 @@ | ||
355 | #define DPRINTF(x, y) | ||
356 | #endif | ||
357 | |||
358 | +#if 0 | ||
359 | typedef const char* (*fn_cupsServer)(void); | ||
360 | typedef int (*fn_ippPort)(void); | ||
361 | typedef http_t* (*fn_httpConnect)(const char *, int); | ||
362 | @@ -56,7 +59,7 @@ | ||
363 | fn_ppdClose j2d_ppdClose; | ||
364 | fn_ppdFindOption j2d_ppdFindOption; | ||
365 | fn_ppdPageSize j2d_ppdPageSize; | ||
366 | - | ||
367 | +#endif | ||
368 | |||
369 | /* | ||
370 | * Initialize library functions. | ||
371 | @@ -65,6 +68,7 @@ | ||
372 | JNIEXPORT jboolean JNICALL | ||
373 | Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env, | ||
374 | jobject printObj) { | ||
375 | +#if 0 | ||
376 | void *handle = dlopen("libcups.so.2", RTLD_LAZY | RTLD_GLOBAL); | ||
377 | |||
378 | if (handle == NULL) { | ||
379 | @@ -131,6 +135,8 @@ | ||
380 | } | ||
381 | |||
382 | return JNI_TRUE; | ||
383 | +#endif | ||
384 | + return JNI_FALSE; | ||
385 | } | ||
386 | |||
387 | /* | ||
388 | @@ -141,6 +147,7 @@ | ||
389 | Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env, | ||
390 | jobject printObj) | ||
391 | { | ||
392 | +#if 0 | ||
393 | jstring cServer = NULL; | ||
394 | const char* server = j2d_cupsServer(); | ||
395 | if (server != NULL) { | ||
396 | @@ -152,6 +159,8 @@ | ||
397 | } | ||
398 | } | ||
399 | return cServer; | ||
400 | +#endif | ||
401 | + return NULL; | ||
402 | } | ||
403 | |||
404 | /* | ||
405 | @@ -162,8 +171,11 @@ | ||
406 | Java_sun_print_CUPSPrinter_getCupsPort(JNIEnv *env, | ||
407 | jobject printObj) | ||
408 | { | ||
409 | +#if 0 | ||
410 | int port = j2d_ippPort(); | ||
411 | return (jint) port; | ||
412 | +#endif | ||
413 | + return 0; | ||
414 | } | ||
415 | |||
416 | |||
417 | @@ -177,6 +189,7 @@ | ||
418 | jstring server, | ||
419 | jint port) | ||
420 | { | ||
421 | +#if 0 | ||
422 | const char *serverName; | ||
423 | serverName = (*env)->GetStringUTFChars(env, server, NULL); | ||
424 | if (serverName != NULL) { | ||
425 | @@ -187,6 +200,7 @@ | ||
426 | return JNI_TRUE; | ||
427 | } | ||
428 | } | ||
429 | +#endif | ||
430 | return JNI_FALSE; | ||
431 | } | ||
432 | |||
433 | @@ -199,6 +213,7 @@ | ||
434 | jobject printObj, | ||
435 | jstring printer) | ||
436 | { | ||
437 | +#if 0 | ||
438 | ppd_file_t *ppd; | ||
439 | ppd_option_t *optionTray, *optionPage; | ||
440 | ppd_choice_t *choice; | ||
441 | @@ -304,6 +319,8 @@ | ||
442 | j2d_ppdClose(ppd); | ||
443 | unlink(filename); | ||
444 | return nameArray; | ||
445 | +#endif | ||
446 | + return NULL; | ||
447 | } | ||
448 | |||
449 | |||
450 | @@ -315,6 +332,7 @@ | ||
451 | jobject printObj, | ||
452 | jstring printer) | ||
453 | { | ||
454 | +#if 0 | ||
455 | ppd_file_t *ppd; | ||
456 | ppd_option_t *option; | ||
457 | ppd_choice_t *choice; | ||
458 | @@ -374,4 +392,6 @@ | ||
459 | j2d_ppdClose(ppd); | ||
460 | unlink(filename); | ||
461 | return sizeArray; | ||
462 | +#endif | ||
463 | + return NULL; | ||
464 | } | ||
465 | Index: openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java | ||
466 | =================================================================== | ||
467 | --- openjdk.orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-04-24 09:34:17.000000000 +0200 | ||
468 | +++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
469 | @@ -244,6 +244,8 @@ | ||
470 | * that might be specified. | ||
471 | */ | ||
472 | fontConfig = createFontConfiguration(); | ||
473 | + if (fontConfig == null) | ||
474 | + return null; | ||
475 | getPlatformFontPathFromFontConfig(); | ||
476 | |||
477 | String extraFontPath = fontConfig.getExtraFontPath(); | ||
478 | Index: openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | ||
479 | =================================================================== | ||
480 | --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-04-24 09:34:33.000000000 +0200 | ||
481 | +++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
482 | @@ -899,7 +899,8 @@ | ||
483 | |||
484 | // Implements SunGraphicsEnvironment.createFontConfiguration. | ||
485 | protected FontConfiguration createFontConfiguration() { | ||
486 | - return new MFontConfiguration(this); | ||
487 | +// return new MFontConfiguration(this); | ||
488 | + return null; | ||
489 | } | ||
490 | public FontConfiguration | ||
491 | createFontConfiguration(boolean preferLocaleFonts, | ||
492 | Index: openjdk/jdk/make/launchers/Makefile | ||
493 | =================================================================== | ||
494 | --- openjdk.orig/jdk/make/launchers/Makefile 2009-09-29 13:48:33.490815135 +0200 | ||
495 | +++ openjdk/jdk/make/launchers/Makefile 2009-09-29 13:57:14.454815276 +0200 | ||
496 | @@ -57,7 +57,7 @@ | ||
497 | endif | ||
498 | # Run MAKE $@ for all generic launchers | ||
499 | define make-all-launchers | ||
500 | -$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
501 | +#$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
502 | $(call make-launcher, apt, com.sun.tools.apt.Main, , ) | ||
503 | $(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , ) | ||
504 | $(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , ) | ||
505 | @@ -93,7 +93,7 @@ | ||
506 | -J-Dcom.sun.CORBA.activation.Port=1049 \ | ||
507 | -J-Dcom.sun.CORBA.POA.ORBServerId=1, ) | ||
508 | $(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack) | ||
509 | -$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
510 | +#$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
511 | $(call make-launcher, rmic, sun.rmi.rmic.Main, , ) | ||
512 | $(call make-launcher, rmid, sun.rmi.server.Activation, , ) | ||
513 | $(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , ) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8/icedtea-ecj-fix-freetype.patch b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-ecj-fix-freetype.patch new file mode 100644 index 0000000..3420fbd --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-ecj-fix-freetype.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: openjdk/jdk/make/tools/freetypecheck/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/tools/freetypecheck/Makefile 2009-09-29 13:48:33.590565061 +0200 | ||
4 | +++ openjdk/jdk/make/tools/freetypecheck/Makefile 2009-09-29 14:00:04.470566156 +0200 | ||
5 | @@ -45,7 +45,7 @@ | ||
6 | FT_OPTIONS = $(CFLAGS) | ||
7 | endif | ||
8 | |||
9 | -FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 | ||
10 | +FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 $(FREETYPE2_CFLAGS) $(FREETYPE2_LIBS) $(FREETYPE2_HEADERS) | ||
11 | FT_OPTIONS += $(XARCH) | ||
12 | |||
13 | #add runtime library search path | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8/icedtea-ecj-fix-zlib.patch b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-ecj-fix-zlib.patch new file mode 100644 index 0000000..eff7e48 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-ecj-fix-zlib.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | Index: openjdk/jdk/make/com/sun/java/pack/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-09-29 13:48:34.538565136 +0200 | ||
4 | +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-09-29 14:00:26.226565853 +0200 | ||
5 | @@ -80,7 +80,7 @@ | ||
6 | OTHER_LDLIBS += $(JVMLIB) | ||
7 | endif | ||
8 | |||
9 | -OTHER_LDLIBS += -lz | ||
10 | +OTHER_LDLIBS += -L$(libdir) -lz | ||
11 | CXXFLAGS_DBG += -DFULL | ||
12 | CXXFLAGS_OPT += -DPRODUCT | ||
13 | CXXFLAGS_COMMON += -DFULL | ||
14 | Index: openjdk/jdk/make/common/Defs.gmk | ||
15 | =================================================================== | ||
16 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
17 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
18 | @@ -289,7 +289,7 @@ | ||
19 | |||
20 | endif # PROGRAM | ||
21 | |||
22 | -LDLIBS_COMMON += $(EXTRA_LIBS) | ||
23 | +LDLIBS_COMMON += $(EXTRA_LIBS) -L$(libdir) | ||
24 | |||
25 | # | ||
26 | # Default is to build, not import native binaries | ||
27 | @@ -425,7 +425,7 @@ | ||
28 | CLASSDESTDIR = $(CLASSBINDIR) | ||
29 | endif | ||
30 | |||
31 | -INCLUDES = -I. -I$(CLASSHDRDIR) \ | ||
32 | +INCLUDES = -I$(includedir) -I. -I$(CLASSHDRDIR) \ | ||
33 | $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES) | ||
34 | OTHER_CPPFLAGS = $(INCLUDES) | ||
35 | |||
36 | Index: openjdk/jdk/make/common/Program.gmk | ||
37 | =================================================================== | ||
38 | --- openjdk.orig/jdk/make/common/Program.gmk 2009-09-29 13:48:33.914565255 +0200 | ||
39 | +++ openjdk/jdk/make/common/Program.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
40 | @@ -73,7 +73,7 @@ | ||
41 | # itself, as with all the Windows libraries. | ||
42 | # | ||
43 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
44 | - LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli | ||
45 | + LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli -L $(libdir) | ||
46 | OTHER_LDLIBS += -ljli | ||
47 | ifeq ($(PLATFORM), solaris) | ||
48 | ifeq ($(ARCH_DATA_MODEL), 32) | ||
49 | Index: openjdk/jdk/make/java/jli/Makefile | ||
50 | =================================================================== | ||
51 | --- openjdk.orig/jdk/make/java/jli/Makefile 2009-09-29 13:48:33.806565054 +0200 | ||
52 | +++ openjdk/jdk/make/java/jli/Makefile 2009-09-29 14:00:26.230565844 +0200 | ||
53 | @@ -61,7 +61,7 @@ | ||
54 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
55 | LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli | ||
56 | # Guarantee very limited dependencies | ||
57 | - LDLIBS = -lz -lc | ||
58 | + LDLIBS = -L$(libdir) -lz -lc | ||
59 | endif | ||
60 | |||
61 | ifeq ($(PLATFORM), windows) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8/icedtea-hotspot-make-arch-sane-for-x86.patch b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-hotspot-make-arch-sane-for-x86.patch new file mode 100644 index 0000000..9d7b9bb --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-hotspot-make-arch-sane-for-x86.patch | |||
@@ -0,0 +1,1130 @@ | |||
1 | From b8a51665ada45e3beb0823c03c025d5514f5e745 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Thu, 22 Oct 2009 16:35:25 +0200 | ||
4 | Subject: [PATCH] hotspot: make arch sane for x86 | ||
5 | |||
6 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
7 | index 38e0f78..64c8410 100644 | ||
8 | --- openjdk/hotspot/agent/make/saenv.sh | ||
9 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
10 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
11 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
12 | CPU=amd64 | ||
13 | else | ||
14 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
15 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
16 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
17 | - CPU=i386 | ||
18 | + CPU=x86 | ||
19 | fi | ||
20 | else | ||
21 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
22 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
23 | index 83ddd1a..c20c7eb 100644 | ||
24 | --- openjdk/hotspot/make/defs.make | ||
25 | +++ openjdk/hotspot/make/defs.make | ||
26 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
27 | ifdef LP64 | ||
28 | BUILDARCH = amd64 | ||
29 | else | ||
30 | - BUILDARCH = i486 | ||
31 | + BUILDARCH = x86 | ||
32 | endif | ||
33 | endif | ||
34 | ifeq ($(BUILDARCH), sparc) | ||
35 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
36 | |||
37 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
38 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
39 | - LIBARCH/i486 = i386 | ||
40 | + LIBARCH/x86 = x86 | ||
41 | LIBARCH/amd64 = amd64 | ||
42 | LIBARCH/sparc = sparc | ||
43 | LIBARCH/sparcv9 = sparcv9 | ||
44 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
45 | index bc82543..4a1ef4e 100644 | ||
46 | --- openjdk/hotspot/make/jprt.config | ||
47 | +++ openjdk/hotspot/make/jprt.config | ||
48 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
49 | # LINUX: X86, AMD64 | ||
50 | osarch=`uname -m` | ||
51 | if [ "${osarch}" = i686 ] ; then | ||
52 | - linux_arch=i586 | ||
53 | + linux_arch=x86 | ||
54 | elif [ "${osarch}" = x86_64 ] ; then | ||
55 | linux_arch=amd64 | ||
56 | fi | ||
57 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
58 | index eb2ce82..7193de0 100644 | ||
59 | --- openjdk/hotspot/make/jprt.properties | ||
60 | +++ openjdk/hotspot/make/jprt.properties | ||
61 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
62 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
63 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
64 | |||
65 | -jprt.my.linux.i586=linux_i586 | ||
66 | +jprt.my.linux.x86=linux_x86 | ||
67 | jprt.my.linux.x64=linux_x64 | ||
68 | jprt.my.windows.i586=windows_i586 | ||
69 | jprt.my.windows.x64=windows_x64 | ||
70 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
71 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
72 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
73 | |||
74 | -jprt.my.linux.i586.test.targets = \ | ||
75 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
76 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
77 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
78 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
79 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
80 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
81 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
82 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
83 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
84 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
85 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
86 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
87 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
88 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
89 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
90 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
91 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
92 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
93 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
94 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
95 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
96 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
97 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
98 | +jprt.my.linux.x86.test.targets = \ | ||
99 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
100 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
101 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
102 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
103 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
104 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
105 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
106 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
107 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
108 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
109 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
110 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
111 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
112 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
113 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
114 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
115 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
116 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
117 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
118 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
119 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
120 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
121 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
122 | |||
123 | jprt.my.linux.x64.test.targets = \ | ||
124 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
125 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
126 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
127 | ${jprt.my.solaris.i586.test.targets}, \ | ||
128 | ${jprt.my.solaris.x64.test.targets}, \ | ||
129 | - ${jprt.my.linux.i586.test.targets}, \ | ||
130 | + ${jprt.my.linux.x86.test.targets}, \ | ||
131 | ${jprt.my.linux.x64.test.targets}, \ | ||
132 | ${jprt.my.windows.i586.test.targets}, \ | ||
133 | ${jprt.my.windows.x64.test.targets} | ||
134 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
135 | index e317fdd..5d3b1ff 100644 | ||
136 | --- openjdk/hotspot/make/linux/build.sh | ||
137 | +++ openjdk/hotspot/make/linux/build.sh | ||
138 | @@ -43,7 +43,7 @@ esac | ||
139 | |||
140 | case `uname -m` in | ||
141 | i386|i486|i586|i686) | ||
142 | - mach=i386 | ||
143 | + mach=x86 | ||
144 | ;; | ||
145 | *) | ||
146 | echo "Unsupported machine: " `uname -m` | ||
147 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
148 | index add9823..cbbf81f 100644 | ||
149 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
150 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
151 | @@ -30,7 +30,7 @@ | ||
152 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
153 | # environment or on the command-line: | ||
154 | # | ||
155 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
156 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
157 | # BUILDARCH - build directory | ||
158 | # LIBARCH - the corresponding directory in JDK/JRE | ||
159 | # GAMMADIR - top of workspace | ||
160 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
161 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
162 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
163 | |||
164 | -DATA_MODE/i486 = 32 | ||
165 | +DATA_MODE/x86 = 32 | ||
166 | DATA_MODE/sparc = 32 | ||
167 | DATA_MODE/sparcv9 = 64 | ||
168 | DATA_MODE/amd64 = 64 | ||
169 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
170 | index 113d4f8..d3f06cb 100644 | ||
171 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
172 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
173 | @@ -78,7 +78,7 @@ endif | ||
174 | # Processor-specific files for other processors are excluded by default. Use | ||
175 | # CS_CPU=x to include platform-specific files for other platforms. | ||
176 | ifndef CS_CPU | ||
177 | -CS_CPU = i486 sparc amd64 ia64 | ||
178 | +CS_CPU = x86 sparc amd64 ia64 | ||
179 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
180 | endif | ||
181 | |||
182 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
183 | index 9131c79..138dfb3 100644 | ||
184 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
185 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
186 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
187 | HS_ARCH = sparc | ||
188 | endif | ||
189 | |||
190 | +# x86 | ||
191 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
192 | + ARCH_DATA_MODEL = 32 | ||
193 | + PLATFORM = linux-x86 | ||
194 | + VM_PLATFORM = linux_x86 | ||
195 | + HS_ARCH = x86 | ||
196 | +endif | ||
197 | + | ||
198 | # x86_64 | ||
199 | ifeq ($(ARCH), x86_64) | ||
200 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
201 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
202 | HS_ARCH = x86 | ||
203 | else | ||
204 | ARCH_DATA_MODEL = 32 | ||
205 | - PLATFORM = linux-i586 | ||
206 | - VM_PLATFORM = linux_i486 | ||
207 | + PLATFORM = linux-x86 | ||
208 | + VM_PLATFORM = linux_x86 | ||
209 | HS_ARCH = x86 | ||
210 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
211 | - ARCH = i686 | ||
212 | endif | ||
213 | endif | ||
214 | |||
215 | -# i686 | ||
216 | -ifeq ($(ARCH), i686) | ||
217 | - ARCH_DATA_MODEL = 32 | ||
218 | - PLATFORM = linux-i586 | ||
219 | - VM_PLATFORM = linux_i486 | ||
220 | - HS_ARCH = x86 | ||
221 | -endif | ||
222 | - | ||
223 | JDK_INCLUDE_SUBDIR=linux | ||
224 | |||
225 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
226 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
227 | index 0a9f75b..2e29bb9 100644 | ||
228 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
229 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
230 | @@ -30,7 +30,7 @@ CC = cc | ||
231 | AS = $(CC) -c | ||
232 | |||
233 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
234 | -ARCHFLAG/i486 = -m32 | ||
235 | +ARCHFLAG/x86 = -m32 | ||
236 | ARCHFLAG/amd64 = -m64 | ||
237 | |||
238 | CFLAGS += $(ARCHFLAG) | ||
239 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
240 | deleted file mode 100644 | ||
241 | index 610ac91..0000000 | ||
242 | --- openjdk/hotspot/make/linux/platform_i486 | ||
243 | +++ /dev/null | ||
244 | @@ -1,15 +0,0 @@ | ||
245 | -os_family = linux | ||
246 | - | ||
247 | -arch = x86 | ||
248 | - | ||
249 | -arch_model = x86_32 | ||
250 | - | ||
251 | -os_arch = linux_x86 | ||
252 | - | ||
253 | -os_arch_model = linux_x86_32 | ||
254 | - | ||
255 | -lib_arch = i386 | ||
256 | - | ||
257 | -compiler = gcc | ||
258 | - | ||
259 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
260 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
261 | index 325a3fe..717fc75 100644 | ||
262 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
263 | +++ openjdk/hotspot/make/linux/platform_i486.suncc | ||
264 | @@ -8,10 +8,10 @@ os_arch = linux_x86 | ||
265 | |||
266 | os_arch_model = linux_x86_32 | ||
267 | |||
268 | -lib_arch = i386 | ||
269 | +lib_arch = x86 | ||
270 | |||
271 | compiler = sparcWorks | ||
272 | |||
273 | -gnu_dis_arch = i386 | ||
274 | +gnu_dis_arch = x86 | ||
275 | |||
276 | sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
277 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
278 | new file mode 100644 | ||
279 | index 0000000..5c613fe | ||
280 | --- /dev/null | ||
281 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
282 | @@ -0,0 +1,15 @@ | ||
283 | +os_family = linux | ||
284 | + | ||
285 | +arch = x86 | ||
286 | + | ||
287 | +arch_model = x86_32 | ||
288 | + | ||
289 | +os_arch = linux_x86 | ||
290 | + | ||
291 | +os_arch_model = linux_x86_32 | ||
292 | + | ||
293 | +lib_arch = x86 | ||
294 | + | ||
295 | +compiler = gcc | ||
296 | + | ||
297 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
298 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
299 | index b2b3162..a4bbe70 100644 | ||
300 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
301 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
302 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
303 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
304 | #ifdef __ia64__ | ||
305 | #define SYS_gettid 1105 | ||
306 | -#elif __i386__ | ||
307 | +#elif __x86__ | ||
308 | #define SYS_gettid 224 | ||
309 | #elif __amd64__ | ||
310 | #define SYS_gettid 186 | ||
311 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
312 | #elif defined(IA64) | ||
313 | static char cpu_arch[] = "ia64"; | ||
314 | #elif defined(IA32) | ||
315 | -static char cpu_arch[] = "i386"; | ||
316 | +static char cpu_arch[] = "x86"; | ||
317 | #elif defined(AMD64) | ||
318 | static char cpu_arch[] = "amd64"; | ||
319 | #elif defined(SPARC) | ||
320 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
321 | index 6bdf4b8..fd43c6e 100644 | ||
322 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
323 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
324 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
325 | endif | ||
326 | |||
327 | # Default arch; it is changed below as needed. | ||
328 | -ARCH = i386 | ||
329 | +ARCH = x86 | ||
330 | OS = $(shell uname) | ||
331 | |||
332 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
333 | @@ -87,7 +87,7 @@ endif # SunOS | ||
334 | LIBARCH = $(ARCH) | ||
335 | ifdef LP64 | ||
336 | LIBARCH64/sparc = sparcv9 | ||
337 | -LIBARCH64/i386 = amd64 | ||
338 | +LIBARCH64/x86 = amd64 | ||
339 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
340 | ifneq ($(LIBARCH64),) | ||
341 | LIBARCH = $(LIBARCH64) | ||
342 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
343 | index 75b7efe..62c692b 100644 | ||
344 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
345 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
346 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
347 | else | ||
348 | disassembler_usage(stderr); /* better than nothing */ | ||
349 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
350 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
351 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
352 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
353 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
354 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
355 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
356 | #endif | ||
357 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
358 | static const char* native_arch_name() { | ||
359 | const char* res = HOTSPOT_LIB_ARCH; | ||
360 | #ifdef LIBARCH_amd64 | ||
361 | - res = "i386:x86-64"; | ||
362 | + res = "x86:x86-64"; | ||
363 | #endif | ||
364 | #ifdef LIBARCH_sparc | ||
365 | res = "sparc:v8plusb"; | ||
366 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
367 | index 2596d85..c2f3eb9 100644 | ||
368 | --- openjdk/hotspot/test/Makefile | ||
369 | +++ openjdk/hotspot/test/Makefile | ||
370 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
371 | PLATFORM = solaris | ||
372 | ARCH = $(shell uname -p) | ||
373 | ifeq ($(ARCH), i386) | ||
374 | - ARCH=i586 | ||
375 | + ARCH=x86 | ||
376 | endif | ||
377 | endif | ||
378 | ifeq ($(OSNAME), Linux) | ||
379 | PLATFORM = linux | ||
380 | ARCH = $(shell uname -m) | ||
381 | - ifeq ($(ARCH), i386) | ||
382 | - ARCH = i586 | ||
383 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
384 | + ARCH = x86 | ||
385 | endif | ||
386 | endif | ||
387 | ifeq ($(OSNAME), Windows_NT) | ||
388 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
389 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
390 | ARCH = x64 | ||
391 | else | ||
392 | - ARCH = i586 | ||
393 | + ARCH = x86 | ||
394 | endif | ||
395 | endif | ||
396 | endif | ||
397 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
398 | index 38e0f78..64c8410 100644 | ||
399 | --- openjdk/hotspot/agent/make/saenv.sh | ||
400 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
401 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
402 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
403 | CPU=amd64 | ||
404 | else | ||
405 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
406 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
407 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
408 | - CPU=i386 | ||
409 | + CPU=x86 | ||
410 | fi | ||
411 | else | ||
412 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
413 | diff --git openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
414 | index c4ca7de..54c12ca 100644 | ||
415 | --- openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
416 | +++ openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
417 | @@ -29,7 +29,7 @@ | ||
418 | #define amd64 1 | ||
419 | #endif | ||
420 | |||
421 | -#ifdef i386 | ||
422 | +#ifdef x86 | ||
423 | #include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h" | ||
424 | #endif | ||
425 | |||
426 | @@ -295,7 +295,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
427 | } | ||
428 | |||
429 | #undef NPRGREG | ||
430 | -#ifdef i386 | ||
431 | +#ifdef x86 | ||
432 | #define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG | ||
433 | #endif | ||
434 | #ifdef ia64 | ||
435 | @@ -314,7 +314,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
436 | |||
437 | #undef REG_INDEX | ||
438 | |||
439 | -#ifdef i386 | ||
440 | +#ifdef x86 | ||
441 | #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg | ||
442 | |||
443 | regs[REG_INDEX(GS)] = (uintptr_t) gregs.xgs; | ||
444 | @@ -333,7 +333,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
445 | regs[REG_INDEX(CS)] = (uintptr_t) gregs.xcs; | ||
446 | regs[REG_INDEX(SS)] = (uintptr_t) gregs.xss; | ||
447 | |||
448 | -#endif /* i386 */ | ||
449 | +#endif /* x86 */ | ||
450 | |||
451 | #if ia64 | ||
452 | regs = (*env)->GetLongArrayElements(env, array, &isCopy); | ||
453 | diff --git openjdk/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile | ||
454 | index a16f3a7..85fecb1 100644 | ||
455 | --- openjdk/hotspot/agent/src/os/linux/Makefile | ||
456 | +++ openjdk/hotspot/agent/src/os/linux/Makefile | ||
457 | @@ -22,7 +22,7 @@ | ||
458 | # | ||
459 | # | ||
460 | |||
461 | -ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) | ||
462 | +ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo x86 ; fi ) | ||
463 | GCC = gcc$(GCC_SUFFIX) | ||
464 | |||
465 | JAVAH = ${JAVA_HOME}/bin/javah | ||
466 | diff --git openjdk/hotspot/agent/src/os/linux/ps_core.c openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
467 | index 3562f2d..47ab01b 100644 | ||
468 | --- openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
469 | +++ openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
470 | @@ -540,7 +540,7 @@ static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size | ||
471 | |||
472 | if (is_debug()) { | ||
473 | print_debug("integer regset\n"); | ||
474 | -#ifdef i386 | ||
475 | +#ifdef x86 | ||
476 | // print the regset | ||
477 | print_debug("\teax = 0x%x\n", newthr->regs.eax); | ||
478 | print_debug("\tebx = 0x%x\n", newthr->regs.ebx); | ||
479 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
480 | index 83ddd1a..c20c7eb 100644 | ||
481 | --- openjdk/hotspot/make/defs.make | ||
482 | +++ openjdk/hotspot/make/defs.make | ||
483 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
484 | ifdef LP64 | ||
485 | BUILDARCH = amd64 | ||
486 | else | ||
487 | - BUILDARCH = i486 | ||
488 | + BUILDARCH = x86 | ||
489 | endif | ||
490 | endif | ||
491 | ifeq ($(BUILDARCH), sparc) | ||
492 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
493 | |||
494 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
495 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
496 | - LIBARCH/i486 = i386 | ||
497 | + LIBARCH/x86 = x86 | ||
498 | LIBARCH/amd64 = amd64 | ||
499 | LIBARCH/sparc = sparc | ||
500 | LIBARCH/sparcv9 = sparcv9 | ||
501 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
502 | index bc82543..4a1ef4e 100644 | ||
503 | --- openjdk/hotspot/make/jprt.config | ||
504 | +++ openjdk/hotspot/make/jprt.config | ||
505 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
506 | # LINUX: X86, AMD64 | ||
507 | osarch=`uname -m` | ||
508 | if [ "${osarch}" = i686 ] ; then | ||
509 | - linux_arch=i586 | ||
510 | + linux_arch=x86 | ||
511 | elif [ "${osarch}" = x86_64 ] ; then | ||
512 | linux_arch=amd64 | ||
513 | fi | ||
514 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
515 | index eb2ce82..7193de0 100644 | ||
516 | --- openjdk/hotspot/make/jprt.properties | ||
517 | +++ openjdk/hotspot/make/jprt.properties | ||
518 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
519 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
520 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
521 | |||
522 | -jprt.my.linux.i586=linux_i586 | ||
523 | +jprt.my.linux.x86=linux_x86 | ||
524 | jprt.my.linux.x64=linux_x64 | ||
525 | jprt.my.windows.i586=windows_i586 | ||
526 | jprt.my.windows.x64=windows_x64 | ||
527 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
528 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
529 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
530 | |||
531 | -jprt.my.linux.i586.test.targets = \ | ||
532 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
533 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
534 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
535 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
536 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
537 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
538 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
539 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
540 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
541 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
542 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
543 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
544 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
545 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
546 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
547 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
548 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
549 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
550 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
551 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
552 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
553 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
554 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
555 | +jprt.my.linux.x86.test.targets = \ | ||
556 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
557 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
558 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
559 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
560 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
561 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
562 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
563 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
564 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
565 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
566 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
567 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
568 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
569 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
570 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
571 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
572 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
573 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
574 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
575 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
576 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
577 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
578 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
579 | |||
580 | jprt.my.linux.x64.test.targets = \ | ||
581 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
582 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
583 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
584 | ${jprt.my.solaris.i586.test.targets}, \ | ||
585 | ${jprt.my.solaris.x64.test.targets}, \ | ||
586 | - ${jprt.my.linux.i586.test.targets}, \ | ||
587 | + ${jprt.my.linux.x86.test.targets}, \ | ||
588 | ${jprt.my.linux.x64.test.targets}, \ | ||
589 | ${jprt.my.windows.i586.test.targets}, \ | ||
590 | ${jprt.my.windows.x64.test.targets} | ||
591 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
592 | index e317fdd..5d3b1ff 100644 | ||
593 | --- openjdk/hotspot/make/linux/build.sh | ||
594 | +++ openjdk/hotspot/make/linux/build.sh | ||
595 | @@ -43,7 +43,7 @@ esac | ||
596 | |||
597 | case `uname -m` in | ||
598 | i386|i486|i586|i686) | ||
599 | - mach=i386 | ||
600 | + mach=x86 | ||
601 | ;; | ||
602 | *) | ||
603 | echo "Unsupported machine: " `uname -m` | ||
604 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
605 | index add9823..cbbf81f 100644 | ||
606 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
607 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
608 | @@ -30,7 +30,7 @@ | ||
609 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
610 | # environment or on the command-line: | ||
611 | # | ||
612 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
613 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
614 | # BUILDARCH - build directory | ||
615 | # LIBARCH - the corresponding directory in JDK/JRE | ||
616 | # GAMMADIR - top of workspace | ||
617 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
618 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
619 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
620 | |||
621 | -DATA_MODE/i486 = 32 | ||
622 | +DATA_MODE/x86 = 32 | ||
623 | DATA_MODE/sparc = 32 | ||
624 | DATA_MODE/sparcv9 = 64 | ||
625 | DATA_MODE/amd64 = 64 | ||
626 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
627 | index 113d4f8..d3f06cb 100644 | ||
628 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
629 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
630 | @@ -78,7 +78,7 @@ endif | ||
631 | # Processor-specific files for other processors are excluded by default. Use | ||
632 | # CS_CPU=x to include platform-specific files for other platforms. | ||
633 | ifndef CS_CPU | ||
634 | -CS_CPU = i486 sparc amd64 ia64 | ||
635 | +CS_CPU = x86 sparc amd64 ia64 | ||
636 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
637 | endif | ||
638 | |||
639 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
640 | index 9131c79..138dfb3 100644 | ||
641 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
642 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
643 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
644 | HS_ARCH = sparc | ||
645 | endif | ||
646 | |||
647 | +# x86 | ||
648 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
649 | + ARCH_DATA_MODEL = 32 | ||
650 | + PLATFORM = linux-x86 | ||
651 | + VM_PLATFORM = linux_x86 | ||
652 | + HS_ARCH = x86 | ||
653 | +endif | ||
654 | + | ||
655 | # x86_64 | ||
656 | ifeq ($(ARCH), x86_64) | ||
657 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
658 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
659 | HS_ARCH = x86 | ||
660 | else | ||
661 | ARCH_DATA_MODEL = 32 | ||
662 | - PLATFORM = linux-i586 | ||
663 | - VM_PLATFORM = linux_i486 | ||
664 | + PLATFORM = linux-x86 | ||
665 | + VM_PLATFORM = linux_x86 | ||
666 | HS_ARCH = x86 | ||
667 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
668 | - ARCH = i686 | ||
669 | endif | ||
670 | endif | ||
671 | |||
672 | -# i686 | ||
673 | -ifeq ($(ARCH), i686) | ||
674 | - ARCH_DATA_MODEL = 32 | ||
675 | - PLATFORM = linux-i586 | ||
676 | - VM_PLATFORM = linux_i486 | ||
677 | - HS_ARCH = x86 | ||
678 | -endif | ||
679 | - | ||
680 | JDK_INCLUDE_SUBDIR=linux | ||
681 | |||
682 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
683 | diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make | ||
684 | index a2c24bc..27bad01 100644 | ||
685 | --- openjdk/hotspot/make/linux/makefiles/gcc.make | ||
686 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make | ||
687 | @@ -77,7 +77,7 @@ CFLAGS += -fcheck-new | ||
688 | CFLAGS += -g | ||
689 | |||
690 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
691 | -ARCHFLAG/i486 = -m32 -march=i586 | ||
692 | +ARCHFLAG/x86 = -m32 | ||
693 | ARCHFLAG/amd64 = -m64 | ||
694 | ARCHFLAG/ia64 = | ||
695 | ARCHFLAG/sparc = -m32 -mcpu=v9 | ||
696 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
697 | index 0a9f75b..2e29bb9 100644 | ||
698 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
699 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
700 | @@ -30,7 +30,7 @@ CC = cc | ||
701 | AS = $(CC) -c | ||
702 | |||
703 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
704 | -ARCHFLAG/i486 = -m32 | ||
705 | +ARCHFLAG/x86 = -m32 | ||
706 | ARCHFLAG/amd64 = -m64 | ||
707 | |||
708 | CFLAGS += $(ARCHFLAG) | ||
709 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
710 | deleted file mode 100644 | ||
711 | index 610ac91..0000000 | ||
712 | --- openjdk/hotspot/make/linux/platform_i486 | ||
713 | +++ /dev/null | ||
714 | @@ -1,15 +0,0 @@ | ||
715 | -os_family = linux | ||
716 | - | ||
717 | -arch = x86 | ||
718 | - | ||
719 | -arch_model = x86_32 | ||
720 | - | ||
721 | -os_arch = linux_x86 | ||
722 | - | ||
723 | -os_arch_model = linux_x86_32 | ||
724 | - | ||
725 | -lib_arch = i386 | ||
726 | - | ||
727 | -compiler = gcc | ||
728 | - | ||
729 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
730 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
731 | deleted file mode 100644 | ||
732 | index 325a3fe..0000000 | ||
733 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
734 | +++ /dev/null | ||
735 | @@ -1,17 +0,0 @@ | ||
736 | -os_family = linux | ||
737 | - | ||
738 | -arch = x86 | ||
739 | - | ||
740 | -arch_model = x86_32 | ||
741 | - | ||
742 | -os_arch = linux_x86 | ||
743 | - | ||
744 | -os_arch_model = linux_x86_32 | ||
745 | - | ||
746 | -lib_arch = i386 | ||
747 | - | ||
748 | -compiler = sparcWorks | ||
749 | - | ||
750 | -gnu_dis_arch = i386 | ||
751 | - | ||
752 | -sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
753 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
754 | new file mode 100644 | ||
755 | index 0000000..5c613fe | ||
756 | --- /dev/null | ||
757 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
758 | @@ -0,0 +1,15 @@ | ||
759 | +os_family = linux | ||
760 | + | ||
761 | +arch = x86 | ||
762 | + | ||
763 | +arch_model = x86_32 | ||
764 | + | ||
765 | +os_arch = linux_x86 | ||
766 | + | ||
767 | +os_arch_model = linux_x86_32 | ||
768 | + | ||
769 | +lib_arch = x86 | ||
770 | + | ||
771 | +compiler = gcc | ||
772 | + | ||
773 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
774 | diff --git openjdk/hotspot/make/linux/platform_x86.suncc openjdk/hotspot/make/linux/platform_x86.suncc | ||
775 | new file mode 100644 | ||
776 | index 0000000..717fc75 | ||
777 | --- /dev/null | ||
778 | +++ openjdk/hotspot/make/linux/platform_x86.suncc | ||
779 | @@ -0,0 +1,17 @@ | ||
780 | +os_family = linux | ||
781 | + | ||
782 | +arch = x86 | ||
783 | + | ||
784 | +arch_model = x86_32 | ||
785 | + | ||
786 | +os_arch = linux_x86 | ||
787 | + | ||
788 | +os_arch_model = linux_x86_32 | ||
789 | + | ||
790 | +lib_arch = x86 | ||
791 | + | ||
792 | +compiler = sparcWorks | ||
793 | + | ||
794 | +gnu_dis_arch = x86 | ||
795 | + | ||
796 | +sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
797 | diff --git openjdk/hotspot/src/os/linux/launcher/java_md.c openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
798 | index 50a86cd..48141be 100644 | ||
799 | --- openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
800 | +++ openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
801 | @@ -56,8 +56,8 @@ | ||
802 | * models is supported, then DUAL_MODE is defined. When DUAL_MODE is | ||
803 | * defined, the architecture names for the narrow and wide version of | ||
804 | * the architecture are defined in BIG_ARCH and SMALL_ARCH. Currently | ||
805 | - * only Solaris on sparc/sparcv9 and i586/amd64 is DUAL_MODE; linux | ||
806 | - * i586/amd64 could be defined as DUAL_MODE but that is not the | ||
807 | + * only Solaris on sparc/sparcv9 and x86/amd64 is DUAL_MODE; linux | ||
808 | + * x86/amd64 could be defined as DUAL_MODE but that is not the | ||
809 | * current policy. | ||
810 | */ | ||
811 | |||
812 | @@ -75,8 +75,8 @@ | ||
813 | |||
814 | #else /* 32-bit data model */ | ||
815 | |||
816 | -# ifdef i586 | ||
817 | -# define ARCH "i386" | ||
818 | +# ifdef x86 | ||
819 | +# define ARCH "x86" | ||
820 | # elif defined(__sparc) | ||
821 | # define ARCH "sparc" | ||
822 | # endif | ||
823 | @@ -90,7 +90,7 @@ | ||
824 | # define SMALL_ARCH "sparc" | ||
825 | # else | ||
826 | # define BIG_ARCH "amd64" | ||
827 | -# define SMALL_ARCH "i386" | ||
828 | +# define SMALL_ARCH "x86" | ||
829 | # endif | ||
830 | # include <sys/systeminfo.h> | ||
831 | # include <sys/elf.h> | ||
832 | @@ -1103,7 +1103,7 @@ void PrintMachineDependentOptions() { | ||
833 | * This code is somewhat more confused with #ifdef's than we'd | ||
834 | * like because this file is used by both Solaris and Linux | ||
835 | * platforms, and so needs to be parameterized for SPARC and | ||
836 | - * i586 hardware. The other Linux platforms (amd64 and ia64) | ||
837 | + * x86 hardware. The other Linux platforms (amd64 and ia64) | ||
838 | * don't even ask this question, because they only come with | ||
839 | * server JVMs. */ | ||
840 | |||
841 | @@ -1168,11 +1168,11 @@ solaris_sparc_ServerClassMachine(void) { | ||
842 | |||
843 | #endif /* __sun && __sparc */ | ||
844 | |||
845 | -#if defined(__sun) && defined(i586) | ||
846 | +#if defined(__sun) && defined(x86) | ||
847 | |||
848 | /* | ||
849 | * A utility method for asking the CPU about itself. | ||
850 | - * There's a corresponding version of linux-i586 | ||
851 | + * There's a corresponding version of linux-x86 | ||
852 | * because the compilers are different. | ||
853 | */ | ||
854 | void | ||
855 | @@ -1218,13 +1218,13 @@ get_cpuid(uint32_t arg, | ||
856 | #endif | ||
857 | } | ||
858 | |||
859 | -#endif /* __sun && i586 */ | ||
860 | +#endif /* __sun && x86 */ | ||
861 | |||
862 | -#if defined(__linux__) && defined(i586) | ||
863 | +#if defined(__linux__) && defined(x86) | ||
864 | |||
865 | /* | ||
866 | * A utility method for asking the CPU about itself. | ||
867 | - * There's a corresponding version of solaris-i586 | ||
868 | + * There's a corresponding version of solaris-x86 | ||
869 | * because the compilers are different. | ||
870 | */ | ||
871 | void | ||
872 | @@ -1286,11 +1286,11 @@ get_cpuid(uint32_t arg, | ||
873 | #endif | ||
874 | } | ||
875 | |||
876 | -#endif /* __linux__ && i586 */ | ||
877 | +#endif /* __linux__ && x86 */ | ||
878 | |||
879 | -#ifdef i586 | ||
880 | +#ifdef x86 | ||
881 | /* | ||
882 | - * Routines shared by solaris-i586 and linux-i586. | ||
883 | + * Routines shared by solaris-x86 and linux-x86. | ||
884 | */ | ||
885 | |||
886 | enum HyperThreadingSupport_enum { | ||
887 | @@ -1430,11 +1430,11 @@ physical_processors(void) { | ||
888 | return result; | ||
889 | } | ||
890 | |||
891 | -#endif /* i586 */ | ||
892 | +#endif /* x86 */ | ||
893 | |||
894 | -#if defined(__sun) && defined(i586) | ||
895 | +#if defined(__sun) && defined(x86) | ||
896 | |||
897 | -/* The definition of a server-class machine for solaris-i586/amd64 */ | ||
898 | +/* The definition of a server-class machine for solaris-x86/amd64 */ | ||
899 | jboolean | ||
900 | solaris_i586_ServerClassMachine(void) { | ||
901 | jboolean result = JNI_FALSE; | ||
902 | @@ -1463,11 +1463,11 @@ solaris_i586_ServerClassMachine(void) { | ||
903 | return result; | ||
904 | } | ||
905 | |||
906 | -#endif /* __sun && i586 */ | ||
907 | +#endif /* __sun && x86 */ | ||
908 | |||
909 | -#if defined(__linux__) && defined(i586) | ||
910 | +#if defined(__linux__) && defined(x86) | ||
911 | |||
912 | -/* The definition of a server-class machine for linux-i586 */ | ||
913 | +/* The definition of a server-class machine for linux-x86 */ | ||
914 | jboolean | ||
915 | linux_i586_ServerClassMachine(void) { | ||
916 | jboolean result = JNI_FALSE; | ||
917 | @@ -1496,7 +1496,7 @@ linux_i586_ServerClassMachine(void) { | ||
918 | return result; | ||
919 | } | ||
920 | |||
921 | -#endif /* __linux__ && i586 */ | ||
922 | +#endif /* __linux__ && x86 */ | ||
923 | |||
924 | /* Dispatch to the platform-specific definition of "server-class" */ | ||
925 | jboolean | ||
926 | @@ -1504,9 +1504,9 @@ ServerClassMachine(void) { | ||
927 | jboolean result = JNI_FALSE; | ||
928 | #if defined(__sun) && defined(__sparc) | ||
929 | result = solaris_sparc_ServerClassMachine(); | ||
930 | -#elif defined(__sun) && defined(i586) | ||
931 | +#elif defined(__sun) && defined(x86) | ||
932 | result = solaris_i586_ServerClassMachine(); | ||
933 | -#elif defined(__linux__) && defined(i586) | ||
934 | +#elif defined(__linux__) && defined(x86) | ||
935 | result = linux_i586_ServerClassMachine(); | ||
936 | #else | ||
937 | if (_launcher_debug) { | ||
938 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
939 | index b2b3162..a4bbe70 100644 | ||
940 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
941 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
942 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
943 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
944 | #ifdef __ia64__ | ||
945 | #define SYS_gettid 1105 | ||
946 | -#elif __i386__ | ||
947 | +#elif __x86__ | ||
948 | #define SYS_gettid 224 | ||
949 | #elif __amd64__ | ||
950 | #define SYS_gettid 186 | ||
951 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
952 | #elif defined(IA64) | ||
953 | static char cpu_arch[] = "ia64"; | ||
954 | #elif defined(IA32) | ||
955 | -static char cpu_arch[] = "i386"; | ||
956 | +static char cpu_arch[] = "x86"; | ||
957 | #elif defined(AMD64) | ||
958 | static char cpu_arch[] = "amd64"; | ||
959 | #elif defined(SPARC) | ||
960 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
961 | index 6bdf4b8..fd43c6e 100644 | ||
962 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
963 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
964 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
965 | endif | ||
966 | |||
967 | # Default arch; it is changed below as needed. | ||
968 | -ARCH = i386 | ||
969 | +ARCH = x86 | ||
970 | OS = $(shell uname) | ||
971 | |||
972 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
973 | @@ -87,7 +87,7 @@ endif # SunOS | ||
974 | LIBARCH = $(ARCH) | ||
975 | ifdef LP64 | ||
976 | LIBARCH64/sparc = sparcv9 | ||
977 | -LIBARCH64/i386 = amd64 | ||
978 | +LIBARCH64/x86 = amd64 | ||
979 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
980 | ifneq ($(LIBARCH64),) | ||
981 | LIBARCH = $(LIBARCH64) | ||
982 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
983 | index 75b7efe..62c692b 100644 | ||
984 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
985 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
986 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
987 | else | ||
988 | disassembler_usage(stderr); /* better than nothing */ | ||
989 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
990 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
991 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
992 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
993 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
994 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
995 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
996 | #endif | ||
997 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
998 | static const char* native_arch_name() { | ||
999 | const char* res = HOTSPOT_LIB_ARCH; | ||
1000 | #ifdef LIBARCH_amd64 | ||
1001 | - res = "i386:x86-64"; | ||
1002 | + res = "x86:x86-64"; | ||
1003 | #endif | ||
1004 | #ifdef LIBARCH_sparc | ||
1005 | res = "sparc:v8plusb"; | ||
1006 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/i486.ad openjdk/hotspot/src/share/vm/adlc/Test/i486.ad | ||
1007 | deleted file mode 100644 | ||
1008 | index e69de29..0000000 | ||
1009 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/x86.ad openjdk/hotspot/src/share/vm/adlc/Test/x86.ad | ||
1010 | new file mode 100644 | ||
1011 | index 0000000..e69de29 | ||
1012 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
1013 | index 2596d85..c2f3eb9 100644 | ||
1014 | --- openjdk/hotspot/test/Makefile | ||
1015 | +++ openjdk/hotspot/test/Makefile | ||
1016 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
1017 | PLATFORM = solaris | ||
1018 | ARCH = $(shell uname -p) | ||
1019 | ifeq ($(ARCH), i386) | ||
1020 | - ARCH=i586 | ||
1021 | + ARCH=x86 | ||
1022 | endif | ||
1023 | endif | ||
1024 | ifeq ($(OSNAME), Linux) | ||
1025 | PLATFORM = linux | ||
1026 | ARCH = $(shell uname -m) | ||
1027 | - ifeq ($(ARCH), i386) | ||
1028 | - ARCH = i586 | ||
1029 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
1030 | + ARCH = x86 | ||
1031 | endif | ||
1032 | endif | ||
1033 | ifeq ($(OSNAME), Windows_NT) | ||
1034 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
1035 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
1036 | ARCH = x64 | ||
1037 | else | ||
1038 | - ARCH = i586 | ||
1039 | + ARCH = x86 | ||
1040 | endif | ||
1041 | endif | ||
1042 | endif | ||
1043 | -- | ||
1044 | 1.6.5 | ||
1045 | |||
1046 | diff --git openjdk/hotspot/make/linux/makefiles/i486.make b/hotspot/make/linux/makefiles/i486.make | ||
1047 | deleted file mode 100644 | ||
1048 | index 9dd0b44..0000000 | ||
1049 | --- openjdk/hotspot/make/linux/makefiles/i486.make | ||
1050 | +++ /dev/null | ||
1051 | @@ -1,36 +0,0 @@ | ||
1052 | -# | ||
1053 | -# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1054 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1055 | -# | ||
1056 | -# This code is free software; you can redistribute it and/or modify it | ||
1057 | -# under the terms of the GNU General Public License version 2 only, as | ||
1058 | -# published by the Free Software Foundation. | ||
1059 | -# | ||
1060 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1061 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1062 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1063 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
1064 | -# accompanied this code). | ||
1065 | -# | ||
1066 | -# You should have received a copy of the GNU General Public License version | ||
1067 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
1068 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1069 | -# | ||
1070 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1071 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1072 | -# have any questions. | ||
1073 | -# | ||
1074 | -# | ||
1075 | - | ||
1076 | -# TLS helper, assembled from .s file | ||
1077 | -# Not included in includeDB because it has no dependencies | ||
1078 | -Obj_Files += linux_x86_32.o | ||
1079 | - | ||
1080 | -# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1081 | -OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1082 | -# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1083 | -OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1084 | -# Must also specify if CPU is little endian | ||
1085 | -CFLAGS += -DVM_LITTLE_ENDIAN | ||
1086 | - | ||
1087 | -OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1088 | diff --git openjdk/hotspot/make/linux/makefiles/x86.make openjdk/hotspot/make/linux/makefiles/x86.make | ||
1089 | new file mode 100644 | ||
1090 | index 0000000..9dd0b44 | ||
1091 | --- /dev/null | ||
1092 | +++ openjdk/hotspot/make/linux/makefiles/x86.make | ||
1093 | @@ -0,0 +1,36 @@ | ||
1094 | +# | ||
1095 | +# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1096 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1097 | +# | ||
1098 | +# This code is free software; you can redistribute it and/or modify it | ||
1099 | +# under the terms of the GNU General Public License version 2 only, as | ||
1100 | +# published by the Free Software Foundation. | ||
1101 | +# | ||
1102 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1103 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1104 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1105 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
1106 | +# accompanied this code). | ||
1107 | +# | ||
1108 | +# You should have received a copy of the GNU General Public License version | ||
1109 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
1110 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1111 | +# | ||
1112 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1113 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1114 | +# have any questions. | ||
1115 | +# | ||
1116 | +# | ||
1117 | + | ||
1118 | +# TLS helper, assembled from .s file | ||
1119 | +# Not included in includeDB because it has no dependencies | ||
1120 | +Obj_Files += linux_x86_32.o | ||
1121 | + | ||
1122 | +# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1123 | +OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1124 | +# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1125 | +OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1126 | +# Must also specify if CPU is little endian | ||
1127 | +CFLAGS += -DVM_LITTLE_ENDIAN | ||
1128 | + | ||
1129 | +OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1130 | |||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8/icedtea-jdk-sane-x86-arch.patch b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-jdk-sane-x86-arch.patch new file mode 100644 index 0000000..f730c4a --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-jdk-sane-x86-arch.patch | |||
@@ -0,0 +1,186 @@ | |||
1 | From 662e11a8b6017f39ceb6d00dcdbfe11473b56174 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Fri, 23 Oct 2009 18:06:43 +0200 | ||
4 | Subject: [PATCH] sane-arch2 | ||
5 | |||
6 | --- | ||
7 | openjdk/jdk/make/common/shared/Compiler-gcc.gmk | 4 ++-- | ||
8 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | Index: openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
11 | =================================================================== | ||
12 | --- openjdk/jdk/make/common/shared/Compiler-gcc.gmk.orig 2010-04-22 12:04:08.000000000 +0200 | ||
13 | +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2010-04-22 12:13:53.335169757 +0200 | ||
14 | @@ -85,8 +85,8 @@ | ||
15 | REQUIRED_CC_VER = 3.2 | ||
16 | REQUIRED_GCC_VER = 3.2.* | ||
17 | endif | ||
18 | - ifeq ($(ARCH), i586) | ||
19 | - # i586 | ||
20 | + ifeq ($(ARCH), x86) | ||
21 | + # x86 | ||
22 | REQUIRED_CC_VER = 3.2 | ||
23 | REQUIRED_GCC_VER = 3.2.1* | ||
24 | REQUIRED_GCC_VER_INT = 3.2.1-7a | ||
25 | Index: openjdk/jdk/src/solaris/bin/i586/jvm.cfg | ||
26 | =================================================================== | ||
27 | --- openjdk/jdk/src/solaris/bin/i586/jvm.cfg 2010-02-17 04:14:46.000000000 +0100 | ||
28 | +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
29 | @@ -1,38 +0,0 @@ | ||
30 | -# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
31 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
32 | -# | ||
33 | -# This code is free software; you can redistribute it and/or modify it | ||
34 | -# under the terms of the GNU General Public License version 2 only, as | ||
35 | -# published by the Free Software Foundation. Sun designates this | ||
36 | -# particular file as subject to the "Classpath" exception as provided | ||
37 | -# by Sun in the LICENSE file that accompanied this code. | ||
38 | -# | ||
39 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
40 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
41 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
42 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
43 | -# accompanied this code). | ||
44 | -# | ||
45 | -# You should have received a copy of the GNU General Public License version | ||
46 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
47 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
48 | -# | ||
49 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
50 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
51 | -# have any questions. | ||
52 | -# | ||
53 | -# List of JVMs that can be used as an option to java, javac, etc. | ||
54 | -# Order is important -- first in this list is the default JVM. | ||
55 | -# NOTE that this both this file and its format are UNSUPPORTED and | ||
56 | -# WILL GO AWAY in a future release. | ||
57 | -# | ||
58 | -# You may also select a JVM in an arbitrary location with the | ||
59 | -# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
60 | -# and may not be available in a future release. | ||
61 | -# | ||
62 | --client IF_SERVER_CLASS -server | ||
63 | --server KNOWN | ||
64 | --hotspot ALIASED_TO -client | ||
65 | --classic WARN | ||
66 | --native ERROR | ||
67 | --green ERROR | ||
68 | Index: openjdk/jdk/src/solaris/bin/x86/jvm.cfg | ||
69 | =================================================================== | ||
70 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
71 | +++ openjdk/jdk/src/solaris/bin/x86/jvm.cfg 2010-04-22 12:12:10.545603344 +0200 | ||
72 | @@ -0,0 +1,38 @@ | ||
73 | +# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
74 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
75 | +# | ||
76 | +# This code is free software; you can redistribute it and/or modify it | ||
77 | +# under the terms of the GNU General Public License version 2 only, as | ||
78 | +# published by the Free Software Foundation. Sun designates this | ||
79 | +# particular file as subject to the "Classpath" exception as provided | ||
80 | +# by Sun in the LICENSE file that accompanied this code. | ||
81 | +# | ||
82 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
83 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
84 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
85 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
86 | +# accompanied this code). | ||
87 | +# | ||
88 | +# You should have received a copy of the GNU General Public License version | ||
89 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
90 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
91 | +# | ||
92 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
93 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
94 | +# have any questions. | ||
95 | +# | ||
96 | +# List of JVMs that can be used as an option to java, javac, etc. | ||
97 | +# Order is important -- first in this list is the default JVM. | ||
98 | +# NOTE that this both this file and its format are UNSUPPORTED and | ||
99 | +# WILL GO AWAY in a future release. | ||
100 | +# | ||
101 | +# You may also select a JVM in an arbitrary location with the | ||
102 | +# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
103 | +# and may not be available in a future release. | ||
104 | +# | ||
105 | +-client IF_SERVER_CLASS -server | ||
106 | +-server KNOWN | ||
107 | +-hotspot ALIASED_TO -client | ||
108 | +-classic WARN | ||
109 | +-native ERROR | ||
110 | +-green ERROR | ||
111 | Index: openjdk/jdk/make/common/shared/Platform.gmk | ||
112 | =================================================================== | ||
113 | --- openjdk/jdk/make/common/shared/Platform.gmk.orig 2010-04-22 12:04:08.000000000 +0200 | ||
114 | +++ openjdk/jdk/make/common/shared/Platform.gmk 2010-04-22 12:16:43.848486263 +0200 | ||
115 | @@ -56,8 +56,8 @@ | ||
116 | # OS_VENDOR company name | ||
117 | # TEMP_DISK /tmp or C:/temp | ||
118 | # ARCH_DATA_MODEL 32 or 64 | ||
119 | -# ARCH sparc, sparcv9, i586, amd64, or ia64 | ||
120 | -# ARCH_FAMILY sparc or i586 | ||
121 | +# ARCH sparc, sparcv9, x86, amd64, or ia64 | ||
122 | +# ARCH_FAMILY sparc or x86 | ||
123 | # ARCHPROP sparc or x86 | ||
124 | # ARCH_VM_SUBDIR jre/bin, jre/lib/sparc, etc. | ||
125 | # LIBARCH sparc, sparcv9, i386, amd64, or ia64 | ||
126 | @@ -124,7 +124,7 @@ | ||
127 | processor := $(shell uname -p) | ||
128 | archExpr = case "$(processor)" in \ | ||
129 | i[3-9]86) \ | ||
130 | - echo i586 \ | ||
131 | + echo 586 \ | ||
132 | ;; \ | ||
133 | sparc*) \ | ||
134 | echo sparc \ | ||
135 | @@ -200,7 +200,7 @@ | ||
136 | endif | ||
137 | archExpr = case "$(mach)" in \ | ||
138 | i[3-9]86) \ | ||
139 | - echo i586 \ | ||
140 | + echo x86 \ | ||
141 | ;; \ | ||
142 | ia64) \ | ||
143 | echo ia64 \ | ||
144 | @@ -237,7 +237,7 @@ | ||
145 | ARCH=sparcv9 | ||
146 | endif | ||
147 | else | ||
148 | - # i586 is 32-bit, amd64 is 64-bit | ||
149 | + # x86 is 32-bit, amd64 is 64-bit | ||
150 | ifndef ARCH_DATA_MODEL | ||
151 | ifeq ($(ARCH), alpha) | ||
152 | ARCH_DATA_MODEL=64 | ||
153 | @@ -248,7 +248,7 @@ | ||
154 | ifeq ($(ARCH), arm) | ||
155 | ARCH_DATA_MODEL=32 | ||
156 | endif | ||
157 | - ifeq ($(ARCH), i586) | ||
158 | + ifeq ($(ARCH), x86) | ||
159 | ARCH_DATA_MODEL=32 | ||
160 | endif | ||
161 | ifeq ($(ARCH), ia64) | ||
162 | @@ -281,12 +281,7 @@ | ||
163 | endif | ||
164 | endif | ||
165 | |||
166 | - # Need to maintain the jre/lib/i386 location for 32-bit Intel | ||
167 | - ifeq ($(ARCH), i586) | ||
168 | - LIBARCH = i386 | ||
169 | - else | ||
170 | - LIBARCH = $(ARCH) | ||
171 | - endif | ||
172 | + LIBARCH = $(ARCH) | ||
173 | |||
174 | # Value of Java os.arch property | ||
175 | ARCHPROP = $(LIBARCH) | ||
176 | @@ -378,8 +373,8 @@ | ||
177 | REQUIRED_WINDOWS_VERSION=2000 or Unknown | ||
178 | #REQUIRED_WINDOWS_VERSION=XP Professional | ||
179 | # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel | ||
180 | - ARCH=i586 | ||
181 | - LIBARCH=i386 | ||
182 | + ARCH=x86 | ||
183 | + LIBARCH=x86 | ||
184 | # Value of Java os.arch property | ||
185 | ARCHPROP=x86 | ||
186 | endif | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8/icedtea-sane-x86-arch-name.patch b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-sane-x86-arch-name.patch new file mode 100644 index 0000000..b4c6857 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-sane-x86-arch-name.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Index: icedtea6-1.8/acinclude.m4 | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/acinclude.m4 2010-04-10 21:58:40.000000000 +0200 | ||
4 | +++ icedtea6-1.8/acinclude.m4 2010-04-22 10:09:42.752587915 +0200 | ||
5 | @@ -9,11 +9,11 @@ | ||
6 | ARCHFLAG="-m64" | ||
7 | ;; | ||
8 | i?86) | ||
9 | - BUILD_ARCH_DIR=i586 | ||
10 | - INSTALL_ARCH_DIR=i386 | ||
11 | - JRE_ARCH_DIR=i386 | ||
12 | + BUILD_ARCH_DIR=x86 | ||
13 | + INSTALL_ARCH_DIR=x86 | ||
14 | + JRE_ARCH_DIR=x86 | ||
15 | ARCH_PREFIX=${LINUX32} | ||
16 | - CROSS_TARGET_ARCH=i386 | ||
17 | + CROSS_TARGET_ARCH=x86 | ||
18 | ARCHFLAG="-m32" | ||
19 | ;; | ||
20 | alpha*) | ||
21 | @@ -765,7 +765,7 @@ | ||
22 | ZERO_LIBARCH="${INSTALL_ARCH_DIR}" | ||
23 | dnl can't use AC_CHECK_SIZEOF on multilib | ||
24 | case "${ZERO_LIBARCH}" in | ||
25 | - i386|ppc|s390|sparc) | ||
26 | + x86|ppc|s390|sparc) | ||
27 | ZERO_BITSPERWORD=32 | ||
28 | ;; | ||
29 | amd64|ppc64|s390x|sparc64) | ||
30 | @@ -777,7 +777,7 @@ | ||
31 | esac | ||
32 | AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"]) | ||
33 | case "${ZERO_LIBARCH}" in | ||
34 | - i386) | ||
35 | + x86) | ||
36 | ZERO_ARCHDEF="IA32" | ||
37 | ;; | ||
38 | ppc*) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8/icedtea-unbreak-float.patch b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-unbreak-float.patch new file mode 100644 index 0000000..9f875de --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8/icedtea-unbreak-float.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100 | ||
4 | +++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100 | ||
5 | @@ -27,13 +27,11 @@ | ||
6 | |||
7 | #include "jfdlibm.h" | ||
8 | |||
9 | -#ifdef __NEWVALID /* special setup for Sun test regime */ | ||
10 | #if defined(i386) || defined(i486) || \ | ||
11 | defined(intel) || defined(x86) || \ | ||
12 | defined(i86pc) || defined(_M_IA64) || defined(ia64) | ||
13 | #define _LITTLE_ENDIAN | ||
14 | #endif | ||
15 | -#endif | ||
16 | |||
17 | #ifdef _LITTLE_ENDIAN | ||
18 | #define __HI(x) *(1+(int*)&x) | ||
diff --git a/recipes-core/icedtea/icedtea6-native.inc b/recipes-core/icedtea/icedtea6-native.inc new file mode 100644 index 0000000..afd7239 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native.inc | |||
@@ -0,0 +1,215 @@ | |||
1 | DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools" | ||
2 | HOMEPAGE = "http://icedtea.classpath.org" | ||
3 | LICENSE = "GPL with Classpath Exception" | ||
4 | INC_PR = "r4" | ||
5 | |||
6 | DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ | ||
7 | xalan-j-native xerces-j-native rhino-native \ | ||
8 | ant-native \ | ||
9 | libx11-native xproto-native libxt-native libxext-native \ | ||
10 | freetype-native zlib-native giflib-native jpeg-native \ | ||
11 | zip-native \ | ||
12 | " | ||
13 | |||
14 | inherit native java autotools | ||
15 | |||
16 | JAVA_HOME[unexport] = "1" | ||
17 | |||
18 | # No parallel build yet. | ||
19 | PARALLEL_MAKE = "" | ||
20 | |||
21 | # openjdk-ecj looks in /usr/include and /usr/lib for freetype by default. | ||
22 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" | ||
23 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" | ||
24 | |||
25 | # Configure options compatible with Cacao >= 0.99 only! | ||
26 | EXTRA_OECONF = "\ | ||
27 | --with-parallel-jobs=1 \ | ||
28 | --disable-docs \ | ||
29 | --disable-pulse-java \ | ||
30 | --disable-plugin \ | ||
31 | --disable-npplugin \ | ||
32 | --disable-xrender \ | ||
33 | \ | ||
34 | --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-bootstrap \ | ||
35 | \ | ||
36 | --with-ecj-jar=${STAGING_DATADIR_JAVA_NATIVE}/ecj-bootstrap.jar \ | ||
37 | --with-java=${STAGING_BINDIR_NATIVE}/java \ | ||
38 | --with-javac=${STAGING_BINDIR_NATIVE}/ecj-bootstrap \ | ||
39 | --with-javah=${STAGING_BINDIR_NATIVE}/gjavah \ | ||
40 | --with-jar=${STAGING_BINDIR_NATIVE}/fastjar \ | ||
41 | --with-rmic=${STAGING_BINDIR_NATIVE}/grmic \ | ||
42 | --with-xalan2-jar=${STAGING_DATADIR_NATIVE}/java/xalan2.jar \ | ||
43 | --with-xalan2-serializer-jar=${STAGING_DATADIR_NATIVE}/java/serializer.jar \ | ||
44 | --with-xerces2-jar=${STAGING_DATADIR_NATIVE}/java/xercesImpl.jar \ | ||
45 | --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \ | ||
46 | --with-openjdk-src-dir=${WORKDIR}/openjdk-src-dir \ | ||
47 | --with-gcj-home=${WORKDIR}/fake-jdk \ | ||
48 | \ | ||
49 | --enable-openjdk-cross-compilation \ | ||
50 | " | ||
51 | |||
52 | JDK_DIR = "icedtea6-native" | ||
53 | |||
54 | JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" | ||
55 | |||
56 | do_configure_prepend() { | ||
57 | |||
58 | case "${TARGET_ARCH}" in | ||
59 | x86_64) | ||
60 | libarch=amd64 | ||
61 | ;; | ||
62 | i386|i486|i586|i686) | ||
63 | libarch=x86 | ||
64 | ;; | ||
65 | *) | ||
66 | arch=${TARGET_ARCH} | ||
67 | libarch=${TARGET_ARCH} | ||
68 | ;; | ||
69 | esac | ||
70 | |||
71 | chmod -R ug+w ${WORKDIR}/openjdk-src-dir | ||
72 | (cd ${WORKDIR}/openjdk-src-dir && sh ${S}/fsg.sh) | ||
73 | |||
74 | # Automatically copy everything that starts with "icedtea" and ends with | ||
75 | # ".patch" into the patches directory. | ||
76 | find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; | ||
77 | |||
78 | # Prepare JDK-like directory with Classpath' files which we can treat as a | ||
79 | # SYSTEM_GCJ_DIR afterwards. | ||
80 | mkdir -p ${WORKDIR}/fake-jdk/jre/lib/ | ||
81 | ln -sf ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip ${WORKDIR}/fake-jdk/jre/lib/rt.jar | ||
82 | |||
83 | mkdir -p ${WORKDIR}/fake-jdk/include | ||
84 | for i in ${STAGING_INCDIR_NATIVE}/classpath/* ;do | ||
85 | test -r $i | continue; | ||
86 | bn=`basename $i` | ||
87 | ln -sf $i ${WORKDIR}/fake-jdk/include/$bn; | ||
88 | done | ||
89 | } | ||
90 | |||
91 | do_configure_append() { | ||
92 | oe_runmake patch-ecj | ||
93 | |||
94 | for F in openjdk-ecj/jdk/make/common/shared/Compiler-gcc.gmk openjdk-ecj/corba/make/common/shared/Compiler-gcc.gmk ; | ||
95 | do | ||
96 | sed -i \ | ||
97 | -e"s|\$(COMPILER_PATH)gcc\$(GCC_SUFFIX)|${CC}|" \ | ||
98 | -e"s|\$(COMPILER_PATH)gcc\$(GCC_SUFFIX) -E|${CPP}|" \ | ||
99 | -e"s|\$(COMPILER_PATH)g++\$(GCC_SUFFIX)|${CXX}|" \ | ||
100 | $F | ||
101 | done | ||
102 | |||
103 | for F in openjdk-ecj/hotspot/make/linux/makefiles/gcc.make openjdk-ecj/hotspot/agent/src/os/linux/Makefile ; | ||
104 | do | ||
105 | sed -i \ | ||
106 | -e"s|gcc\$(GCC_SUFFIX)|${CC}|" \ | ||
107 | -e"s|g++\$(GCC_SUFFIX)|${CXX}|" \ | ||
108 | $F | ||
109 | done | ||
110 | } | ||
111 | |||
112 | EXTRA_OEMAKE = ' \ | ||
113 | ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ | ||
114 | ' | ||
115 | |||
116 | do_compile() { | ||
117 | # OpenJDK uses slightly different names for certain arches. We need to know | ||
118 | # this to create some files which are expected by the build. | ||
119 | case "${TARGET_ARCH}" in | ||
120 | x86_64) | ||
121 | arch=amd64 | ||
122 | libarch=amd64 | ||
123 | ;; | ||
124 | i386|i486|i586|i686) | ||
125 | arch=x86 | ||
126 | libarch=x86 | ||
127 | ;; | ||
128 | *) | ||
129 | arch=${TARGET_ARCH} | ||
130 | libarch=${TARGET_ARCH} | ||
131 | ;; | ||
132 | esac | ||
133 | |||
134 | install -d openjdk-ecj/control/build/linux-$arch/hotspot/import/jre/lib | ||
135 | if [ $libarch != $arch ]; then | ||
136 | # Something is strange with the directoy naming. OpenJDK uses both variants. | ||
137 | ln -sf $libarch openjdk-ecj/control/build/linux-$arch/hotspot/import/jre/lib/$arch | ||
138 | fi | ||
139 | |||
140 | |||
141 | # First build hotspot to get a libjvm.so | ||
142 | echo "1/2 Building Hotspot" | ||
143 | oe_runmake hotspot | ||
144 | |||
145 | # Remove the strange recursive symlink that is created here (If it is not there, then just skip this). | ||
146 | rm -f bootstrap/ecj/jre/lib/$libarch || true | ||
147 | |||
148 | # Copy libjvm.so for target into bootstrap/jdk1.6.0/jre/lib | ||
149 | install -d bootstrap/ecj/jre/lib/$libarch | ||
150 | cp openjdk-ecj/build/linux-$arch/j2sdk-image/jre/lib/$libarch/server/libjvm.so bootstrap/ecj/jre/lib/$libarch | ||
151 | |||
152 | # OpenJDK build expects these files to exist (by creating those files we pretend | ||
153 | # that stuff was compiled) | ||
154 | common_dir=openjdk-ecj/build/linux-$arch/tmp/sun | ||
155 | for D in javax.sound/jsoundalsa sun.awt.X11/xawt sun.awt/jawt; | ||
156 | do | ||
157 | echo "creating $common_dir/$D/obj64/.files_compiled" | ||
158 | install -d $common_dir/$D/obj64 | ||
159 | touch $common_dir/$D/obj64/.files_compiled | ||
160 | |||
161 | echo "creating $common_dir/$D/obj/.files_compiled" | ||
162 | install -d $common_dir/$D/obj | ||
163 | touch $common_dir/$D/obj/.files_compiled | ||
164 | done | ||
165 | |||
166 | # now use the jni.h from the hotspot | ||
167 | #cp | ||
168 | |||
169 | echo "2/2 Running make icedtea-against-ecj" | ||
170 | # Now cross-compile bootstrap JDK | ||
171 | rm stamps/icedtea-against-ecj.stamp stamps/icedtea-ecj.stamp || true | ||
172 | oe_runmake icedtea-against-ecj | ||
173 | |||
174 | # Creates a nice symlink which allows us to reach the created files easily. | ||
175 | oe_runmake stamps/bootstrap-directory-symlink.stamp | ||
176 | } | ||
177 | |||
178 | do_install() { | ||
179 | case "${TARGET_ARCH}" in | ||
180 | x86_64) | ||
181 | JDK_ARCH=amd64 | ||
182 | ;; | ||
183 | i386|i486|i586|i686) | ||
184 | JDK_ARCH=x86 | ||
185 | ;; | ||
186 | *) | ||
187 | JDK_ARCH=${TARGET_ARCH} | ||
188 | ;; | ||
189 | esac | ||
190 | |||
191 | install -d ${JDK_INSTALL_DIR} | ||
192 | |||
193 | for F in bootstrap/icedtea/{bin,include,jre,lib} | ||
194 | do | ||
195 | cp -RL $F ${JDK_INSTALL_DIR} | ||
196 | done | ||
197 | |||
198 | install -d ${JDK_INSTALL_DIR}/include/hpi | ||
199 | cp openjdk-ecj/jdk/src/solaris/hpi/export/*.h ${JDK_INSTALL_DIR}/include/hpi | ||
200 | cp openjdk-ecj/jdk/src/share/hpi/export/*.h ${JDK_INSTALL_DIR}/include/hpi | ||
201 | |||
202 | install -d ${JDK_INSTALL_DIR}/include/javavm | ||
203 | cp openjdk-ecj/jdk/src/share/javavm/export/*.h ${JDK_INSTALL_DIR}/include/javavm | ||
204 | cp openjdk-ecj/jdk/src/solaris/javavm/export/*.h ${JDK_INSTALL_DIR}/include/javavm | ||
205 | |||
206 | install -d ${JDK_INSTALL_DIR}/generated | ||
207 | cp generated/sun/awt/X11/generator/sizer.32 ${JDK_INSTALL_DIR}/generated | ||
208 | |||
209 | # Fix libjvm.so dependency of libfontmanager.so | ||
210 | ln -sf server/libjvm.so ${JDK_INSTALL_DIR}/jre/lib/${JDK_ARCH}/libjvm.so | ||
211 | ln -sf server/libjvm.so ${JDK_INSTALL_DIR}/jre/lib/${JDK_ARCH}/libjvm.so.0 | ||
212 | |||
213 | # Fix missing write permissions on the files. | ||
214 | chmod ug+w -R ${JDK_INSTALL_DIR} | ||
215 | } | ||
diff --git a/recipes-core/icedtea/icedtea6-native_1.7.10.bb b/recipes-core/icedtea/icedtea6-native_1.7.10.bb new file mode 100644 index 0000000..77c6232 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native_1.7.10.bb | |||
@@ -0,0 +1,36 @@ | |||
1 | require ${PN}.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI = "\ | ||
6 | http://icedtea.classpath.org/download/source/icedtea6-${PV}.tar.gz;name=iced \ | ||
7 | http://download.java.net/openjdk/jdk6/promoted/b17/openjdk-6-src-b17-14_oct_2009.tar.gz;subdir=openjdk-src-dir;name=ojdk \ | ||
8 | file://disable-library-checks.patch \ | ||
9 | file://icedtea-fix-jar-path.patch \ | ||
10 | file://build-hacks-native.patch \ | ||
11 | file://icedtea-sane-x86-arch-name.patch \ | ||
12 | file://icedtea-javac-in.patch \ | ||
13 | ${ICEDTEA_PATCHES} \ | ||
14 | " | ||
15 | SRC_URI[ojdk.md5sum] = "078fe0ab744c98694decc77f2456c560" | ||
16 | SRC_URI[ojdk.sha256sum] = "2019a4c3d2d14620caa78d7df49fd987a041066b4631bde4fd8424033f3c1785" | ||
17 | SRC_URI[iced.md5sum] = "0d61041e46253d089f1b30114716012d" | ||
18 | SRC_URI[iced.sha256sum] = "dbca9d7598352d178651c8cc28ff887c59a27f0125785a58e9f9723611137f78" | ||
19 | |||
20 | ICEDTEA_PATCHES = "\ | ||
21 | file://icedtea-ecj-disable-compilation.patch;apply=no \ | ||
22 | file://icedtea-ecj-fix-freetype.patch;apply=no \ | ||
23 | file://icedtea-ecj-fix-zlib.patch;apply=no \ | ||
24 | file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ | ||
25 | file://icedtea-jdk-sane-x86-arch.patch;apply=no \ | ||
26 | file://icedtea-unbreak-float.patch;apply=no \ | ||
27 | " | ||
28 | |||
29 | export DISTRIBUTION_PATCHES = "\ | ||
30 | patches/icedtea-ecj-disable-compilation.patch \ | ||
31 | patches/icedtea-ecj-fix-freetype.patch \ | ||
32 | patches/icedtea-ecj-fix-zlib.patch \ | ||
33 | patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ | ||
34 | patches/icedtea-jdk-sane-x86-arch.patch \ | ||
35 | patches/icedtea-unbreak-float.patch \ | ||
36 | " | ||
diff --git a/recipes-core/icedtea/icedtea6-native_1.8.11.bb b/recipes-core/icedtea/icedtea6-native_1.8.11.bb new file mode 100644 index 0000000..d87d9f3 --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native_1.8.11.bb | |||
@@ -0,0 +1,58 @@ | |||
1 | # Note: DO NOT USE THIS PACKAGE. While the build is fine, the resulting JDK | ||
2 | # is unable to compile itself yet (some issue with the built-in XML parser). | ||
3 | require ${PN}.inc | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
6 | |||
7 | PR = "${INC_PR}.0" | ||
8 | |||
9 | SRC_URI = "\ | ||
10 | http://icedtea.classpath.org/download/source/icedtea6-${PV}.tar.gz;name=iced \ | ||
11 | http://download.java.net/openjdk/jdk6/promoted/b18/openjdk-6-src-b18-16_feb_2010.tar.gz;subdir=openjdk-src-dir;name=ojdk \ | ||
12 | ${JAXWS_URI} \ | ||
13 | ${JAF_URI} \ | ||
14 | ${JAXP_URI} \ | ||
15 | file://disable-library-checks.patch \ | ||
16 | file://build-hacks-native.patch \ | ||
17 | file://icedtea-sane-x86-arch-name.patch \ | ||
18 | ${ICEDTEA_PATCHES} \ | ||
19 | " | ||
20 | SRC_URI[ojdk.md5sum] = "94db01691ab38f98b7d42b2ebf4d5c0b" | ||
21 | SRC_URI[ojdk.sha256sum] = "778ea7b323aaa24d3c6e8fe32b8bb0f49040d9e86271859077ada9f9ee3c8ebf" | ||
22 | SRC_URI[iced.md5sum] = "e0edfb08a4eedf1b9f1cef26a9bd4ab4" | ||
23 | SRC_URI[iced.sha256sum] = "6eb418ec0609080a71bda16896124d6e1ac23b2f54af52e05fc22c719e12ca29" | ||
24 | |||
25 | JAXWS_URI = "http://icedtea.classpath.org/download/source/drops/jdk6-jaxws-2009_10_27.zip;name=jaxws" | ||
26 | SRC_URI[jaxws.md5sum] = "3ea5728706169498b722b898a1008acf" | ||
27 | SRC_URI[jaxws.sha256sum] = "155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2" | ||
28 | |||
29 | JAF_URI = "http://icedtea.classpath.org/download/source/drops/jdk6-jaf-2009_10_27.zip;name=jaf" | ||
30 | SRC_URI[jaf.md5sum] = "7a50bb540a27cdd0001885630088b758" | ||
31 | SRC_URI[jaf.sha256sum] = "fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f" | ||
32 | |||
33 | JAXP_URI = "https://jaxp.dev.java.net/files/nidaba/documents/913/147329/jdk6-jaxp-2009_10_13.zip;name=jaxp" | ||
34 | SRC_URI[jaxp.md5sum] = "a2f7b972124cd776ff71e7754eb9a429" | ||
35 | SRC_URI[jaxp.sha256sum] = "8714d55de18db48ca9da0ee986202005082f44cf4c215da8683342b70e61792b" | ||
36 | |||
37 | |||
38 | ICEDTEA_PATCHES = "\ | ||
39 | file://icedtea-ecj-disable-compilation.patch;apply=no \ | ||
40 | file://icedtea-ecj-fix-freetype.patch;apply=no \ | ||
41 | file://icedtea-ecj-fix-zlib.patch;apply=no \ | ||
42 | file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ | ||
43 | file://icedtea-jdk-sane-x86-arch.patch;apply=no \ | ||
44 | file://icedtea-unbreak-float.patch;apply=no \ | ||
45 | " | ||
46 | |||
47 | export DISTRIBUTION_PATCHES = "\ | ||
48 | patches/icedtea-ecj-disable-compilation.patch \ | ||
49 | patches/icedtea-ecj-fix-freetype.patch \ | ||
50 | patches/icedtea-ecj-fix-zlib.patch \ | ||
51 | patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ | ||
52 | patches/icedtea-jdk-sane-x86-arch.patch \ | ||
53 | patches/icedtea-unbreak-float.patch \ | ||
54 | " | ||
55 | |||
56 | EXTRA_OECONF += " --with-jaxws-drop-zip=${DL_DIR}/jdk6-jaxws-2009_10_27.zip \ | ||
57 | --with-jaf-drop-zip=${DL_DIR}/jdk6-jaf-2009_10_27.zip \ | ||
58 | --with-jaxp-drop-zip=${DL_DIR}/jdk6-jaxp-2009_10_13.zip " | ||
diff --git a/recipes-core/jacl/jacl_1.4.1.bb b/recipes-core/jacl/jacl_1.4.1.bb new file mode 100644 index 0000000..80635e1 --- /dev/null +++ b/recipes-core/jacl/jacl_1.4.1.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | DESCRIPTION = "Tcl interpreter for Java" | ||
2 | # see this case study about JACL http://olex.openlogic.com/wazi/2008/jacl-license-case-study/ | ||
3 | LICENSE = "JACL" | ||
4 | LIC_FILES_CHKSUM = " \ | ||
5 | file://license.ucb;md5=997c6617d2f2a747e39945c0f2d1a264 \ | ||
6 | file://license.terms;md5=ce3ac33515250b3a438b2633ccb29aac \ | ||
7 | " | ||
8 | |||
9 | HOMEPAGE = "http://sourceforge.net/projects/tcljava" | ||
10 | |||
11 | SRC_URI = "http://downloads.sourceforge.net/tcljava/jacl${PV}.tar.gz" | ||
12 | |||
13 | inherit java-library | ||
14 | |||
15 | S = "${WORKDIR}/jacl${PV}" | ||
16 | |||
17 | do_compile() { | ||
18 | mkdir -p build | ||
19 | |||
20 | javac -sourcepath src/tcljava:src/jacl -d build `find src/tcljava src/jacl -name "*.java"` | ||
21 | |||
22 | fastjar -C build -c -f ${JARFILENAME} . | ||
23 | } | ||
24 | |||
25 | SRC_URI[md5sum] = "a7ec8300e8933164e854460c73ac6269" | ||
26 | SRC_URI[sha256sum] = "0edac0a7d2253c29c44ccc92427fa9ad4ee81b6c82142e417f72399a8584b749" | ||
27 | |||
28 | NATIVE_INSTALL_WORKS = "1" | ||
29 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb b/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb new file mode 100644 index 0000000..500937d --- /dev/null +++ b/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Static utility methods useful in manipulating Java classes that conform to the JavaBeans Specification" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/beanutils/source/${BP}-src.tar.gz" | ||
6 | |||
7 | DEPENDS += "commons-collections3 commons-logging" | ||
8 | RDEPENDS_${PN} = "libcommons-collections3-java libcommons-logging-java" | ||
9 | |||
10 | CP = "commons-collections3 commons-logging" | ||
11 | |||
12 | SRC_URI[md5sum] = "1bce3cfa4ae33c94686422e78abc0792" | ||
13 | SRC_URI[sha256sum] = "aff3c8c772e4ff32f2d9a37a727a488583372e45535a3d5aad09662691851dcf" | ||
diff --git a/recipes-core/jakarta-commons/commons-cli_1.1.bb b/recipes-core/jakarta-commons/commons-cli_1.1.bb new file mode 100644 index 0000000..bcfaf65 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-cli_1.1.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Java argument parsing helper classes" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/cli/source/${BP}-src.tar.gz" | ||
6 | |||
7 | |||
8 | |||
9 | SRC_URI[md5sum] = "ccc1aa194132e2387557bbb7f65391f4" | ||
10 | SRC_URI[sha256sum] = "929eb140c136673e7f5029cd206c81b3c1f5e66bba0dfdcd021b9dd5596356d2" | ||
diff --git a/recipes-core/jakarta-commons/commons-codec_1.3.bb b/recipes-core/jakarta-commons/commons-codec_1.3.bb new file mode 100644 index 0000000..6af47e1 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-codec_1.3.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Java library with simple encoder and decoders for various formats such as Base64 and Hexadecimal" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/codec/source/${BP}-src.tar.gz" | ||
6 | |||
7 | S = "${WORKDIR}/${BP}" | ||
8 | |||
9 | SRC_URI[md5sum] = "af3c3acf618de6108d65fcdc92b492e1" | ||
10 | SRC_URI[sha256sum] = "12effcf3fea025bd34edbfec60a6216ca453fb27e781d8e5783caf75fd33d90e" | ||
diff --git a/recipes-core/jakarta-commons/commons-collections3_3.2.1.bb b/recipes-core/jakarta-commons/commons-collections3_3.2.1.bb new file mode 100644 index 0000000..7e3478b --- /dev/null +++ b/recipes-core/jakarta-commons/commons-collections3_3.2.1.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "A set of abstract data type interfaces and implementations that offer a wealth of useful functionality and a solid foundation for extending that functionality" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz" | ||
6 | |||
7 | S = "${WORKDIR}/commons-collections-${PV}-src" | ||
8 | |||
9 | |||
10 | SRC_URI[md5sum] = "031ce05872ddb0462f0dcce1e5babbe9" | ||
11 | SRC_URI[sha256sum] = "9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d" | ||
diff --git a/recipes-core/jakarta-commons/commons-collections_2.1.1.bb b/recipes-core/jakarta-commons/commons-collections_2.1.1.bb new file mode 100644 index 0000000..79bd612 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-collections_2.1.1.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "A set of abstract data type interfaces and implementations that offer a wealth of useful functionality and a solid foundation for extending that functionality" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/collections/source/${BP}-src.tar.gz" | ||
6 | |||
7 | |||
8 | SRC_URI[md5sum] = "3fc2e8f9d0647074cba992b534ecf6df" | ||
9 | SRC_URI[sha256sum] = "73eb5907a31c8770480c70f6a6a8d9a9a2ffe602e1b461c045cff51ace4cab2a" | ||
diff --git a/recipes-core/jakarta-commons/commons-configuration_1.5.bb b/recipes-core/jakarta-commons/commons-configuration_1.5.bb new file mode 100644 index 0000000..93febd7 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-configuration_1.5.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Generic configuration interface for Java applications" | ||
4 | |||
5 | SRC_URI = " \ | ||
6 | http://www.apache.org/dist/commons/configuration/source/${BP}-src.tar.gz;name=archive \ | ||
7 | http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2;name=ant \ | ||
8 | " | ||
9 | |||
10 | DEPENDS += "commons-logging commons-collections3 commons-beanutils commons-codec commons-digester commons-jxpath commons-lang servlet2.4" | ||
11 | RDEPENDS_${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libcommons-codec-java libcommons-digester-java libcommons-jxpath-java libcommons-lang-java libservlet2.4-java" | ||
12 | |||
13 | CP = "commons-logging commons-collections3 commons-beanutils commons-codec commons-digester commons-jxpath commons-lang servlet-api-2.4" | ||
14 | |||
15 | # Makes use of -sourcepath hack: We inject Ant sourcefiles into the build and remove them | ||
16 | # afterwards. | ||
17 | COMPILE_SOURCEPATH = "${WORKDIR}/apache-ant-1.7.1/src/main:src/java" | ||
18 | |||
19 | CLEAN_PATH = "build/org/apache/tools" | ||
20 | |||
21 | SRC_URI[archive.md5sum] = "6a019d26d576a87eda2ef84c8ffc2e31" | ||
22 | SRC_URI[archive.sha256sum] = "06e5dd81c1302118298156f70b8138fa131ed8f258671b1b67e36a34d80357a0" | ||
23 | SRC_URI[ant.md5sum] = "0d68db4a1ada5c91bcbf53cefd0c2fd7" | ||
24 | SRC_URI[ant.sha256sum] = "4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6" | ||
diff --git a/recipes-core/jakarta-commons/commons-digester_1.8.bb b/recipes-core/jakarta-commons/commons-digester_1.8.bb new file mode 100644 index 0000000..feb0786 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-digester_1.8.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Converts XML to a Java object by a set of mapping rules." | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/digester/source/${BP}-src.tar.gz" | ||
6 | |||
7 | DEPENDS += "commons-logging commons-beanutils" | ||
8 | RDEPENDS_${PN} = "libcommons-logging-java libcommons-beanutils-java" | ||
9 | |||
10 | CP = "commons-logging commons-beanutils" | ||
11 | |||
12 | FINDARGS = "-name '*.dtd'" | ||
13 | |||
14 | SRC_URI[md5sum] = "689f41905a68c67f7231f9afbb3e2147" | ||
15 | SRC_URI[sha256sum] = "d9a965c82828a881d2ab6256fba7076f62815a9545b3af9d553dc5271577182b" | ||
diff --git a/recipes-core/jakarta-commons/commons-discovery_0.4.bb b/recipes-core/jakarta-commons/commons-discovery_0.4.bb new file mode 100644 index 0000000..0de4c5c --- /dev/null +++ b/recipes-core/jakarta-commons/commons-discovery_0.4.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "discovering, or finding, implementations for pluggable interfaces" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/discovery/source/${BP}-src.tar.gz" | ||
6 | |||
7 | DEPENDS += "commons-logging" | ||
8 | RDEPENDS_${PN} = "libcommons-logging-java" | ||
9 | |||
10 | CP = "commons-logging" | ||
11 | |||
12 | SRC_URI[md5sum] = "1275ad4c6ce54b9323269e30dc42dd0e" | ||
13 | SRC_URI[sha256sum] = "596242302be4f0502073f5a934c608289bba6221591e7dbea53ce629f67498a3" | ||
diff --git a/recipes-core/jakarta-commons/commons-el_1.0.bb b/recipes-core/jakarta-commons/commons-el_1.0.bb new file mode 100644 index 0000000..3ba21ee --- /dev/null +++ b/recipes-core/jakarta-commons/commons-el_1.0.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Implementation of the JSP2.0 Expression Language API" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/el/source/${BP}-src.tar.gz" | ||
6 | |||
7 | DEPENDS += "jsp2.0 servlet2.4" | ||
8 | RDEPENDS_${PN} = "libjsp2.0-java libservlet2.4-java" | ||
9 | |||
10 | CP = "jsp-api-2.0 servlet-api-2.4" | ||
11 | |||
12 | FINDARGS = "\( -name '*.properties' -or -name '*.jj' \)" | ||
13 | |||
14 | |||
15 | |||
16 | SRC_URI[md5sum] = "25038283a0b5f638db5e891295d20020" | ||
17 | SRC_URI[sha256sum] = "3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6" | ||
diff --git a/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb b/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb new file mode 100644 index 0000000..34ff2c1 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Robust, high-performance, file upload capability for Java servlets and web applications" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/fileupload/source/${BP}-src.tar.gz" | ||
6 | |||
7 | DEPENDS += "commons-beanutils commons-io servlet2.3" | ||
8 | RDEPENDS_${PN} = "libcommons-beanutils-java libcommons-io-java libservlet2.3-java" | ||
9 | |||
10 | CP = "commons-beanutils commons-io servlet-2.3" | ||
11 | |||
12 | # Exclude portlet stuff from compilation like Debian does. | ||
13 | COMPILE_FINDARGS = "-name '*.java' -not -wholename '*portlet*'" | ||
14 | |||
15 | |||
16 | SRC_URI[md5sum] = "c2bdb9264aec564e3f4fbbdf4344a844" | ||
17 | SRC_URI[sha256sum] = "08905cb3a0db4f7fa67f3b579b2c481060334d50d7f913c6974c7513243152f5" | ||
diff --git a/recipes-core/jakarta-commons/commons-httpclient_3.1.bb b/recipes-core/jakarta-commons/commons-httpclient_3.1.bb new file mode 100644 index 0000000..64f80f6 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-httpclient_3.1.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Efficient, up-to-date, and feature-rich package implementing the client side of the most recent HTTP standards and recommendations" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/httpcomponents/commons-httpclient/source/${BP}-src.tar.gz" | ||
6 | |||
7 | S = "${WORKDIR}/${BP}" | ||
8 | |||
9 | DEPENDS += "commons-logging commons-codec" | ||
10 | RDEPENDS_${PN} = "libcommons-logging-java libcommons-codec-java" | ||
11 | |||
12 | CP = "commons-logging commons-codec" | ||
13 | |||
14 | |||
15 | SRC_URI[md5sum] = "2c9b0f83ed5890af02c0df1c1776f39b" | ||
16 | SRC_URI[sha256sum] = "f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2" | ||
diff --git a/recipes-core/jakarta-commons/commons-io_1.4.bb b/recipes-core/jakarta-commons/commons-io_1.4.bb new file mode 100644 index 0000000..ce627ea --- /dev/null +++ b/recipes-core/jakarta-commons/commons-io_1.4.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Java library with utility classes, stream implementations, file filters and endian classes" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/io/source/${BP}-src.tar.gz" | ||
6 | |||
7 | SRC_URI[md5sum] = "24b228f2d0c40ffed9204cdab015bccf" | ||
8 | SRC_URI[sha256sum] = "eca986497f7b4d1b1ec41821b1b5df827bb31fc14833e4449cfa8bcd5d7f29bb" | ||
diff --git a/recipes-core/jakarta-commons/commons-jxpath_1.3.bb b/recipes-core/jakarta-commons/commons-jxpath_1.3.bb new file mode 100644 index 0000000..9e612b2 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-jxpath_1.3.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "JXPath interpreter for Java" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/jxpath/source/${BP}-src.tar.gz" | ||
6 | |||
7 | DEPENDS += "commons-logging commons-collections3 commons-beanutils servlet2.3 jdom" | ||
8 | RDEPENDS_${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libservlet2.3-java libjdom-java" | ||
9 | |||
10 | CP = "commons-logging commons-collections3 commons-beanutils servlet-2.3 jdom" | ||
11 | |||
12 | SRC_URI[md5sum] = "9af6ed5d009061986d709a370829860e" | ||
13 | SRC_URI[sha256sum] = "da314198d75c6da660e2603bd1543a8f5d0b640c5144b748e62e59afc278efe6" | ||
diff --git a/recipes-core/jakarta-commons/commons-lang_2.4.bb b/recipes-core/jakarta-commons/commons-lang_2.4.bb new file mode 100644 index 0000000..a470d63 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-lang_2.4.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Set of Java classes that provide helper methods for the standard java.lang classes" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/lang/source/${BP}-src.tar.gz" | ||
6 | |||
7 | |||
8 | SRC_URI[md5sum] = "625ff5f2f968dd908bca43c9469d6e6b" | ||
9 | SRC_URI[sha256sum] = "2445238cd0eb167e99a1147394f61325490559f3df7e7e8f628043fb70cbf2f4" | ||
diff --git a/recipes-core/jakarta-commons/commons-logging_1.1.1.bb b/recipes-core/jakarta-commons/commons-logging_1.1.1.bb new file mode 100644 index 0000000..235b7f4 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-logging_1.1.1.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Java Internet protocol suite library" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87" | ||
5 | |||
6 | SRC_URI = "http://www.apache.org/dist/commons/logging/source/${BP}-src.tar.gz" | ||
7 | |||
8 | DEPENDS += "log4j1.2 servlet2.3 logkit" | ||
9 | DEPENDS_virtclass-native += "log4j1.2-native servlet2.3-native logkit-native" | ||
10 | |||
11 | CP = "log4j-1.2 servlet-2.3 logkit" | ||
12 | |||
13 | COMPILE_FINDARGS = "-name '*.java' -and -not -name '*Avalon*'" | ||
14 | |||
15 | SRC_URI[md5sum] = "e5cfa8cca13152d7545fde6b1783c60a" | ||
16 | SRC_URI[sha256sum] = "b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2" | ||
17 | |||
18 | NATIVE_INSTALL_WORKS = "1" | ||
19 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/jakarta-commons/commons-net_1.4.1.bb b/recipes-core/jakarta-commons/commons-net_1.4.1.bb new file mode 100644 index 0000000..26b8603 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-net_1.4.1.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Java Internet protocol suite library" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
5 | |||
6 | SRC_URI = "http://www.apache.org/dist/commons/net/source/${BP}-src.tar.gz" | ||
7 | |||
8 | S = "${WORKDIR}/${BP}" | ||
9 | |||
10 | DEPENDS += "oro" | ||
11 | DEPENDS_virtclass-native += "oro-native" | ||
12 | |||
13 | RDEPENDS_${PN} = "liboro-java" | ||
14 | RDEPENDS_${PN}_virtclass-native = "" | ||
15 | |||
16 | CP = "oro" | ||
17 | |||
18 | MAINSOURCES = "src/java/org" | ||
19 | |||
20 | SRC_URI[md5sum] = "ccbb3f67b55e8a7a676499db4386673c" | ||
21 | SRC_URI[sha256sum] = "fdea779f261f70b9bbec40121c830b11e3e63b6188f662f95505045ff8d44add" | ||
22 | |||
23 | NATIVE_INSTALL_WORKS = "1" | ||
24 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/jakarta-commons/commons-pool_1.4.bb b/recipes-core/jakarta-commons/commons-pool_1.4.bb new file mode 100644 index 0000000..b6bd4f4 --- /dev/null +++ b/recipes-core/jakarta-commons/commons-pool_1.4.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require jakarta-commons.inc | ||
2 | |||
3 | DESCRIPTION = "Java Object-pooling API" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/commons/pool/source/${BP}-src.tar.gz" | ||
6 | |||
7 | SRC_URI[md5sum] = "4dc988ee16e1471799af97763297b41b" | ||
8 | SRC_URI[sha256sum] = "ca4452f2a2ce2daf6eaa1743ded2d3b36013200c48e3f2117b65584ca5cc1d9b" | ||
diff --git a/recipes-core/jakarta-commons/jakarta-commons.inc b/recipes-core/jakarta-commons/jakarta-commons.inc new file mode 100644 index 0000000..3ee081e --- /dev/null +++ b/recipes-core/jakarta-commons/jakarta-commons.inc | |||
@@ -0,0 +1,60 @@ | |||
1 | LICENSE = "AL2.0" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | |||
4 | inherit java-library | ||
5 | |||
6 | S = "${WORKDIR}/${BP}-src" | ||
7 | |||
8 | # Directory in which the projects sources are located. | ||
9 | MAINSOURCES = "src/java" | ||
10 | |||
11 | # Directories which should appear in the -sourcepath argument. | ||
12 | COMPILE_SOURCEPATH = "src/java" | ||
13 | |||
14 | COMPILE_FINDARGS = "-name '*.java'" | ||
15 | FINDARGS = "-name '*.properties'" | ||
16 | |||
17 | # Directories to be removed after compilation. | ||
18 | CLEAN_PATH = "" | ||
19 | |||
20 | # Some projects have a replaceable version number in their manifest template. | ||
21 | do_unpackpost() { | ||
22 | if [ -d src/conf ] | ||
23 | then | ||
24 | find src/conf -exec \ | ||
25 | sed -i -e "s|@version@|${PV}|" {} \; | ||
26 | fi | ||
27 | } | ||
28 | |||
29 | addtask unpackpost after do_unpack before do_patch | ||
30 | # Compile step is very similar for Jakarta commons packages | ||
31 | do_compile() { | ||
32 | mkdir -p build | ||
33 | |||
34 | if [ "${CP}" ] | ||
35 | then | ||
36 | oe_makeclasspath cp -s ${CP} | ||
37 | else | ||
38 | cp=. | ||
39 | fi | ||
40 | |||
41 | echo "javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build \`find ${MAINSOURCES} ${COMPILE_FINDARGS}\`" | ||
42 | javac -sourcepath ${COMPILE_SOURCEPATH} -cp $cp -d build `find ${MAINSOURCES} ${COMPILE_FINDARGS}` | ||
43 | |||
44 | # Copy extraneous files | ||
45 | echo "(cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;)" | ||
46 | (cd ${MAINSOURCES} && find . ${FINDARGS} -exec cp {} ../../build/{} \;) | ||
47 | |||
48 | # Optionally remove stuff after compilation (needed for sourcepath hacks). | ||
49 | if [ ${CLEAN_PATH} ]; then | ||
50 | rm -rf ${CLEAN_PATH} | ||
51 | fi | ||
52 | |||
53 | # Some projects have manifest, some have not. This works for both. | ||
54 | if [ -f src/conf/MANIFEST.MF ] | ||
55 | then | ||
56 | fastjar -C build -c -m src/conf/MANIFEST.MF -f ${JARFILENAME} . | ||
57 | else | ||
58 | fastjar -C build -c -f ${JARFILENAME} . | ||
59 | fi | ||
60 | } | ||
diff --git a/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb b/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb new file mode 100644 index 0000000..b09c464 --- /dev/null +++ b/recipes-core/jakarta-libs/avalon-framework-api_4.3.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | DESCRIPTION = "Common way for components to be created, initialized, configured, started. (API-only)" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1dece7821bf3fd70fe1309eaa37d52a2" | ||
5 | |||
6 | SRC_URI = " \ | ||
7 | http://www.apache.org/dist/excalibur/avalon-framework/source/${BP}-src.tar.gz;name=archive \ | ||
8 | http://www.apache.org/dist/avalon/logkit/source/logkit-1.2.2-src.tar.gz;name=logkit \ | ||
9 | " | ||
10 | |||
11 | inherit java-library | ||
12 | |||
13 | do_compile() { | ||
14 | mkdir -p build | ||
15 | |||
16 | # Allow reaching method definitions from logkit (stupid cyclic dependency). | ||
17 | srcpath=src/java:${WORKDIR}/logkit-1.2.2-dev/src/java | ||
18 | |||
19 | javac -sourcepath $srcpath -d build `find src/java -name "*.java"` | ||
20 | |||
21 | # Remove classes that belong to logkit ... | ||
22 | rm -rf ${S}/build/org/apache/log | ||
23 | |||
24 | fastjar -C build -c -f ${JARFILENAME} . | ||
25 | } | ||
26 | |||
27 | |||
28 | SRC_URI[archive.md5sum] = "d4cffb4ba1d07bdc517ac6e322636495" | ||
29 | SRC_URI[archive.sha256sum] = "a4d56a053609ddfc77f6a42c3f15a11708d5e0eb29ffc60a40b87e4cc7331d47" | ||
30 | SRC_URI[logkit.md5sum] = "996ee20d6b5785ab71f4692f64d10f9c" | ||
31 | SRC_URI[logkit.sha256sum] = "2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8" | ||
32 | |||
33 | NATIVE_INSTALL_WORKS = "1" | ||
34 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/jakarta-libs/bsf_2.4.0.bb b/recipes-core/jakarta-libs/bsf_2.4.0.bb new file mode 100644 index 0000000..2ed56c5 --- /dev/null +++ b/recipes-core/jakarta-libs/bsf_2.4.0.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | DESCRIPTION = "Bean Scripting Framework package" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3" | ||
5 | |||
6 | SRC_URI = "http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-${PV}.tar.gz" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | DEPENDS = "jacl commons-logging rhino xalan-j bcel" | ||
11 | DEPENDS_virtclass-native = "jacl-native commons-logging-native rhino-native xalan-j-native bcel-native" | ||
12 | |||
13 | do_compile() { | ||
14 | mkdir -p build | ||
15 | |||
16 | oe_makeclasspath cp -s commons-logging jacl rhino bcel xalan2 | ||
17 | |||
18 | # Remove netrexx and jython support | ||
19 | rm -Rf src/org/apache/bsf/engines/netrexx | ||
20 | rm -Rf src/org/apache/bsf/engines/jython | ||
21 | |||
22 | javac -sourcepath src -cp $cp -d build `find src -name "*.java"` | ||
23 | |||
24 | fastjar -C build -c -f ${JARFILENAME} . | ||
25 | } | ||
26 | |||
27 | |||
28 | SRC_URI[md5sum] = "7e58b2a009c0f70ab36bbef420b25c07" | ||
29 | SRC_URI[sha256sum] = "5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9" | ||
30 | |||
31 | NATIVE_INSTALL_WORKS = "1" | ||
32 | BBCLASSEXTEND = "native" | ||
33 | |||
diff --git a/recipes-core/jakarta-libs/log4j1.2_1.2.15.bb b/recipes-core/jakarta-libs/log4j1.2_1.2.15.bb new file mode 100644 index 0000000..ab62176 --- /dev/null +++ b/recipes-core/jakarta-libs/log4j1.2_1.2.15.bb | |||
@@ -0,0 +1,37 @@ | |||
1 | DESCRIPTION = "Java library to help the programmer output log statements to a variety of output targets" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f4ce41a6d1028498fcacde12f589bce7" | ||
5 | |||
6 | SRC_URI = "http://archive.apache.org/dist/logging/log4j/${PV}/apache-log4j-${PV}.tar.gz" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | S = "${WORKDIR}/apache-log4j-${PV}" | ||
11 | |||
12 | DEPENDS = "gnumail gnujaf" | ||
13 | DEPENDS_virtclass-native = "gnumail-native gnujaf-native" | ||
14 | |||
15 | |||
16 | JARFILENAME = "log4j-${PV}.jar" | ||
17 | ALTJARFILENAMES = "log4j-1.2.jar log4j1.2.jar" | ||
18 | |||
19 | do_compile() { | ||
20 | mkdir -p build | ||
21 | |||
22 | oe_makeclasspath cp -s activation gnumail | ||
23 | |||
24 | # Built everything but the JMS and JMX classes (like in Debian) | ||
25 | javac -sourcepath src/main/java -cp $cp -d build `find src/main/java -name "*.java" -and -not \( -iwholename "*jms*" -or -iwholename "*jmx*" \)` | ||
26 | |||
27 | cp -R src/main/resources/* build/ | ||
28 | |||
29 | fastjar -C build -c -f ${JARFILENAME} . | ||
30 | } | ||
31 | |||
32 | SRC_URI[md5sum] = "10f04abe4d68d5a89e8eb167e4e45e1a" | ||
33 | SRC_URI[sha256sum] = "f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31" | ||
34 | |||
35 | NATIVE_INSTALL_WORKS = "1" | ||
36 | BBCLASSEXTEND = "native" | ||
37 | |||
diff --git a/recipes-core/jakarta-libs/logkit_1.2.2.bb b/recipes-core/jakarta-libs/logkit_1.2.2.bb new file mode 100644 index 0000000..f23b037 --- /dev/null +++ b/recipes-core/jakarta-libs/logkit_1.2.2.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | DESCRIPTION = "Logging toolkit designed for secure performance orientated logging in Java applications" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f1a1c8e1996e51c4dbc73e592a2ecf05" | ||
5 | |||
6 | SRC_URI = "http://www.apache.org/dist/avalon/logkit/source/${BP}-src.tar.gz" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | S = "${WORKDIR}/${BP}-dev" | ||
11 | |||
12 | DEPENDS = "oro servlet2.3 gnumail gnujaf log4j1.2 avalon-framework-api" | ||
13 | DEPENDS_virtclass-native = "oro-native servlet2.3-native gnumail-native gnujaf-native log4j1.2-native avalon-framework-api-native" | ||
14 | |||
15 | do_compile() { | ||
16 | mkdir -p build | ||
17 | |||
18 | oe_makeclasspath cp -s oro servlet-2.3 activation gnumail log4j-1.2 avalon-framework-api | ||
19 | |||
20 | # Built everything but the JMS and JMX classes (like in Debian) | ||
21 | javac -encoding ISO8859-1 -sourcepath src/java -cp $cp -d build \ | ||
22 | `find src/java -name \*.java -and -not \( -iwholename "*jms*" -or -wholename "*test*" \)` | ||
23 | |||
24 | (cd src/java && find . -name "*.properties" -exec cp {} ../../build/{} \;) | ||
25 | |||
26 | fastjar -C build -c -f ${JARFILENAME} . | ||
27 | } | ||
28 | |||
29 | SRC_URI[md5sum] = "996ee20d6b5785ab71f4692f64d10f9c" | ||
30 | SRC_URI[sha256sum] = "2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8" | ||
31 | |||
32 | NATIVE_INSTALL_WORKS = "1" | ||
33 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/jakarta-libs/oro_2.0.8.bb b/recipes-core/jakarta-libs/oro_2.0.8.bb new file mode 100644 index 0000000..fa32ca5 --- /dev/null +++ b/recipes-core/jakarta-libs/oro_2.0.8.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | DESCRIPTION = "Perl5-compatible regular expressions library for Java" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=372b1e91335021ca74173b2ab4dc97dd" | ||
5 | |||
6 | SRC_URI = "http://www.apache.org/dist/jakarta/oro/source/jakarta-${BP}.tar.gz" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | S = "${WORKDIR}/jakarta-${BP}" | ||
11 | |||
12 | do_compile() { | ||
13 | mkdir -p build | ||
14 | |||
15 | javac -sourcepath src/java -d build `find src/java -name \*.java` | ||
16 | |||
17 | fastjar -C build -c -f ${JARFILENAME} org | ||
18 | } | ||
19 | |||
20 | SRC_URI[md5sum] = "6f7690c6ba9750e3cbb8ebd10078a79a" | ||
21 | SRC_URI[sha256sum] = "4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566" | ||
22 | |||
23 | NATIVE_INSTALL_WORKS = "1" | ||
24 | BBCLASSEXTEND = "native" | ||
25 | |||
diff --git a/recipes-core/jakarta-libs/poi_3.0.bb b/recipes-core/jakarta-libs/poi_3.0.bb new file mode 100644 index 0000000..b207bec --- /dev/null +++ b/recipes-core/jakarta-libs/poi_3.0.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | DESCRIPTION = "Java library for manipulating various file formats based upon Microsoft's OLE 2 Compound Document" | ||
2 | LICENSE = "AL2.0" | ||
3 | AUTHOR = "Apache Software Foundation" | ||
4 | |||
5 | SRC_URI = "http://www.apache.org/dist/jakarta/poi/release/src/${BPN}-src-${PV}-FINAL-20070503.tar.gz" | ||
6 | |||
7 | S = "${WORKDIR}/${BPN}-3.0-rc4" | ||
8 | |||
9 | inherit java-library | ||
10 | |||
11 | DEPENDS = "fastjar-native commons-collections3 commons-logging commons-lang commons-beanutils log4j1.2 xalan-j" | ||
12 | |||
13 | do_compile() { | ||
14 | mkdir -p build | ||
15 | |||
16 | oe_makeclasspath cp -s commons-collections3 commons-logging commons-lang commons-beanutils log4j-1.2 xalan2 | ||
17 | |||
18 | javac -sourcepath src/java -cp $cp -d build \ | ||
19 | `find src/java -name \*.java` | ||
20 | |||
21 | (cd src/java && find . -name "*.properties" -exec cp {} ../../build/{} \;) | ||
22 | |||
23 | fastjar -C build -c -f ${JARFILENAME} . | ||
24 | } | ||
25 | |||
26 | SRC_URI[md5sum] = "1fb488c4061256197a667f1c480ffc33" | ||
27 | SRC_URI[sha256sum] = "48a5aabb873d4cc654c95acf6576868d7a8a3ee97e1c6418e1d716698b6efa76" | ||
diff --git a/recipes-core/jakarta-libs/regexp_1.5.bb b/recipes-core/jakarta-libs/regexp_1.5.bb new file mode 100644 index 0000000..68196d0 --- /dev/null +++ b/recipes-core/jakarta-libs/regexp_1.5.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | DESCRIPTION = "Java Regular Expression package" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | ||
5 | |||
6 | SRC_URI = "http://archive.apache.org/dist/jakarta/regexp/source/jakarta-${BP}.tar.gz" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | S = "${WORKDIR}/jakarta-${BP}" | ||
11 | |||
12 | do_compile() { | ||
13 | mkdir -p build | ||
14 | |||
15 | javac -sourcepath src/java -d build `find src/java -name \*.java` | ||
16 | |||
17 | fastjar -C build -c -f ${JARFILENAME} . | ||
18 | } | ||
19 | |||
20 | SRC_URI[md5sum] = "b941b8f4de297827f3211c2cb34af199" | ||
21 | SRC_URI[sha256sum] = "79e80af8cbeb68ddad75a1aa6244d7acd62176bfd69bcdc0640d11177dcde97d" | ||
22 | |||
23 | NATIVE_INSTALL_WORKS = "1" | ||
24 | BBCLASSEXTEND = "native" | ||
25 | |||
diff --git a/recipes-core/jamvm/files/java-initial b/recipes-core/jamvm/files/java-initial new file mode 100755 index 0000000..1b27f81 --- /dev/null +++ b/recipes-core/jamvm/files/java-initial | |||
@@ -0,0 +1,17 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Wrapper which (almost) silently restarts the VM in case of segfaults. | ||
4 | |||
5 | error_counter=0; | ||
6 | error_occured=139 | ||
7 | while [ ${error_counter} -le 50 -a ${error_occured} -eq 139 ]; do | ||
8 | echo "Running JamVM-initial: ${@}" | ||
9 | jamvm-initial ${1+"$@"} | ||
10 | error_occured=$? | ||
11 | if [ ${error_occured} -eq 139 ]; then | ||
12 | echo "JamVM-initial crashed - silently trying again" | ||
13 | error_counter=$(( $error_counter + 1 )) | ||
14 | fi | ||
15 | done | ||
16 | |||
17 | exit ${error_occured} | ||
diff --git a/recipes-core/jamvm/jamvm-initial/jamvm-initial.patch b/recipes-core/jamvm/jamvm-initial/jamvm-initial.patch new file mode 100644 index 0000000..fb069f8 --- /dev/null +++ b/recipes-core/jamvm/jamvm-initial/jamvm-initial.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | Index: jamvm-1.4.5/configure.ac | ||
2 | =================================================================== | ||
3 | --- jamvm-1.4.5.orig/configure.ac | ||
4 | +++ jamvm-1.4.5/configure.ac | ||
5 | @@ -1,6 +1,6 @@ | ||
6 | dnl Process this file with autoconf to produce a configure script. | ||
7 | AC_INIT(src/jam.c) | ||
8 | -AM_INIT_AUTOMAKE(jamvm, 1.4.5) | ||
9 | +AM_INIT_AUTOMAKE(jamvm-initial, 1.4.5) | ||
10 | AC_CONFIG_HEADERS([src/config.h]) | ||
11 | AC_PREFIX_DEFAULT(/usr/local/jamvm) | ||
12 | |||
13 | Index: jamvm-1.4.5/lib/Makefile.am | ||
14 | =================================================================== | ||
15 | --- jamvm-1.4.5.orig/lib/Makefile.am | ||
16 | +++ jamvm-1.4.5/lib/Makefile.am | ||
17 | @@ -1,4 +1,4 @@ | ||
18 | -@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip | ||
19 | +@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath-initial/glibj.zip | ||
20 | @use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/ | ||
21 | |||
22 | SUBDIRS = jamvm java gnu sun | ||
23 | Index: jamvm-1.4.5/src/dll.c | ||
24 | =================================================================== | ||
25 | --- jamvm-1.4.5.orig/src/dll.c | ||
26 | +++ jamvm-1.4.5/src/dll.c | ||
27 | @@ -294,7 +294,7 @@ char *getDllPath() { | ||
28 | } | ||
29 | |||
30 | char *getBootDllPath() { | ||
31 | - return CLASSPATH_INSTALL_DIR"/lib/classpath"; | ||
32 | + return CLASSPATH_INSTALL_DIR"/lib/classpath-initial"; | ||
33 | } | ||
34 | |||
35 | char *getDllName(char *name) { | ||
36 | Index: jamvm-1.4.5/src/Makefile.am | ||
37 | =================================================================== | ||
38 | --- jamvm-1.4.5.orig/src/Makefile.am | ||
39 | +++ jamvm-1.4.5/src/Makefile.am | ||
40 | @@ -2,7 +2,7 @@ SUBDIRS = os | ||
41 | DIST_SUBDIRS = os arch | ||
42 | |||
43 | bin_PROGRAMS = jamvm | ||
44 | -include_HEADERS = jni.h | ||
45 | +noinst_HEADERS = jni.h | ||
46 | |||
47 | lib_LTLIBRARIES = libjvm.la | ||
48 | noinst_LTLIBRARIES = libcore.la | ||
49 | Index: jamvm-1.4.5/src/class.c | ||
50 | =================================================================== | ||
51 | --- jamvm-1.4.5.orig/src/class.c | ||
52 | +++ jamvm-1.4.5/src/class.c | ||
53 | @@ -1653,8 +1653,8 @@ void scanDirsForJars(char *directories) | ||
54 | } | ||
55 | |||
56 | #ifdef USE_ZIP | ||
57 | -#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" | ||
58 | -#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" | ||
59 | +#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes.zip" | ||
60 | +#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip" | ||
61 | #else | ||
62 | #define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" | ||
63 | #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" | ||
diff --git a/recipes-core/jamvm/jamvm-initial/libffi.patch b/recipes-core/jamvm/jamvm-initial/libffi.patch new file mode 100644 index 0000000..216f03c --- /dev/null +++ b/recipes-core/jamvm/jamvm-initial/libffi.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | Index: jamvm-1.4.5/configure.ac | ||
2 | =================================================================== | ||
3 | --- jamvm-1.4.5.orig/configure.ac 2007-02-05 04:18:05.000000000 +0100 | ||
4 | +++ jamvm-1.4.5/configure.ac 2011-11-25 19:34:58.473683844 +0100 | ||
5 | @@ -166,10 +166,25 @@ | ||
6 | enable_zip=no | ||
7 | fi]) | ||
8 | |||
9 | -AC_CHECK_LIB(ffi,ffi_call,, | ||
10 | - [if test "$enable_ffi" != no; then | ||
11 | - AC_MSG_ERROR(cannot find libffi) | ||
12 | - fi]) | ||
13 | +LIBFFI_FOUND=no | ||
14 | +if test "$enable_ffi" = yes | ||
15 | +then | ||
16 | +PKG_CHECK_MODULES([LIBFFI], [libffi], [LIBFFI_FOUND=yes], [LIBFFI_FOUND=no]) | ||
17 | +if test "x${LIBFFI_FOUND}" = xno | ||
18 | +then | ||
19 | + LIBFFI_FOUND= | ||
20 | + AC_CHECK_HEADER([ffi.h],[LIBFFI_CFLAGS=],[LIBFFI_FOUND=no]) | ||
21 | + AC_SEARCH_LIBS([ffi_call], [ffi],[LIBFFI_LIBS=-lffi],[LIBFFI_FOUND=no]) | ||
22 | + if test "x${LIBFFI_FOUND}" = xno | ||
23 | + then | ||
24 | + AC_MSG_ERROR([Could not find libffi headers - \ | ||
25 | + Instal libffi-devel or libffi-dev.]) | ||
26 | + fi | ||
27 | +fi | ||
28 | +fi | ||
29 | +AC_SUBST(LIBFFI_CFLAGS) | ||
30 | +AC_SUBST(LIBFFI_LIBS) | ||
31 | + | ||
32 | |||
33 | dnl Checks for header files. | ||
34 | AC_HEADER_STDC | ||
35 | @@ -180,11 +195,6 @@ | ||
36 | enable_zip=no | ||
37 | fi]) | ||
38 | |||
39 | -AC_CHECK_HEADER(ffi.h,, | ||
40 | - [if test "$enable_ffi" != no; then | ||
41 | - AC_MSG_ERROR(cannot find ffi.h) | ||
42 | - fi]) | ||
43 | - | ||
44 | if test "$enable_zip" != no; then | ||
45 | AC_DEFINE([USE_ZIP],1,[use zip]) | ||
46 | use_zip_yes= | ||
47 | @@ -197,7 +207,7 @@ | ||
48 | AC_SUBST(use_zip_yes) | ||
49 | AC_SUBST(use_zip_no) | ||
50 | |||
51 | -if test "$enable_ffi" != no; then | ||
52 | +if test "x${LIBFFI_FOUND}" != no; then | ||
53 | AC_DEFINE([USE_FFI],1,[use FFI]) | ||
54 | fi | ||
55 | |||
56 | Index: jamvm-1.4.5/src/Makefile.am | ||
57 | =================================================================== | ||
58 | --- jamvm-1.4.5.orig/src/Makefile.am 2006-12-25 05:10:18.000000000 +0100 | ||
59 | +++ jamvm-1.4.5/src/Makefile.am 2011-11-25 19:35:26.537723112 +0100 | ||
60 | @@ -19,6 +19,7 @@ | ||
61 | |||
62 | jamvm_LDADD = libcore.la | ||
63 | libjvm_la_LIBADD = libcore.la | ||
64 | -libcore_la_LIBADD = os/@os@/@arch@/libnative.la os/@os@/libos.la | ||
65 | +libcore_la_LIBADD = os/@os@/@arch@/libnative.la os/@os@/libos.la $(LIBFFI_LIBS) | ||
66 | +libcore_la_CPPFLAGS = $(LIBFFI_CFLAGS) | ||
67 | |||
68 | DISTCLEANFILES = arch.h | ||
diff --git a/recipes-core/jamvm/jamvm-initial_1.4.5.bb b/recipes-core/jamvm/jamvm-initial_1.4.5.bb new file mode 100644 index 0000000..57caa64 --- /dev/null +++ b/recipes-core/jamvm/jamvm-initial_1.4.5.bb | |||
@@ -0,0 +1,47 @@ | |||
1 | SUMMARY = "A compact Java Virtual Machine which conforms to the JVM specification version 2." | ||
2 | HOMEPAGE = "http://jamvm.sourceforge.net/" | ||
3 | LICENSE = "GPL" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
5 | |||
6 | DEPENDS = "zlib-native classpath-initial jikes-initial libffi-native" | ||
7 | |||
8 | PROVIDES = "virtual/java-initial" | ||
9 | |||
10 | S = "${WORKDIR}/jamvm-${PV}" | ||
11 | |||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ | ||
13 | file://libffi.patch \ | ||
14 | file://jamvm-initial.patch \ | ||
15 | file://java-initial \ | ||
16 | " | ||
17 | |||
18 | # This uses 32 bit arm, so force the instruction set to arm, not thumb | ||
19 | ARM_INSTRUCTION_SET = "arm" | ||
20 | |||
21 | inherit native autotools | ||
22 | |||
23 | # libdir must be modified so that jamvm-initial and -native | ||
24 | # do not interfere | ||
25 | EXTRA_OECONF = "\ | ||
26 | --with-classpath-install-dir=${prefix} \ | ||
27 | --program-suffix=-initial \ | ||
28 | --libdir=${STAGING_LIBDIR}/jamvm-initial \ | ||
29 | --enable-ffi \ | ||
30 | " | ||
31 | |||
32 | # jamvm-initial has to run some binaries which need lots of memory. | ||
33 | CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB" | ||
34 | |||
35 | do_compile() { | ||
36 | oe_runmake \ | ||
37 | JAVAC=jikes-initial \ | ||
38 | GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip | ||
39 | } | ||
40 | |||
41 | do_install_append() { | ||
42 | install -d ${D}${bindir}/ | ||
43 | install -m 0755 ${WORKDIR}/java-initial ${D}${bindir}/ | ||
44 | } | ||
45 | |||
46 | SRC_URI[md5sum] = "3f538bab6e1c77aed331e5e71f754f5b" | ||
47 | SRC_URI[sha256sum] = "f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5" | ||
diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc new file mode 100644 index 0000000..4eab1c1 --- /dev/null +++ b/recipes-core/jamvm/jamvm.inc | |||
@@ -0,0 +1,47 @@ | |||
1 | DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." | ||
2 | HOMEPAGE = "http://jamvm.sourceforge.net/" | ||
3 | LICENSE = "GPL" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
5 | |||
6 | DEPENDS = "zlib classpath virtual/javac-native libffi" | ||
7 | DEPENDS_virtclass-native = "zlib-native classpath-native ecj-initial libffi-native" | ||
8 | |||
9 | RDEPENDS_${PN} = "classpath" | ||
10 | RDEPENDS_${PN}_virtclass-native = "" | ||
11 | |||
12 | PROVIDES_virtclass-native = "virtual/java-native" | ||
13 | RPROVIDES_${PN} = "java2-runtime" | ||
14 | RPROVIDES_${PN}_virtclass-native = "" | ||
15 | |||
16 | BBCLASSEXTEND = "native" | ||
17 | |||
18 | SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ | ||
19 | file://jamvm-jni_h-noinst.patch \ | ||
20 | file://libffi.patch \ | ||
21 | " | ||
22 | |||
23 | |||
24 | inherit java autotools update-alternatives | ||
25 | |||
26 | # This uses 32 bit arm, so force the instruction set to arm, not thumb | ||
27 | ARM_INSTRUCTION_SET = "arm" | ||
28 | |||
29 | |||
30 | EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi" | ||
31 | |||
32 | # Enforce usage of ecj-initial. | ||
33 | EXTRA_OMAKE_virtclass-native = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial" | ||
34 | |||
35 | do_install_append_virtclass-native() { | ||
36 | install -d ${D}${bindir} | ||
37 | ln -s ${bindir}/jamvm ${D}${bindir}/java | ||
38 | } | ||
39 | |||
40 | PRIVATE_LIBS = "libjvm.so" | ||
41 | |||
42 | FILES_${PN} += "${libdir}/jamvm/lib*.so" | ||
43 | |||
44 | ALTERNATIVE_NAME = "java" | ||
45 | ALTERNATIVE_PATH = "${bindir}/jamvm" | ||
46 | ALTERNATIVE_PRIORITY = "4" | ||
47 | |||
diff --git a/recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch b/recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch new file mode 100644 index 0000000..f0884fd --- /dev/null +++ b/recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: jamvm-1.5.3/src/Makefile.am | ||
2 | =================================================================== | ||
3 | --- jamvm-1.5.3.orig/src/Makefile.am 2009-09-29 09:29:13.386565473 +0200 | ||
4 | +++ jamvm-1.5.3/src/Makefile.am 2009-09-29 09:33:47.702565852 +0200 | ||
5 | @@ -23,7 +23,7 @@ | ||
6 | DIST_SUBDIRS = os arch interp | ||
7 | |||
8 | bin_PROGRAMS = jamvm | ||
9 | -include_HEADERS = jni.h | ||
10 | +noinst_HEADERS = jni.h | ||
11 | |||
12 | lib_LTLIBRARIES = libjvm.la | ||
13 | noinst_LTLIBRARIES = libcore.la | ||
diff --git a/recipes-core/jamvm/jamvm/libffi.patch b/recipes-core/jamvm/jamvm/libffi.patch new file mode 100644 index 0000000..1f68c5e --- /dev/null +++ b/recipes-core/jamvm/jamvm/libffi.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | Index: git/configure.ac | ||
2 | =================================================================== | ||
3 | --- git.orig/configure.ac 2011-11-18 15:47:15.339088111 +0100 | ||
4 | +++ git/configure.ac 2011-11-18 15:47:15.742392674 +0100 | ||
5 | @@ -273,9 +273,24 @@ | ||
6 | AC_CHECK_LIB(z,inflate,,AC_MSG_ERROR(zlib is missing)) | ||
7 | fi | ||
8 | |||
9 | -if test "$enable_ffi" != no; then | ||
10 | - AC_CHECK_LIB(ffi,ffi_call,,AC_MSG_ERROR(libffi is missing)) | ||
11 | +LIBFFI_FOUND=no | ||
12 | +if test "$enable_ffi" = yes | ||
13 | +then | ||
14 | +PKG_CHECK_MODULES([LIBFFI], [libffi], [LIBFFI_FOUND=yes], [LIBFFI_FOUND=no]) | ||
15 | +if test "x${LIBFFI_FOUND}" = xno | ||
16 | +then | ||
17 | + LIBFFI_FOUND= | ||
18 | + AC_CHECK_HEADER([ffi.h],[LIBFFI_CFLAGS=],[LIBFFI_FOUND=no]) | ||
19 | + AC_SEARCH_LIBS([ffi_call], [ffi],[LIBFFI_LIBS=-lffi],[LIBFFI_FOUND=no]) | ||
20 | + if test "x${LIBFFI_FOUND}" = xno | ||
21 | + then | ||
22 | + AC_MSG_ERROR([Could not find libffi headers - \ | ||
23 | + Instal libffi-devel or libffi-dev.]) | ||
24 | + fi | ||
25 | +fi | ||
26 | fi | ||
27 | +AC_SUBST(LIBFFI_CFLAGS) | ||
28 | +AC_SUBST(LIBFFI_LIBS) | ||
29 | |||
30 | dnl Checks for header files. | ||
31 | AC_HEADER_STDC | ||
32 | @@ -285,10 +300,6 @@ | ||
33 | AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR(zlib.h is missing)) | ||
34 | fi | ||
35 | |||
36 | -if test "$enable_ffi" != no; then | ||
37 | - AC_CHECK_HEADER(ffi.h,,AC_MSG_ERROR(ffi.h is missing)) | ||
38 | -fi | ||
39 | - | ||
40 | if test "$enable_zip" != no; then | ||
41 | AC_DEFINE([USE_ZIP],1,[use zip]) | ||
42 | use_zip_yes= | ||
43 | @@ -302,7 +313,9 @@ | ||
44 | AC_SUBST(use_zip_no) | ||
45 | |||
46 | if test "$enable_ffi" != no; then | ||
47 | - AC_DEFINE([USE_FFI],1,[use FFI]) | ||
48 | + if test "$LIBFFI_FOUND" != no; then | ||
49 | + AC_DEFINE([USE_FFI],1,[use FFI]) | ||
50 | + fi | ||
51 | fi | ||
52 | |||
53 | if test "$enable_md_stubs" != no; then | ||
54 | Index: git/src/Makefile.am | ||
55 | =================================================================== | ||
56 | --- git.orig/src/Makefile.am 2011-11-18 15:47:15.685730049 +0100 | ||
57 | +++ git/src/Makefile.am 2011-11-18 15:49:43.881825251 +0100 | ||
58 | @@ -43,8 +43,9 @@ | ||
59 | jamvm_LDADD = libcore.la | ||
60 | libjvm_la_LIBADD = libcore.la | ||
61 | libcore_la_LIBADD = interp/libinterp.la os/@os@/@arch@/libnative.la \ | ||
62 | - os/@os@/libos.la classlib/@classlib@/libclasslib.la | ||
63 | + os/@os@/libos.la classlib/@classlib@/libclasslib.la \ | ||
64 | + $(LIBFFI_LIBS) | ||
65 | |||
66 | -AM_CPPFLAGS = -I$(top_srcdir)/src/interp/engine | ||
67 | +AM_CPPFLAGS = -I$(top_srcdir)/src/interp/engine $(LIBFFI_CFLAGS) | ||
68 | |||
69 | DISTCLEANFILES = arch.h classlib.h classlib-defs.h classlib-symbol.h | ||
diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb new file mode 100644 index 0000000..6d06552 --- /dev/null +++ b/recipes-core/jamvm/jamvm_git.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | # Note: You *must* use this together with classpath-native 0.98. | ||
2 | # Otherwise it won't work! | ||
3 | |||
4 | require jamvm.inc | ||
5 | |||
6 | SRCREV = "4617da717ecb05654ea5bb9572338061106a414d" | ||
7 | PV = "0.0+git${SRCPV}" | ||
8 | |||
9 | SRC_URI = "git://git.berlios.de/jamvm;protocol=git \ | ||
10 | file://jamvm-jni_h-noinst.patch \ | ||
11 | file://libffi.patch \ | ||
12 | " | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
diff --git a/recipes-core/jcraft/jsch_0.1.40.bb b/recipes-core/jcraft/jsch_0.1.40.bb new file mode 100644 index 0000000..afb84d6 --- /dev/null +++ b/recipes-core/jcraft/jsch_0.1.40.bb | |||
@@ -0,0 +1,31 @@ | |||
1 | DESCRIPTION = "SSH implementation in Java" | ||
2 | HOMEPAGE = "http://www.jcraft.com/jsch" | ||
3 | LICENSE = "BSD" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55e3b6a0987ccd0c34530f3df2d206ae" | ||
5 | |||
6 | SRC_URI = "${SOURCEFORGE_MIRROR}/jsch/jsch-${PV}.zip" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | DEPENDS = "jzlib" | ||
11 | DEPENDS_virtclass-native = "jzlib-native" | ||
12 | |||
13 | RDEPENDS_${PN} = "libjzlib-java" | ||
14 | RDEPENDS_${PN}_virtclass-native = "" | ||
15 | |||
16 | do_compile() { | ||
17 | mkdir -p build | ||
18 | |||
19 | oe_makeclasspath cp -s jzlib | ||
20 | |||
21 | javac -sourcepath src -cp $cp -d build `find src -name "*.java"` | ||
22 | |||
23 | fastjar -C build -c -f ${JARFILENAME} . | ||
24 | } | ||
25 | |||
26 | SRC_URI[md5sum] = "b59cec19a487e95aed68378976b4b566" | ||
27 | SRC_URI[sha256sum] = "ca9d2ae08fd7a8983fb00d04f0f0c216a985218a5eb364ff9bee73870f28e097" | ||
28 | |||
29 | NATIVE_INSTALL_WORKS = "1" | ||
30 | BBCLASSEXTEND = "native" | ||
31 | |||
diff --git a/recipes-core/jcraft/jzlib_1.0.7.bb b/recipes-core/jcraft/jzlib_1.0.7.bb new file mode 100644 index 0000000..5eb390c --- /dev/null +++ b/recipes-core/jcraft/jzlib_1.0.7.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | DESCRIPTION = "zlib implementation in Java" | ||
2 | LICENSE = "BSD" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a2b2e5b95bf768dd5c4ca097c9cde9e9" | ||
4 | |||
5 | HOMEPAGE = "http://www.jcraft.com/jzlib" | ||
6 | |||
7 | SRC_URI = "http://www.jcraft.com/jzlib/jzlib-${PV}.tar.gz" | ||
8 | |||
9 | inherit java-library | ||
10 | |||
11 | do_compile() { | ||
12 | mkdir -p build | ||
13 | |||
14 | javac -sourcepath . -d build `find com -name "*.java"` | ||
15 | |||
16 | fastjar -C build -c -f ${JARFILENAME} . | ||
17 | } | ||
18 | |||
19 | SRC_URI[md5sum] = "3c52a0afb970e8a1fb2d34f30d330a83" | ||
20 | SRC_URI[sha256sum] = "20923a3f771a14c58c8cddfff2b589d568aff09f8a931919dc63ddaabb32407a" | ||
21 | |||
22 | NATIVE_INSTALL_WORKS = "1" | ||
23 | BBCLASSEXTEND = "native" | ||
24 | |||
diff --git a/recipes-core/jdepend/jdepend_2.9.bb b/recipes-core/jdepend/jdepend_2.9.bb new file mode 100644 index 0000000..8c9d444 --- /dev/null +++ b/recipes-core/jdepend/jdepend_2.9.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | DESCRIPTION = "Design quality metrics generator for each Java" | ||
2 | |||
3 | # see http://www.clarkware.com/software/license.txt | ||
4 | LICENSE = "BSD" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f5777d32a7709d558c2877d4a6616230" | ||
6 | |||
7 | HOMEPAGE = "http://clarkware.com/software/JDepend.html" | ||
8 | |||
9 | SRC_URI = "http://www.clarkware.com/software/jdepend-${PV}.zip" | ||
10 | |||
11 | inherit java-library | ||
12 | |||
13 | do_compile() { | ||
14 | mkdir -p build | ||
15 | |||
16 | javac -sourcepath src -d build `find src -name "*.java"` | ||
17 | |||
18 | fastjar -C build -c -f ${JARFILENAME} . | ||
19 | } | ||
20 | |||
21 | SRC_URI[md5sum] = "4e979c0dda766ba1dd719905ca975c7b" | ||
22 | SRC_URI[sha256sum] = "202de62e2f3d0667cc464720d5897d0ccb29767ec24e0a4d4c5bd6c4d37425a4" | ||
23 | |||
24 | NATIVE_INSTALL_WORKS = "1" | ||
25 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/jikes/files/javac.jikes b/recipes-core/jikes/files/javac.jikes new file mode 100644 index 0000000..8650d17 --- /dev/null +++ b/recipes-core/jikes/files/javac.jikes | |||
@@ -0,0 +1,2 @@ | |||
1 | #!/bin/sh | ||
2 | jikes -bootclasspath /usr/share/classpath/glibj.zip $@ | ||
diff --git a/recipes-core/jikes/jikes-initial.bb b/recipes-core/jikes/jikes-initial.bb new file mode 100644 index 0000000..613cb51 --- /dev/null +++ b/recipes-core/jikes/jikes-initial.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | SUMMARY = "Initial Java 1.4-compatible (and not higher) compiler" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | ||
4 | DEPENDS = "jikes-native classpath-initial" | ||
5 | |||
6 | S = "${WORKDIR}" | ||
7 | |||
8 | inherit native | ||
9 | |||
10 | do_configure() { | ||
11 | : | ||
12 | } | ||
13 | |||
14 | do_compile() { | ||
15 | echo "#!/bin/sh" > jikes-initial | ||
16 | echo "${STAGING_BINDIR_NATIVE}/jikes -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip \$@" >> jikes-initial | ||
17 | } | ||
18 | |||
19 | do_install() { | ||
20 | install -d ${D}${bindir} | ||
21 | install -m 0755 jikes-initial ${D}${bindir} | ||
22 | } | ||
23 | |||
24 | NATIVE_INSTALL_WORKS = "1" | ||
diff --git a/recipes-core/jikes/jikes_1.22.bb b/recipes-core/jikes/jikes_1.22.bb new file mode 100644 index 0000000..a3b7db3 --- /dev/null +++ b/recipes-core/jikes/jikes_1.22.bb | |||
@@ -0,0 +1,36 @@ | |||
1 | DESCRIPTION = "Java compiler adhering to language and VM specifications" | ||
2 | HOMEPAGE = "http://jikes.sourceforge.net/" | ||
3 | PRIORITY = "optional" | ||
4 | SECTION = "devel" | ||
5 | LICENSE = "IBM" | ||
6 | LIC_FILES_CHKSUM = " \ | ||
7 | file://COPYING;md5=2d52359fd0d8f0c3e371e4cd19b213c0 \ | ||
8 | file://doc/license.htm;md5=43506e48033a385dc0936f620ae2c745 \ | ||
9 | " | ||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/jikes/jikes-${PV}.tar.bz2" | ||
11 | |||
12 | inherit autotools update-alternatives | ||
13 | |||
14 | BBCLASSEXTEND = "native" | ||
15 | |||
16 | RDEPENDS_${PN} = "classpath" | ||
17 | PROVIDES_virtclass-native = "" | ||
18 | RDEPENDS_${PN}_virtclass-native = "" | ||
19 | |||
20 | EXTRA_OECONF = "--disable-fp-emulation --enable-source15" | ||
21 | |||
22 | # configure script incorrectly defines these when cross compiling for ARM | ||
23 | CXXFLAGS_append_arm += "-UHAVE_64BIT_TYPES -DWORDS_BIGENDIAN=1" | ||
24 | |||
25 | do_install() { | ||
26 | oe_runmake 'DESTDIR=${D}' install | ||
27 | ln -s ${bindir}/jikes ${D}${bindir}/javac.jikes | ||
28 | } | ||
29 | |||
30 | PROVIDES = "virtual/javac" | ||
31 | ALTERNATIVE_NAME = "javac" | ||
32 | ALTERNATIVE_LINK = "/usr/bin/javac" | ||
33 | ALTERNATIVE_PATH = "${bindir}/javac.jikes" | ||
34 | |||
35 | SRC_URI[md5sum] = "cda958c7fef6b43b803e1d1ef9afcb85" | ||
36 | SRC_URI[sha256sum] = "0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3" | ||
diff --git a/recipes-core/jlex/files/jlex b/recipes-core/jlex/files/jlex new file mode 100755 index 0000000..7a9e756 --- /dev/null +++ b/recipes-core/jlex/files/jlex | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cp=OE_STAGING_DATADIR_JAVA/OE_JLEX_JAR | ||
4 | |||
5 | exec OE_STAGING_BINDIR/java -cp $cp JLex.Main "$@" | ||
diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb new file mode 100644 index 0000000..e0fe186 --- /dev/null +++ b/recipes-core/jlex/jlex_1.2.6.bb | |||
@@ -0,0 +1,47 @@ | |||
1 | DESCRIPTION = "Lexical analyzer generator for Java" | ||
2 | AUTHOR = "Elliot Berk, A. Appel, C. Scott Ananian" | ||
3 | LICENSE = "JLEX" | ||
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | ||
6 | " | ||
7 | |||
8 | RDEPENDS_${PN} = "java2-runtime" | ||
9 | RDEPENDS_${PN}_virtclass-native = "" | ||
10 | |||
11 | inherit java-library | ||
12 | |||
13 | SRC_URI = "http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/${PV}/Main.java \ | ||
14 | file://jlex \ | ||
15 | " | ||
16 | |||
17 | S = "${WORKDIR}" | ||
18 | |||
19 | do_configure() { | ||
20 | sed -i \ | ||
21 | -e "s|OE_STAGING_BINDIR|${bindir}|" \ | ||
22 | -e "s|OE_STAGING_DATADIR_JAVA|${datadir_java}|" \ | ||
23 | -e "s|OE_JLEX_JAR|${BP}.jar|" \ | ||
24 | ${WORKDIR}/jlex | ||
25 | } | ||
26 | |||
27 | do_compile() { | ||
28 | mkdir -p build | ||
29 | |||
30 | javac -d build Main.java | ||
31 | |||
32 | fastjar -C build -c -f ${BP}.jar . | ||
33 | } | ||
34 | |||
35 | do_install_append() { | ||
36 | install -d ${D}${bindir} | ||
37 | install -m 0755 jlex ${D}${bindir}/ | ||
38 | } | ||
39 | |||
40 | PACKAGES = "${PN}" | ||
41 | |||
42 | FILES_${PN} += "${datadir_java}" | ||
43 | |||
44 | SRC_URI[md5sum] = "fe0cff5db3e2f0f5d67a153cf6c783af" | ||
45 | SRC_URI[sha256sum] = "aeebaece3b3a53972bb0ba0f810540386c267070ee9dca6ffa43c6ff74a54bd7" | ||
46 | |||
47 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/junit/junit4_4.3.1.bb b/recipes-core/junit/junit4_4.3.1.bb new file mode 100644 index 0000000..bed0e42 --- /dev/null +++ b/recipes-core/junit/junit4_4.3.1.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | DESCRIPTION = "JUnit is a testing framework for Java" | ||
2 | LICENSE = "CPL" | ||
3 | AUTHOR = "junit.org" | ||
4 | HOMEPAGE = "http://www.junit.org" | ||
5 | |||
6 | SRC_URI = "http://downloads.sourceforge.net/junit/junit-${PV}-src.jar" | ||
7 | |||
8 | S = "${WORKDIR}" | ||
9 | |||
10 | inherit java-library | ||
11 | |||
12 | DEPENDS = "fastjar-native" | ||
13 | |||
14 | do_compile() { | ||
15 | mkdir -p build | ||
16 | |||
17 | # Workaround for jamvm. | ||
18 | bcp=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip | ||
19 | |||
20 | javac -source 5.0 -bootclasspath $bcp -sourcepath . -d build `find . -name "*.java"` | ||
21 | |||
22 | fastjar -C build -c -f ${JARFILENAME} . | ||
23 | } | ||
24 | |||
25 | SRC_URI[md5sum] = "170f9645a41398388e8553b32ff5f630" | ||
26 | SRC_URI[sha256sum] = "57d1e49ee3fd0dbdc0a68a852925c973af5c30b1725b6aa63bfb42df6f7c3349" | ||
27 | |||
28 | NATIVE_INSTALL_WORKS = "1" | ||
29 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/junit/junit_3.8.2.bb b/recipes-core/junit/junit_3.8.2.bb new file mode 100644 index 0000000..a628ac4 --- /dev/null +++ b/recipes-core/junit/junit_3.8.2.bb | |||
@@ -0,0 +1,39 @@ | |||
1 | DESCRIPTION = "JUnit is a testing framework for Java" | ||
2 | AUTHOR = "junit.org" | ||
3 | HOMEPAGE = "http://www.junit.org" | ||
4 | LICENSE = "CPL" | ||
5 | LIC_FILES_CHKSUM = "file://cpl-v10.html;md5=67a4b75d42edcbd82d2878eba913691b" | ||
6 | |||
7 | SRC_URI = "http://downloads.sourceforge.net/junit/junit${PV}.zip" | ||
8 | |||
9 | S = "${WORKDIR}/junit${PV}" | ||
10 | |||
11 | inherit java-library | ||
12 | |||
13 | do_unpackpost() { | ||
14 | mkdir -p src | ||
15 | |||
16 | # Prevent deletion by do_removebinaries. | ||
17 | mv src.jar src.zip | ||
18 | |||
19 | unzip src.zip -d src | ||
20 | } | ||
21 | |||
22 | addtask unpackpost before do_removebinaries after do_unpack | ||
23 | |||
24 | do_compile() { | ||
25 | mkdir -p build | ||
26 | |||
27 | # Workaround for jamvm. | ||
28 | bcp=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip | ||
29 | |||
30 | javac -bootclasspath $bcp -sourcepath src -d build `find src -name "*.java"` | ||
31 | |||
32 | fastjar -C build -c -f ${JARFILENAME} . | ||
33 | } | ||
34 | |||
35 | SRC_URI[md5sum] = "9b8963ba2147a64bd5f1574b6fd289cb" | ||
36 | SRC_URI[sha256sum] = "aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a" | ||
37 | |||
38 | NATIVE_INSTALL_WORKS = "1" | ||
39 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/llvm/llvm-common.bb b/recipes-core/llvm/llvm-common.bb new file mode 100644 index 0000000..38ca1ee --- /dev/null +++ b/recipes-core/llvm/llvm-common.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | DESCRIPTION = "Helper script for OE's llvm support" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
4 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ | ||
5 | " | ||
6 | |||
7 | SRC_URI = "file://llvm-config" | ||
8 | |||
9 | do_install() { | ||
10 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | ||
11 | install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | ||
12 | } | ||
13 | |||
14 | do_install_virtclass-native() { | ||
15 | install -d ${D}${bindir} | ||
16 | install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir} | ||
17 | } | ||
18 | |||
19 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/llvm/llvm-common/llvm-config b/recipes-core/llvm/llvm-common/llvm-config new file mode 100644 index 0000000..a9a416d --- /dev/null +++ b/recipes-core/llvm/llvm-common/llvm-config | |||
@@ -0,0 +1,10 @@ | |||
1 | #!/bin/sh | ||
2 | # Wrapper script for real llvm-config. Simply calls | ||
3 | |||
4 | if [ $WANT_LLVM_RELEASE ]; then | ||
5 | exec `dirname $0`/${TARGET_PREFIX}llvm-config$WANT_LLVM_RELEASE ${@} | ||
6 | else | ||
7 | echo "The variable WANT_LLVM_RELEASE is not defined and exported" | ||
8 | echo "by your build recipe. Go figure." | ||
9 | exit 1 | ||
10 | fi | ||
diff --git a/recipes-core/llvm/llvm.inc b/recipes-core/llvm/llvm.inc new file mode 100644 index 0000000..a37c790 --- /dev/null +++ b/recipes-core/llvm/llvm.inc | |||
@@ -0,0 +1,218 @@ | |||
1 | # LLVM does not provide ABI stability between different versions. For this | ||
2 | # reason OE makes it possible to build and install different llvm versions | ||
3 | # at the same time. | ||
4 | # | ||
5 | # This is true for the normal recipes as well as the native ones. | ||
6 | # | ||
7 | # All regular installation directories are prefixed with 'llvm${LLVM_RELEASE}' | ||
8 | # e.g. "${STAGING_BINDIR}/llvm2.5" or "${STAGING_INCDIR}/llvm2.5" | ||
9 | # | ||
10 | # For your program or library that makes use of llvm you do should not need to | ||
11 | # modify anything as long as it uses the results of various llvm-config | ||
12 | # invocations. If you need customizations something is wrong and it needs to be | ||
13 | # fixed (report bug). | ||
14 | # | ||
15 | # However the *recipe* for your program/library *must* declare | ||
16 | # export WANT_LLVM_RELEASE = "<valid version number>" | ||
17 | # The version number is picked up by a generic wrapper script which just calls | ||
18 | # the variant of the specified version. | ||
19 | |||
20 | DESCRIPTION = "The Low Level Virtual Machine" | ||
21 | HOMEPAGE = "http://llvm.org" | ||
22 | # 3-clause BSD-like | ||
23 | LICENSE = "University of Illinois/NCSA Open Source License" | ||
24 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0ac5f799a2d89477c75b0a378b221855" | ||
25 | |||
26 | DEPENDS = "llvm${LLVM_RELEASE}-native llvm-common" | ||
27 | DEPENDS_virtclass-native = "llvm-common-native cmake-native perl-native" | ||
28 | |||
29 | |||
30 | SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.tgz" | ||
31 | |||
32 | SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch " | ||
33 | |||
34 | S = "${WORKDIR}/llvm-${PV}" | ||
35 | |||
36 | inherit cmake perlnative | ||
37 | |||
38 | # Defines the LLVM supported arches. By now we always build either for ${BUILD} | ||
39 | # (native) or ${TARGET}. In the future it may make sense to enable all backends | ||
40 | # for the non-native build. The decision which backends are used is made by | ||
41 | # the 3rd party program or library that uses llvm anyway. | ||
42 | LLVM_ARCH = "${@get_llvm_arch(d)}" | ||
43 | |||
44 | # This is used for generating the install directory for the llvm libraries, | ||
45 | # binaries and headers. It makes side by side installation of those possible. | ||
46 | LLVM_RELEASE = "${PV}" | ||
47 | |||
48 | # llvm *must* be built out of tree | ||
49 | OECMAKE_SOURCEPATH = ".." | ||
50 | OECMAKE_BUILDPATH = "build" | ||
51 | EXTRA_OECMAKE = "\ | ||
52 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm${LLVM_RELEASE}/tblgen \ | ||
53 | -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ | ||
54 | -DCMAKE_LINKER:FILEPATH=${LD} \ | ||
55 | -DCMAKE_AR:FILEPATH=${AR} \ | ||
56 | -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \ | ||
57 | -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ | ||
58 | -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ | ||
59 | -DCMAKE_STRIP:FILEPATH=${STRIP} \ | ||
60 | -DNM_PATH:FILEPATH=${NM} \ | ||
61 | -DLLVM_ENABLE_PIC:BOOL=ON \ | ||
62 | -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \ | ||
63 | -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \ | ||
64 | -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ | ||
65 | -DBUILD_SHARED_LIBS:BOOL=ON \ | ||
66 | " | ||
67 | # We need to reset this to avoid breakage as we build out of tree | ||
68 | TOOLCHAIN_OPTIONS = "" | ||
69 | |||
70 | PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}" | ||
71 | |||
72 | PACKAGES_DYNAMIC = "llvm-*" | ||
73 | |||
74 | # the difference to the non-native build is that we do not need | ||
75 | # to declare the location of the tblgen executable. | ||
76 | EXTRA_OECMAKE_virtclass-native = "\ | ||
77 | -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ | ||
78 | -DCMAKE_LINKER:FILEPATH=${LD} \ | ||
79 | -DCMAKE_AR:FILEPATH=${AR} \ | ||
80 | -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \ | ||
81 | -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ | ||
82 | -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ | ||
83 | -DCMAKE_STRIP:FILEPATH=${STRIP} \ | ||
84 | -DNM_PATH:FILEPATH=${NM} \ | ||
85 | " | ||
86 | |||
87 | PACKAGES_virtclass-native = "" | ||
88 | |||
89 | PACKAGES_DYNAMIC_virtclass-native = "" | ||
90 | |||
91 | python populate_packages_prepend () { | ||
92 | libllvm_libdir = bb.data.expand('${libdir}/llvm${LLVM_RELEASE}', d) | ||
93 | |||
94 | do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True) | ||
95 | } | ||
96 | |||
97 | FILES_${PN} = "" | ||
98 | ALLOW_EMPTY_${PN} = "1" | ||
99 | |||
100 | FILES_${PN}-dbg += "${libdir}/llvm${LLVM_RELEASE}/.debug ${bindir}/llvm${LLVM_RELEASE}/.debug" | ||
101 | |||
102 | FILES_${PN}-dev = " \ | ||
103 | ${includedir} \ | ||
104 | ${bindir}/* \ | ||
105 | ${libdir}/llvm${LLVM_RELEASE}/LLVMHello.so \ | ||
106 | ${libdir}/llvm${LLVM_RELEASE}/BugpointPasses.so \ | ||
107 | " | ||
108 | |||
109 | do_install() { | ||
110 | # Install into a private directory to be able to reorganize the files. | ||
111 | |||
112 | cd ${OECMAKE_BUILDPATH} | ||
113 | |||
114 | oe_runmake DESTDIR=${WORKDIR}/llvm-install install | ||
115 | |||
116 | # Create our custom target directories | ||
117 | install -d ${D}${bindir}/llvm${LLVM_RELEASE} | ||
118 | install -d ${D}${includedir}/llvm${LLVM_RELEASE} | ||
119 | install -d ${D}${libdir}/llvm${LLVM_RELEASE} | ||
120 | |||
121 | # Move headers into their own directory | ||
122 | cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \ | ||
123 | ${D}${includedir}/llvm${LLVM_RELEASE}/ | ||
124 | cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ | ||
125 | ${D}${includedir}/llvm${LLVM_RELEASE}/ | ||
126 | |||
127 | find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ | ||
128 | install {} ${D}${libdir}/llvm${LLVM_RELEASE} \; | ||
129 | |||
130 | # I dont know another way out. Binaries are installed into a special subdir | ||
131 | find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \ | ||
132 | install {} ${D}${bindir}/llvm${LLVM_RELEASE} \; | ||
133 | |||
134 | # LLVM does not install this by default. | ||
135 | install bin/tblgen ${D}${bindir}/llvm${LLVM_RELEASE} | ||
136 | |||
137 | # we install it here unmodified for native and none native and overwrite it | ||
138 | # later for native case | ||
139 | install -d ${D}${bindir} | ||
140 | install -m 0755 bin/llvm-config ${D}${bindir} | ||
141 | |||
142 | # Fix the paths in the config script to make it find the binaries and | ||
143 | # library files. Doing so allows 3rd party configure scripts working | ||
144 | # unmodified. | ||
145 | sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \ | ||
146 | -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \ | ||
147 | -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \ | ||
148 | -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ | ||
149 | bin/llvm-config > bin/llvm-config${LLVM_RELEASE} | ||
150 | |||
151 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} | ||
152 | install -m 0755 bin/llvm-config${LLVM_RELEASE} ${SYSROOT_DESTDIR}${bindir_crossscripts} | ||
153 | } | ||
154 | |||
155 | do_install_virtclass-native() { | ||
156 | # Install into a private directory to be able to reorganize the files. | ||
157 | |||
158 | cd ${OECMAKE_BUILDPATH} | ||
159 | |||
160 | oe_runmake DESTDIR=${WORKDIR}/llvm-install install | ||
161 | |||
162 | # Create our custom target directories | ||
163 | install -d ${D}${bindir}/llvm${LLVM_RELEASE} | ||
164 | install -d ${D}${includedir}/llvm${LLVM_RELEASE} | ||
165 | install -d ${D}${libdir}/llvm${LLVM_RELEASE} | ||
166 | |||
167 | # Move headers into their own directory | ||
168 | cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \ | ||
169 | ${D}${includedir}/llvm${LLVM_RELEASE}/ | ||
170 | cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ | ||
171 | ${D}${includedir}/llvm${LLVM_RELEASE}/ | ||
172 | |||
173 | find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ | ||
174 | install {} ${D}${libdir}/llvm${LLVM_RELEASE} \; | ||
175 | |||
176 | # I dont know another way out. Binaries are installed into a special subdir | ||
177 | find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \ | ||
178 | install {} ${D}${bindir}/llvm${LLVM_RELEASE} \; | ||
179 | |||
180 | # LLVM does not install this by default. | ||
181 | install bin/tblgen ${D}${bindir}/llvm${LLVM_RELEASE} | ||
182 | |||
183 | # Fix the paths in the config script to make it find the binaries and | ||
184 | # library files. Doing so allows 3rd party configure scripts working | ||
185 | # unmodified. | ||
186 | sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \ | ||
187 | -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \ | ||
188 | -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \ | ||
189 | -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ | ||
190 | bin/llvm-config > bin/llvm-config${LLVM_RELEASE} | ||
191 | |||
192 | install -d ${D}${bindir} | ||
193 | install -m 0755 bin/llvm-config${LLVM_RELEASE} ${D}${bindir} | ||
194 | } | ||
195 | |||
196 | |||
197 | # Retrieve the target in a way that is compatible to the arch | ||
198 | # value in llvm (>= 2.5) | ||
199 | def get_llvm_arch(d): | ||
200 | import bb; | ||
201 | |||
202 | arch = bb.data.getVar('TARGET_ARCH', d, 1) | ||
203 | if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686": | ||
204 | arch = "X86" | ||
205 | elif arch == "arm": | ||
206 | arch = "ARM" | ||
207 | elif arch == "mipsel": | ||
208 | arch = "Mips" | ||
209 | elif arch == "powerpc": | ||
210 | arch = "PowerPC" | ||
211 | else: | ||
212 | oefatal("Your target architecture is not supported by this recipe"); | ||
213 | |||
214 | return arch | ||
215 | |||
216 | |||
217 | BBCLASSEXTEND = "native" | ||
218 | |||
diff --git a/recipes-core/llvm/llvm2.9/arm_fenv_uclibc.patch b/recipes-core/llvm/llvm2.9/arm_fenv_uclibc.patch new file mode 100644 index 0000000..c3ae494 --- /dev/null +++ b/recipes-core/llvm/llvm2.9/arm_fenv_uclibc.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Index: llvm-2.9/include/llvm/Support/FEnv.h | ||
2 | =================================================================== | ||
3 | --- llvm-2.9.orig/include/llvm/Support/FEnv.h 2010-11-29 20:44:50.000000000 +0100 | ||
4 | +++ llvm-2.9/include/llvm/Support/FEnv.h 2011-11-18 18:42:22.580161297 +0100 | ||
5 | @@ -17,6 +17,9 @@ | ||
6 | |||
7 | #include "llvm/Config/config.h" | ||
8 | #include <cerrno> | ||
9 | + | ||
10 | +#undef HAVE_FENV_H | ||
11 | + | ||
12 | #ifdef HAVE_FENV_H | ||
13 | #include <fenv.h> | ||
14 | #endif | ||
diff --git a/recipes-core/llvm/llvm2.9_2.9.bb b/recipes-core/llvm/llvm2.9_2.9.bb new file mode 100644 index 0000000..5e5ca29 --- /dev/null +++ b/recipes-core/llvm/llvm2.9_2.9.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | require llvm.inc | ||
2 | |||
3 | PARALLEL_MAKE_virtclass-native = "" | ||
4 | |||
5 | EXTRA_OECMAKE = "\ | ||
6 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm${LLVM_RELEASE}/tblgen \ | ||
7 | -DLLVM_TARGETS_TO_BUILD="X86;${LLVM_ARCH}" \ | ||
8 | -DCMAKE_LINKER:FILEPATH=${LD} \ | ||
9 | -DCMAKE_AR:FILEPATH=${AR} \ | ||
10 | -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \ | ||
11 | -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ | ||
12 | -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ | ||
13 | -DCMAKE_STRIP:FILEPATH=${STRIP} \ | ||
14 | -DNM_PATH:FILEPATH=${NM} \ | ||
15 | -DLLVM_ENABLE_PIC:BOOL=ON \ | ||
16 | -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \ | ||
17 | -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \ | ||
18 | -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ | ||
19 | -DBUILD_SHARED_LIBS:BOOL=ON \ | ||
20 | " | ||
21 | |||
22 | LLVM_RELEASE = "2.9" | ||
23 | |||
24 | SRC_URI[md5sum] = "793138412d2af2c7c7f54615f8943771" | ||
25 | SRC_URI[sha256sum] = "661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779" | ||
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc new file mode 100644 index 0000000..ef1c41d --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-common.inc | |||
@@ -0,0 +1,518 @@ | |||
1 | DESCRIPTION = "Java runtime based upon the OpenJDK- and Icedtea Project" | ||
2 | HOMEPAGE = "http://icedtea.classpath.org" | ||
3 | LICENSE = "GPL with Classpath Exception" | ||
4 | PRIORITY = "optional" | ||
5 | SECTION = "libs" | ||
6 | |||
7 | # Name of the icedtea tarball and top-level directory. | ||
8 | ICEDTEA = "NEEDS TO BE SET" | ||
9 | |||
10 | S = "${WORKDIR}/${ICEDTEA}" | ||
11 | B = "${S}/build" | ||
12 | |||
13 | INC_PR = "r11" | ||
14 | |||
15 | SRC_URI = "\ | ||
16 | ${ICEDTEA_URI} \ | ||
17 | ${OPENJDK_URI} \ | ||
18 | ${JAXWS_URI} \ | ||
19 | ${JAF_URI} \ | ||
20 | ${JAXP_URI} \ | ||
21 | ${CACAO_URI} \ | ||
22 | ${OEPATCHES} \ | ||
23 | ${ICEDTEAPATCHES} \ | ||
24 | file://jvm.cfg \ | ||
25 | " | ||
26 | |||
27 | JDKPN = "openjdk-6" | ||
28 | JDK_DIR = "java-6-openjdk" | ||
29 | |||
30 | PN = "${JDKPN}-jre" | ||
31 | PROVIDES += "${JDKPN} ${PACKAGES}" | ||
32 | |||
33 | DEPENDS = "giflib libpng jpeg cups \ | ||
34 | xalan-j xerces-j rhino \ | ||
35 | freetype libxinerama libxt libxp libxrender libxtst libxi \ | ||
36 | alsa-lib libffi llvm2.9\ | ||
37 | ant-native \ | ||
38 | fastjar-native \ | ||
39 | icedtea6-native \ | ||
40 | cacaoh-openjdk-native \ | ||
41 | zip-native \ | ||
42 | " | ||
43 | |||
44 | DEPENDS_append_libc-uclibc = " libiconv " | ||
45 | |||
46 | # The OpenJDK build with interpreter optimizations for ARM depends on a binary | ||
47 | # that generates constants for an assembler source file. There is no other | ||
48 | # way than to generate this on a pseudo machine. Cross-compiling would not help | ||
49 | # because structure sizes and/or alignment may differ. | ||
50 | DEPENDS_append_arm = " qemu-native " | ||
51 | |||
52 | |||
53 | # No package should directly depend on this (it should require | ||
54 | # java2-runtime instead). | ||
55 | PRIVATE_LIBS = "\ | ||
56 | libunpack.so libverify.so libjava.so libzip.so libnpt.so \ | ||
57 | libjava_crw_demo.so libhprof.so libnet.so libnio.so \ | ||
58 | libmanagement.so libinstrument.so libjsound.so libjsoundalsa.so \ | ||
59 | libj2pcsc.so libj2pkcs11.so libj2gss.so libmlib_image.so \ | ||
60 | libawt.so libsplashscreen.so libfreetype.so.6 libfontmanager.so \ | ||
61 | libjpeg.so liblcms.so librmi.so libjawt.so libjaas_unix.so \ | ||
62 | libattach.so libjdwp.so libdt_socket.so libhpi.so libjli.so \ | ||
63 | libmawt.so libjvm.so \ | ||
64 | libversionCheck.so libcompiledMethodLoad.so libgctest.so \ | ||
65 | libheapViewer.so libheapTracker.so libminst.so libmtrace.so \ | ||
66 | libwaiters.so libhprof.so \ | ||
67 | " | ||
68 | |||
69 | |||
70 | inherit java autotools gettext | ||
71 | |||
72 | export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" | ||
73 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" | ||
74 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" | ||
75 | export CACAO_CONFIGURE_ARGS = "\ | ||
76 | ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ | ||
77 | --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-openjdk-0.99.4" | ||
78 | |||
79 | JAVA_HOME[unexport] = "1" | ||
80 | |||
81 | EXTRA_OECONF = "\ | ||
82 | --disable-docs \ | ||
83 | --disable-pulse-java \ | ||
84 | --disable-plugin \ | ||
85 | \ | ||
86 | --with-ecj=${STAGING_BINDIR_NATIVE}/foo \ | ||
87 | --with-ecj-jar=${STAGING_DATADIR_JAVA_NATIVE}/ecj-bootstrap.jar \ | ||
88 | --with-java=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/java \ | ||
89 | --with-javac=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javac \ | ||
90 | --with-javah=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javah \ | ||
91 | --with-jar=${STAGING_BINDIR_NATIVE}/fastjar \ | ||
92 | --with-rmic=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/rmic \ | ||
93 | --with-xalan2-jar=${STAGING_DATADIR_JAVA}/xalan2.jar \ | ||
94 | --with-xalan2-serializer-jar=${STAGING_DATADIR_JAVA}/serializer.jar \ | ||
95 | --with-xerces2-jar=${STAGING_DATADIR_JAVA}/xercesImpl.jar \ | ||
96 | --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \ | ||
97 | --with-openjdk-src-dir=${WORKDIR}/openjdk-src-dir \ | ||
98 | --with-gcj-home=${WORKDIR}/fake-jdk \ | ||
99 | --with-parallel-jobs=${JDK_JOBS} \ | ||
100 | \ | ||
101 | --with-libgcj-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar \ | ||
102 | \ | ||
103 | --with-pkgversion=${PV} \ | ||
104 | --with-cc-for-build=${BUILD_CC} \ | ||
105 | --enable-zero \ | ||
106 | --with-additional-vms=shark,cacao \ | ||
107 | --enable-openjdk-cross-compilation \ | ||
108 | " | ||
109 | |||
110 | |||
111 | # OpenJDK uses slightly different names for certain arches. We need to know | ||
112 | # this to create some files which are expected by the build. | ||
113 | def get_jdk_arch(d): | ||
114 | import bb | ||
115 | |||
116 | jdk_arch = bb.data.getVar('TARGET_ARCH', d, 1) | ||
117 | if jdk_arch == "x86_64": | ||
118 | jdk_arch = "amd64" | ||
119 | elif (jdk_arch == "i586" or jdk_arch == "i686"): | ||
120 | jdk_arch = "i586" | ||
121 | |||
122 | return jdk_arch | ||
123 | |||
124 | JDK_ARCH = "${@get_jdk_arch(d)}" | ||
125 | JDK_HOME = "${libdir_jvm}/${JDK_DIR}" | ||
126 | |||
127 | # OpenJDK supports parallel compilation but uses a plain number for this. | ||
128 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, | ||
129 | # e.g. "-j 4". | ||
130 | def get_jdk_jobs(d): | ||
131 | import bb | ||
132 | |||
133 | pm = bb.data.getVar('PARALLEL_MAKE', d, 1); | ||
134 | if not pm: | ||
135 | return "1" | ||
136 | |||
137 | pm = pm.split(" "); | ||
138 | if (len(pm) == 2): | ||
139 | return pm[1] | ||
140 | |||
141 | # Whatever found in PARALLEL_MAKE was not suitable. | ||
142 | return "1" | ||
143 | |||
144 | JDK_JOBS = "${@get_jdk_jobs(d)}" | ||
145 | |||
146 | # A function that is needed in the Shark builds. | ||
147 | def get_llvm_configure_arch(d): | ||
148 | import bb; | ||
149 | |||
150 | arch = bb.data.getVar('TARGET_ARCH', d, 1) | ||
151 | if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686": | ||
152 | arch = "x86" | ||
153 | elif arch == "arm": | ||
154 | arch = "arm" | ||
155 | elif arch == "mipsel": | ||
156 | arch = "mips" | ||
157 | elif arch == "powerpc": | ||
158 | arch = "powerpc" | ||
159 | else: | ||
160 | oefatal("Your target architecture is not supported by this recipe"); | ||
161 | |||
162 | return arch | ||
163 | |||
164 | # Custom preparation of the sources which: | ||
165 | # - cleans up the sources | ||
166 | # - copies the patches into the proper directory | ||
167 | # - prepares the FakeJDK directory structure | ||
168 | #DISABLED because of incompatibility with oe stable 2009: do_prepareconfigure () { | ||
169 | do_configure_prepend() { | ||
170 | chmod -R ug+w ${WORKDIR}/openjdk-src-dir | ||
171 | (cd ${WORKDIR}/openjdk-src-dir && sh ${S}/fsg.sh) | ||
172 | |||
173 | # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with | ||
174 | # ".patch" into the patches directory. | ||
175 | find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; | ||
176 | find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \; | ||
177 | |||
178 | # use now the rt.jar from icedtea6-native | ||
179 | mkdir -p ${WORKDIR}/fake-jdk/jre/lib | ||
180 | ln -sf ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar ${WORKDIR}/fake-jdk/jre/lib/rt.jar | ||
181 | |||
182 | symlinked=false | ||
183 | echo "Creating symlinks for fake-jdk" | ||
184 | mkdir -p ${WORKDIR}/fake-jdk/include | ||
185 | for i in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/include` ;do | ||
186 | bn=`basename $i` | ||
187 | echo "Symlinking: $bn" | ||
188 | ln -sf $i ${WORKDIR}/fake-jdk/include/$bn; | ||
189 | symlinked=true | ||
190 | done | ||
191 | |||
192 | # If the symlinks have not been created the built cannot continue. This | ||
193 | # can happen if icedtea6-native is not ready at this point. The recipe | ||
194 | # should make sure this is not the case but a little sanity checking | ||
195 | # in such a complicated build can't be wrong. | ||
196 | if [ x$symlinked = xfalse ] | ||
197 | then | ||
198 | echo"Build b0rken! Have not created any symlinks for fake-jdk!" | ||
199 | else | ||
200 | echo "fake-jdk setup appears sane." | ||
201 | fi | ||
202 | } | ||
203 | |||
204 | # Note: The following lines only work for OE.dev branch but cause an exception | ||
205 | # in oe stable's 2009 bitbake. As such the function is prepended to do_configure instead. | ||
206 | #addtask prepareconfigure after do_patch before do_configure | ||
207 | # Makes prepareconfigure depend on icedtea6-native having being staged. | ||
208 | #do_prepareconfigure[depends] += "icedtea6-native:do_populate_sysroot" | ||
209 | |||
210 | |||
211 | do_configure_append() { | ||
212 | oe_runmake patch-ecj | ||
213 | } | ||
214 | |||
215 | # Work around broken variable quoting in oe-stable 2009 and provide the variable | ||
216 | # via the environment which then overrides the erroneous value that was written | ||
217 | # into '${ICETDEA}/Makefile'. | ||
218 | # Icedtea's makefile is not compatible to parallelization so we cannot allow | ||
219 | # passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are | ||
220 | # parallelizable and we need ${PARALLEL_MAKE} to derive the proper value. | ||
221 | # The base for this quirk is that GNU Make only considers the last "-j" option. | ||
222 | EXTRA_OEMAKE = '-j 1 CC="${CC}" CCC="${CXX}" CPP="${CPP}" CXX="${CXX}" CC_FOR_BUILD="${BUILD_CC}"' | ||
223 | |||
224 | EXTRA_OEMAKE += ' \ | ||
225 | OE_CFLAGS="${TARGET_CFLAGS}" \ | ||
226 | OE_CPPFLAGS="${TARGET_CPPFLAGS}" \ | ||
227 | OE_CXXFLAGS="${TARGET_CXXFLAGS}" \ | ||
228 | OE_LDFLAGS="${TARGET_LDFLAGS}" \ | ||
229 | ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ | ||
230 | ' | ||
231 | |||
232 | # Puts an OE specific string into the binary making it possible for the user | ||
233 | # to know where it comes from (and blame the right people ...). | ||
234 | DIST_ID = "Built for ${DISTRO}" | ||
235 | DIST_NAME = "${DISTRO}" | ||
236 | EXTRA_OEMAKE += 'DIST_NAME="${DIST_NAME}" DIST_ID="${DIST_ID}"' | ||
237 | |||
238 | |||
239 | # llvm configure and compiles stuff | ||
240 | |||
241 | export WANT_LLVM_RELEASE = "2.9" | ||
242 | |||
243 | # Provides the target architecture to the configure script. | ||
244 | export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}" | ||
245 | |||
246 | OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm2.9" | ||
247 | |||
248 | EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' | ||
249 | |||
250 | |||
251 | # Large stack is required at least on x86_64 host, otherwise random segfaults appear: | ||
252 | QEMU = "qemu-${TARGET_ARCH} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}" | ||
253 | |||
254 | EXTRA_OEMAKE += 'QEMU="${QEMU}"' | ||
255 | |||
256 | # Name of the directory containing the compiled output | ||
257 | BUILD_DIR = "build/linux-${JDK_ARCH}" | ||
258 | |||
259 | # The build of OpenJDK is a 3-part process. For better restartability and overrideability they have been split into | ||
260 | # three functions. | ||
261 | # 1. compile Hotspot or Cacao (this one is supposed to be implemented according to wanted VM) | ||
262 | # 2. compile openjdk-ecj (to have libraries as libjvm.so and libjava.so which are needed later) | ||
263 | # 3. compile openjdk (the final result) | ||
264 | |||
265 | do_compilestepone() { | ||
266 | oe_runmake bootstrap-directory-ecj | ||
267 | |||
268 | # now we need to override the tools.jar to point to the normal jdk's tools.jar | ||
269 | rm bootstrap/ecj/lib/tools.jar | ||
270 | ln -s ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/lib/tools.jar bootstrap/ecj/lib/tools.jar | ||
271 | |||
272 | # First build hotspot to get a libjvm.so (to link corba in the icedtea-ecj build) | ||
273 | echo "1/3 Building Hotspot" | ||
274 | oe_runmake hotspot | ||
275 | |||
276 | # Remove spurious libarch directory/symlink | ||
277 | rm -rf bootstrap/ecj/jre/lib/${JDK_ARCH} || true | ||
278 | |||
279 | # Provide a symlink to the target arch's libjvm.so (to link against) | ||
280 | ln -s `pwd`/openjdk-ecj/${BUILD_DIR}/j2sdk-image/jre/lib/${JDK_ARCH} bootstrap/jdk1.6.0/jre/lib/${JDK_ARCH} | ||
281 | |||
282 | # fake j2sdk-image | ||
283 | rm openjdk-ecj/${BUILD_DIR}/j2sdk-image/include || true | ||
284 | cp -ar openjdk-ecj/${BUILD_DIR}/hotspot/import/include openjdk-ecj/${BUILD_DIR}/j2sdk-image/ | ||
285 | install -d openjdk-ecj/${BUILD_DIR}/j2sdk-image/bin | ||
286 | } | ||
287 | addtask compilestepone after do_configure before do_compilesteptwo | ||
288 | |||
289 | # This part can be shared between cacao and hotspot-zero builds. | ||
290 | do_compilesteptwo() { | ||
291 | echo "2/3 Building bootstrap JDK" | ||
292 | |||
293 | # Now cross-compile bootstrap JDK | ||
294 | rm stamps/icedtea-against-ecj.stamp stamps/icedtea-ecj.stamp || true | ||
295 | oe_runmake icedtea-against-ecj | ||
296 | |||
297 | ln -sf ../openjdk-ecj/${BUILD_DIR}/j2sdk-image bootstrap/icedtea | ||
298 | |||
299 | # Replace all executables with symlinks to their native equivalents. | ||
300 | for F in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin -type f` | ||
301 | do | ||
302 | bf=`basename $F` | ||
303 | echo "Creating symlink for:" $bf | ||
304 | ln -sf $F bootstrap/icedtea/bin/$bf | ||
305 | done | ||
306 | } | ||
307 | addtask compilesteptwo after do_compilestepone before do_compile | ||
308 | |||
309 | do_compile() { | ||
310 | |||
311 | echo "3/3 Building final JDK" | ||
312 | |||
313 | # Build the final Hotspot + OpenJDK | ||
314 | oe_runmake icedtea-against-icedtea \ | ||
315 | } | ||
316 | |||
317 | do_install() { | ||
318 | install -d ${D}${libdir_jvm} | ||
319 | cp -R ${S}/build/openjdk/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME} | ||
320 | |||
321 | chmod u+rw -R ${D}${JDK_HOME} | ||
322 | |||
323 | # Fix symlink which would point into staging in the binary package. | ||
324 | ln -sf ${datadir_java}/rhino.jar ${D}${JDK_HOME}/jre/lib/rhino.jar | ||
325 | |||
326 | # JRE is a subset of JDK. So to save space and resemble what the BIG distros | ||
327 | # do we create symlinks from the JDK binaries to their counterparts in the | ||
328 | # JRE folder (which have to exist by that time b/c of dependencies). | ||
329 | for F in `find ${D}${JDK_HOME}/jre/bin -type f` | ||
330 | do | ||
331 | bf=`basename $F` | ||
332 | echo "replace:" $bf | ||
333 | rm ${D}${JDK_HOME}/bin/$bf | ||
334 | ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf | ||
335 | done | ||
336 | |||
337 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ | ||
338 | } | ||
339 | |||
340 | # Notes about the ideas behind packaging: | ||
341 | # 1) User should install openjdk-6-jre. This is a provider of 'java2-runtime'. | ||
342 | # 2) This lets package mgmt install: openjdk-6-java | ||
343 | # -> openjdk-6-vm-shark|openjdk-6-vm-zero|openjdk-6-vm-cacao -> openjdk-6-common | ||
344 | # | ||
345 | # With opkg the zero VM is chosen which is good b/c that is the best known (= compatible) | ||
346 | # runtime. Installing other runtimes side-by-side is possible. Through jvm.cfg the following | ||
347 | # order of precedence is enforced: zero, shark, cacao. User can chose a different runtime | ||
348 | # by adding '-shark' or '-cacao' to the Java command (or by deinstalling an otherwise preferred | ||
349 | # runtime) | ||
350 | # 3) All other packages, including -jdk, are optional and not needed for normal Java apps. | ||
351 | PACKAGES = " \ | ||
352 | ${JDKPN}-jre \ | ||
353 | ${JDKPN}-dbg \ | ||
354 | ${JDKPN}-demo-dbg \ | ||
355 | ${JDKPN}-demo \ | ||
356 | ${JDKPN}-source \ | ||
357 | ${JDKPN}-doc \ | ||
358 | ${JDKPN}-jdk \ | ||
359 | ${JDKPN}-java \ | ||
360 | ${JDKPN}-vm-shark \ | ||
361 | ${JDKPN}-vm-zero \ | ||
362 | ${JDKPN}-vm-cacao \ | ||
363 | ${JDKPN}-common \ | ||
364 | " | ||
365 | |||
366 | FILES_${JDKPN}-dbg = "\ | ||
367 | ${JDK_HOME}/bin/.debug \ | ||
368 | ${JDK_HOME}/lib/.debug \ | ||
369 | ${JDK_HOME}/jre/bin/.debug \ | ||
370 | ${JDK_HOME}/jre/lib/.debug \ | ||
371 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \ | ||
372 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \ | ||
373 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \ | ||
374 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \ | ||
375 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \ | ||
376 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \ | ||
377 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \ | ||
378 | " | ||
379 | |||
380 | FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" | ||
381 | RDEPENDS_${JDKPN}-demo = "java2-runtime" | ||
382 | FILES_${JDKPN}-demo-dbg = "\ | ||
383 | ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \ | ||
384 | ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \ | ||
385 | ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \ | ||
386 | ${JDK_HOME}/demo/jvmti/hprof/lib/.debug \ | ||
387 | ${JDK_HOME}/demo/jvmti/minst/lib/.debug \ | ||
388 | ${JDK_HOME}/demo/jvmti/mtrace/lib/.debug \ | ||
389 | ${JDK_HOME}/demo/jvmti/versionCheck/lib/.debug \ | ||
390 | ${JDK_HOME}/demo/jvmti/waiters/lib/.debug \ | ||
391 | ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \ | ||
392 | " | ||
393 | |||
394 | FILES_${JDKPN}-source = "${JDK_HOME}/src.zip" | ||
395 | |||
396 | FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java" | ||
397 | |||
398 | FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/arm/server/" | ||
399 | |||
400 | FILES_${JDKPN}-vm-shark = "${JDK_HOME}/jre/lib/arm/shark/" | ||
401 | |||
402 | FILES_${JDKPN}-vm-cacao = "${JDK_HOME}/jre/lib/arm/cacao/" | ||
403 | |||
404 | FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ | ||
405 | ${JDK_HOME}/jre/THIRD_PARTY_README \ | ||
406 | ${JDK_HOME}/jre/LICENSE \ | ||
407 | ${JDK_HOME}/jre/lib \ | ||
408 | " | ||
409 | |||
410 | FILES_openjdk-6-jre_append = " \ | ||
411 | ${JDK_HOME}/jre/bin/keytool \ | ||
412 | ${JDK_HOME}/jre/bin/orbd \ | ||
413 | ${JDK_HOME}/jre/bin/pack200 \ | ||
414 | ${JDK_HOME}/jre/bin/rmid \ | ||
415 | ${JDK_HOME}/jre/bin/rmiregistry \ | ||
416 | ${JDK_HOME}/jre/bin/servertool \ | ||
417 | ${JDK_HOME}/jre/bin/tnameserv \ | ||
418 | ${JDK_HOME}/jre/bin/unpack200 \ | ||
419 | ${JDK_HOME}/jre/bin/policytool \ | ||
420 | ${JDK_HOME}/jre/bin/javaws \ | ||
421 | " | ||
422 | |||
423 | RDEPENDS_${JDKPN}-common = "librhino-java" | ||
424 | |||
425 | RPROVIDES_${JDKPN}-vm-shark = "java2-vm" | ||
426 | RPROVIDES_${JDKPN}-vm-zero = "java2-vm" | ||
427 | RPROVIDES_${JDKPN}-vm-cacao = "java2-vm" | ||
428 | |||
429 | RDEPENDS_${JDKPN}-java = "java2-vm" | ||
430 | |||
431 | # For some reason shark and cacao do not automatically depends on -common. | ||
432 | # So we add that manually. | ||
433 | RDEPENDS_${JDKPN}-vm-shark = "${JDKPN}-common" | ||
434 | RDEPENDS_${JDKPN}-vm-cacao = "${JDKPN}-common" | ||
435 | |||
436 | # There is a symlink to a .so but this one is valid. | ||
437 | INSANE_SKIP_${JDKPN}-vm-shark = "dev-so" | ||
438 | INSANE_SKIP_${JDKPN}-vm-zero = "dev-so" | ||
439 | INSANE_SKIP_${JDKPN}-vm-cacao = "dev-so" | ||
440 | INSANE_SKIP_${JDKPN}-common = "dev-so" | ||
441 | |||
442 | FILES_${JDKPN}-jdk = " \ | ||
443 | ${JDK_HOME}/bin \ | ||
444 | ${JDK_HOME}/lib \ | ||
445 | ${JDK_HOME}/include \ | ||
446 | " | ||
447 | RDEPENDS_${JDKPN}-jre = "${JDKPN}-java" | ||
448 | RPROVIDES_${JDKPN}-jre = "java2-runtime" | ||
449 | |||
450 | RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre" | ||
451 | |||
452 | FILES_${JDKPN}-doc = "${JDK_HOME}/man" | ||
453 | |||
454 | pkg_postinst_${JDKPN}-vm-shark () { | ||
455 | if grep -q "\-cacao KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then | ||
456 | sed -i -e "/\-cacao KNOWN/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
457 | echo "-cacao KNOWN" >> ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
458 | fi | ||
459 | |||
460 | sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
461 | } | ||
462 | |||
463 | pkg_prerm_${JDKPN}-vm-shark () { | ||
464 | sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
465 | if grep -q "\-cacao KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then | ||
466 | sed -i -e "/\-cacao KNOWN/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
467 | fi | ||
468 | } | ||
469 | |||
470 | pkg_postinst_${JDKPN}-vm-cacao () { | ||
471 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "\-shark KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then | ||
472 | sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
473 | else | ||
474 | sed -i -e "s|^\-cacao.*|\-cacao KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
475 | fi | ||
476 | } | ||
477 | |||
478 | pkg_prerm_${JDKPN}-vm-cacao () { | ||
479 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "\-shark KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then | ||
480 | sed -i -e "/\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
481 | echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
482 | else | ||
483 | sed -i -e "s|^\-cacao.*|\-cacao ERROR|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
484 | fi | ||
485 | } | ||
486 | |||
487 | pkg_postinst_${JDKPN}-vm-zero () { | ||
488 | if grep -q "\-cacao KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "\-shark KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then | ||
489 | sed -i -e "/\-cacao KNOWN/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
490 | echo "-cacao KNOWN" >> ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
491 | fi | ||
492 | |||
493 | sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
494 | } | ||
495 | |||
496 | pkg_prerm_${JDKPN}-vm-zero () { | ||
497 | if grep -q "\-cacao KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg && ! grep -q "\-shark KNOWN" ${JDK_HOME}/jre/lib/arm/jvm.cfg; then | ||
498 | sed -i -e "/\-cacao KNOWN/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
499 | fi | ||
500 | |||
501 | sed -i -e "s|^\-server.*|\-server ERROR|" -e "/^$/d" ${JDK_HOME}/jre/lib/arm/jvm.cfg | ||
502 | } | ||
503 | |||
504 | pkg_postinst_${JDKPN}-jre () { | ||
505 | update-alternatives --install ${bindir}/java java ${JDK_HOME}/jre/bin/java 15 | ||
506 | } | ||
507 | |||
508 | pkg_prerm_${JDKPN}-jre () { | ||
509 | update-alternatives --remove java ${JDK_HOME}/jre/bin/java | ||
510 | } | ||
511 | |||
512 | pkg_postinst_${JDKPN}-jdk () { | ||
513 | update-alternatives --install ${bindir}/javac javac ${JDK_HOME}/bin/javac 15 | ||
514 | } | ||
515 | |||
516 | pkg_prerm_${JDKPN}-jdk () { | ||
517 | update-alternatives --remove javac ${JDK_HOME}/bin/javac | ||
518 | } | ||
diff --git a/recipes-core/openjdk/openjdk-6-release-6b18.inc b/recipes-core/openjdk/openjdk-6-release-6b18.inc new file mode 100644 index 0000000..9619d2d --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-release-6b18.inc | |||
@@ -0,0 +1,100 @@ | |||
1 | require openjdk-6-common.inc | ||
2 | |||
3 | FILESPATH =. "${FILE_DIRNAME}/openjdk-6:" | ||
4 | |||
5 | EXTRA_OECONF += "\ | ||
6 | --with-jaxws-drop-zip=${DL_DIR}/jdk6-jaxws-2009_10_27.zip \ | ||
7 | --with-jaf-drop-zip=${DL_DIR}/jdk6-jaf-2009_10_27.zip \ | ||
8 | --with-jaxp-drop-zip=${DL_DIR}/jdk6-jaxp-2009_10_13.zip \ | ||
9 | --with-cacao-src-zip=${DL_DIR}/cacao-0.99.4.tar.gz \ | ||
10 | " | ||
11 | |||
12 | # Force arm mode for now | ||
13 | ARM_INSTRUCTION_SET_armv4t = "ARM" | ||
14 | |||
15 | ICEDTEA_URI = "http://icedtea.classpath.org/download/source/${ICEDTEA}.tar.gz;name=iced" | ||
16 | |||
17 | OPENJDK_URI = "http://download.java.net/openjdk/jdk6/promoted/b18/openjdk-6-src-b18-16_feb_2010.tar.gz;subdir=openjdk-src-dir;name=openjdk" | ||
18 | SRC_URI[openjdk.md5sum] = "94db01691ab38f98b7d42b2ebf4d5c0b" | ||
19 | SRC_URI[openjdk.sha256sum] = "778ea7b323aaa24d3c6e8fe32b8bb0f49040d9e86271859077ada9f9ee3c8ebf" | ||
20 | |||
21 | JAXWS_URI = "http://icedtea.classpath.org/download/source/drops/jdk6-jaxws-2009_10_27.zip;name=jaxws" | ||
22 | SRC_URI[jaxws.md5sum] = "3ea5728706169498b722b898a1008acf" | ||
23 | SRC_URI[jaxws.sha256sum] = "155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2" | ||
24 | |||
25 | JAF_URI = "http://icedtea.classpath.org/download/source/drops/jdk6-jaf-2009_10_27.zip;name=jaf" | ||
26 | SRC_URI[jaf.md5sum] = "7a50bb540a27cdd0001885630088b758" | ||
27 | SRC_URI[jaf.sha256sum] = "fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f" | ||
28 | |||
29 | JAXP_URI = "https://icedtea.classpath.org/download/source/drops/jdk6-jaxp-2009_10_13.zip;name=jaxp" | ||
30 | SRC_URI[jaxp.md5sum] = "a2f7b972124cd776ff71e7754eb9a429" | ||
31 | SRC_URI[jaxp.sha256sum] = "8714d55de18db48ca9da0ee986202005082f44cf4c215da8683342b70e61792b" | ||
32 | |||
33 | CACAO_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.gz;name=cacao" | ||
34 | SRC_URI[cacao.md5sum] = "c5e6525c5212ddbb6026e4a7cde37ca6" | ||
35 | SRC_URI[cacao.sha256sum] = "c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf" | ||
36 | |||
37 | # Allow overriding this separately | ||
38 | OEPATCHES = "\ | ||
39 | file://build-hacks.patch \ | ||
40 | file://zero-cmpswap-long.patch \ | ||
41 | file://fix_hotspot_crosscompile.patch \ | ||
42 | file://mkbc_returncode.patch \ | ||
43 | file://icedtea-fix-jar-command.patch \ | ||
44 | file://fix-llvm-libs.patch \ | ||
45 | file://shark-build-openjdkdir.patch \ | ||
46 | file://shark-arm-linux-cpu-detection.patch \ | ||
47 | file://cacao-libtoolize.patch \ | ||
48 | " | ||
49 | |||
50 | # Allow overriding this separately | ||
51 | ICEDTEAPATCHES = "\ | ||
52 | file://icedtea-launcher-stdc++.patch;apply=no \ | ||
53 | file://icedtea-crosscompile-fix.patch;apply=no \ | ||
54 | file://icedtea-hostbuildcc.patch;apply=no \ | ||
55 | file://icedtea-unbreak-float.patch;apply=no \ | ||
56 | file://icedtea-remove_werror.patch;apply=no \ | ||
57 | file://cacao-vfp-compat.patch;apply=no \ | ||
58 | file://cacao-disable-stackbase-check.patch;apply=no \ | ||
59 | file://icedtea-libnet-renaming.patch;apply=no \ | ||
60 | file://icedtea-hasgettransfer.patch;apply=no \ | ||
61 | file://icedtea-llvm_headers.patch;apply=no \ | ||
62 | " | ||
63 | |||
64 | ICEDTEAPATCHES_append_libc-uclibc = " \ | ||
65 | file://icedtea-hotspot-isfinte.patch;apply=no \ | ||
66 | file://icedtea-hotspot-glibc-version.patch;apply=no \ | ||
67 | file://icedtea-hotspot-loadavg.patch;apply=no \ | ||
68 | file://icedtea-hotspot-isnanf.patch;apply=no \ | ||
69 | file://icedtea-jdk-iconv-uclibc.patch;apply=no \ | ||
70 | file://icedtea-jdk-remove-unused-backtrace.patch;apply=no \ | ||
71 | file://icedtea-jdk-RTLD_NOLOAD.patch;apply=no \ | ||
72 | file://icedtea-jdk-unpack-uclibc.patch;apply=no \ | ||
73 | " | ||
74 | |||
75 | # Allow overriding this separately | ||
76 | DISTRIBUTION_PATCHES = "\ | ||
77 | patches/icedtea-launcher-stdc++.patch \ | ||
78 | patches/icedtea-crosscompile-fix.patch \ | ||
79 | patches/icedtea-hostbuildcc.patch \ | ||
80 | patches/icedtea-unbreak-float.patch \ | ||
81 | patches/icedtea-remove_werror.patch \ | ||
82 | patches/cacao-vfp-compat.patch \ | ||
83 | patches/cacao-disable-stackbase-check.patch \ | ||
84 | patches/icedtea-libnet-renaming.patch \ | ||
85 | patches/icedtea-hasgettransfer.patch \ | ||
86 | patches/icedtea-llvm_headers.patch \ | ||
87 | " | ||
88 | |||
89 | DISTRIBUTION_PATCHES_append_libc-uclibc = "\ | ||
90 | patches/icedtea-hotspot-isfinte.patch \ | ||
91 | patches/icedtea-hotspot-isnanf.patch \ | ||
92 | patches/icedtea-hotspot-glibc-version.patch \ | ||
93 | patches/icedtea-hotspot-loadavg.patch \ | ||
94 | patches/icedtea-jdk-iconv-uclibc.patch \ | ||
95 | patches/icedtea-jdk-remove-unused-backtrace.patch \ | ||
96 | patches/icedtea-jdk-RTLD_NOLOAD.patch \ | ||
97 | patches/icedtea-jdk-unpack-uclibc.patch \ | ||
98 | " | ||
99 | |||
100 | export DISTRIBUTION_PATCHES | ||
diff --git a/recipes-core/openjdk/openjdk-6/build-hacks.patch b/recipes-core/openjdk/openjdk-6/build-hacks.patch new file mode 100644 index 0000000..02a8300 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/build-hacks.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Index: icedtea6-1.8/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/Makefile.am 2010-04-12 23:55:51.754838172 +0200 | ||
4 | +++ icedtea6-1.8/Makefile.am 2010-06-16 15:17:10.224708601 +0200 | ||
5 | @@ -477,6 +477,11 @@ | ||
6 | JAVAC="" \ | ||
7 | JAVA_HOME="" \ | ||
8 | JDK_HOME="" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | + OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ | ||
14 | DISTRIBUTION_ID="$(DIST_ID)" \ | ||
15 | DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ | ||
16 | DEBUG_CLASSFILES="true" \ | ||
17 | Index: icedtea6-1.8/javac.in | ||
18 | =================================================================== | ||
19 | --- icedtea6-1.8.orig/javac.in 2010-03-25 15:10:41.714835519 +0100 | ||
20 | +++ icedtea6-1.8/javac.in 2010-06-16 15:14:31.205334756 +0200 | ||
21 | @@ -35,7 +35,9 @@ | ||
22 | elif [ ! -z "@ECJ@" ] ; then | ||
23 | @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS | ||
24 | else | ||
25 | + # Compiling hotspot-tools consumes tons of memory and exceeds any default | ||
26 | + # limits for jamvm and cacao. | ||
27 | CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \ | ||
28 | - @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS | ||
29 | + @JAVA@ -Xmx1024m org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS | ||
30 | fi | ||
31 | |||
diff --git a/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch b/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch new file mode 100644 index 0000000..d676142 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: cacao/cacao/src/mm/boehm-gc/os_dep.c | ||
2 | =================================================================== | ||
3 | --- cacao/cacao/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:15.000000000 +0100 | ||
4 | +++ cacao/cacao/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:24.000000000 +0100 | ||
5 | @@ -1077,7 +1077,6 @@ | ||
6 | c = stat_buf[buf_offset++]; | ||
7 | } | ||
8 | close(f); | ||
9 | - if (result < 0x10000000) ABORT("Absurd stack bottom value"); | ||
10 | return (ptr_t)result; | ||
11 | } | ||
12 | |||
diff --git a/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch new file mode 100644 index 0000000..a153a32 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: icedtea6-1.8.5/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.5.orig/Makefile.am 2011-02-04 18:29:58.826701224 +0100 | ||
4 | +++ icedtea6-1.8.5/Makefile.am 2011-02-04 18:31:53.430016002 +0100 | ||
5 | @@ -1918,10 +1918,13 @@ | ||
6 | if BUILD_CACAO | ||
7 | if !USE_SYSTEM_CACAO | ||
8 | cd cacao/cacao && \ | ||
9 | + rm -f libtool && \ | ||
10 | + autoreconf --verbose --install --force --no-recursive && \ | ||
11 | $(ARCH_PREFIX) ./configure \ | ||
12 | --host=$(host_alias) \ | ||
13 | --build=$(build_alias) \ | ||
14 | --target=$(target_alias) \ | ||
15 | + --with-libtool-sysroot \ | ||
16 | --prefix=$(abs_top_builddir)/cacao/install \ | ||
17 | --with-java-runtime-library=openjdk \ | ||
18 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ | ||
diff --git a/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch b/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch new file mode 100644 index 0000000..09ba984 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Index: cacao/cacao/src/vm/jit/arm/codegen.c | ||
2 | =================================================================== | ||
3 | --- cacao/cacao/src/vm/jit/arm/codegen.c 2008-10-01 16:23:21.439856241 +0200 | ||
4 | +++ cacao/cacao/src/vm/jit/arm/codegen.c 2008-10-01 16:41:24.278841537 +0200 | ||
5 | @@ -2353,10 +2353,12 @@ | ||
6 | |||
7 | d = md->returntype.type; | ||
8 | |||
9 | -#if !defined(__SOFTFP__) | ||
10 | +#if !defined(__SOFTFP__) && !defined(__VFP_FP__) | ||
11 | /* TODO: this is only a hack, since we use R0/R1 for float | ||
12 | return! this depends on gcc; it is independent from | ||
13 | - our ENABLE_SOFTFLOAT define */ | ||
14 | + our ENABLE_SOFTFLOAT define | ||
15 | + It is only needed for -mfpu=fpa -mfloat-abi=hard! | ||
16 | + */ | ||
17 | if (iptr->opc == ICMD_BUILTIN && d != TYPE_VOID && IS_FLT_DBL_TYPE(d)) { | ||
18 | #if 0 && !defined(NDEBUG) | ||
19 | dolog("BUILTIN that returns float or double (%s.%s)", m->clazz->name->text, m->name->text); | ||
20 | @@ -3019,7 +3021,7 @@ | ||
21 | s1 = (s4) (cd->mcodeptr - cd->mcodebase); | ||
22 | M_RECOMPUTE_PV(s1); | ||
23 | |||
24 | -#if !defined(__SOFTFP__) | ||
25 | +#if !defined(__SOFTFP__) && !defined(__VFP_FP__) | ||
26 | /* TODO: this is only a hack, since we use R0/R1 for float return! */ | ||
27 | /* this depends on gcc; it is independent from our ENABLE_SOFTFLOAT define */ | ||
28 | if (md->returntype.type != TYPE_VOID && IS_FLT_DBL_TYPE(md->returntype.type)) { | ||
29 | @@ -3030,7 +3032,7 @@ | ||
30 | /* M_CAST_FLT_TO_INT_TYPED(md->returntype.type, REG_FRESULT, REG_RESULT_TYPED(md->returntype.type)); */ | ||
31 | if (IS_2_WORD_TYPE(md->returntype.type)) { | ||
32 | DCD(0xed2d8102); /* stfd f0, [sp, #-8]! */ | ||
33 | - M_LDRD_UPDATE(REG_RESULT_PACKED, REG_SP, 8); | ||
34 | + M_LDRD_UPDATE(REG_RESULT_PACKED, REG_SP, 8); | ||
35 | } else { | ||
36 | DCD(0xed2d0101); /* stfs f0, [sp, #-4]!*/ | ||
37 | M_LDR_UPDATE(REG_RESULT, REG_SP, 4); | ||
diff --git a/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch b/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch new file mode 100644 index 0000000..7c82daf --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: icedtea6-1.8/configure.ac | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/configure.ac | ||
4 | +++ icedtea6-1.8/configure.ac | ||
5 | @@ -472,7 +472,7 @@ | ||
6 | if test "x$LLVM_SHARED_LIB" != x && echo "$flag" | grep -q '^-lLLVM'; then | ||
7 | continue | ||
8 | fi | ||
9 | - if echo "$flag" | grep -q '^-l'; then | ||
10 | + if echo "$flag" | grep -q '^-l\|.so'; then | ||
11 | if test "x$LLVM_LIBS" != "x"; then | ||
12 | LLVM_LIBS="$LLVM_LIBS " | ||
13 | fi | ||
diff --git a/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch new file mode 100644 index 0000000..38fb191 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | Index: icedtea6-1.8/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/Makefile.am 2010-06-18 12:31:34.534667003 +0200 | ||
4 | +++ icedtea6-1.8/Makefile.am 2010-06-18 12:31:34.714667729 +0200 | ||
5 | @@ -488,6 +488,7 @@ | ||
6 | DEBUG_BINARIES="true" \ | ||
7 | ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ | ||
8 | VERBOSE="$(VERBOSE)" \ | ||
9 | + CC_FOR_BUILD="$(CC_FOR_BUILD)" \ | ||
10 | ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ | ||
11 | ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" | ||
12 | |||
13 | Index: icedtea6-1.8/acinclude.m4 | ||
14 | =================================================================== | ||
15 | --- icedtea6-1.8.orig/acinclude.m4 2010-04-10 21:58:40.804836529 +0200 | ||
16 | +++ icedtea6-1.8/acinclude.m4 2010-06-18 12:31:34.714667729 +0200 | ||
17 | @@ -900,6 +900,21 @@ | ||
18 | AC_SUBST(ALT_CACAO_SRC_DIR) | ||
19 | ]) | ||
20 | |||
21 | +AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD], | ||
22 | +[ | ||
23 | + AC_MSG_CHECKING(for compiler used for subsidiary programs) | ||
24 | + AC_ARG_WITH([cc-for-build], | ||
25 | + [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)], | ||
26 | + [ | ||
27 | + CC_FOR_BUILD="${withval}" | ||
28 | + ], | ||
29 | + [ | ||
30 | + CC_FOR_BUILD="\$(CC)" | ||
31 | + ]) | ||
32 | + AC_MSG_RESULT(${CC_FOR_BUILD}) | ||
33 | + AC_SUBST(CC_FOR_BUILD) | ||
34 | +]) | ||
35 | + | ||
36 | AC_DEFUN([AC_CHECK_WITH_GCJ], | ||
37 | [ | ||
38 | AC_MSG_CHECKING([whether to compile ecj natively]) | ||
39 | Index: icedtea6-1.8/configure.ac | ||
40 | =================================================================== | ||
41 | --- icedtea6-1.8.orig/configure.ac 2010-04-12 13:46:18.821086023 +0200 | ||
42 | +++ icedtea6-1.8/configure.ac 2010-06-18 12:31:34.724666321 +0200 | ||
43 | @@ -44,6 +44,7 @@ | ||
44 | IT_CHECK_FOR_MERCURIAL | ||
45 | IT_OBTAIN_HG_REVISIONS | ||
46 | AC_PATH_TOOL([LSB_RELEASE],[lsb_release]) | ||
47 | +AC_CHECK_WITH_CC_FOR_BUILD | ||
48 | AC_CHECK_WITH_GCJ | ||
49 | AC_CHECK_WITH_HOTSPOT_BUILD | ||
50 | AC_PATH_TOOL([LINUX32],[linux32]) | ||
51 | Index: icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make | ||
52 | =================================================================== | ||
53 | --- icedtea6-1.8.orig/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-03-25 15:10:42.061085966 +0100 | ||
54 | +++ icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-06-18 12:40:42.834666505 +0200 | ||
55 | @@ -32,6 +32,13 @@ | ||
56 | Obj_Files += thumb2.o | ||
57 | |||
58 | CFLAGS += -DHOTSPOT_ASM | ||
59 | +CCFLAGS += -DHOTSPOT_ASM | ||
60 | + | ||
61 | +ifeq ($(CROSS_COMPILATION), true) | ||
62 | + C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD) | ||
63 | +else | ||
64 | + C_COMPILE_FOR_MKBC = $(C_COMPILE) | ||
65 | +endif | ||
66 | |||
67 | %.o: %.S | ||
68 | @echo Assembling $< | ||
69 | @@ -43,20 +50,20 @@ | ||
70 | |||
71 | offsets_arm.s: mkoffsets | ||
72 | @echo Generating assembler offsets | ||
73 | - ./mkoffsets > $@ | ||
74 | + $(QEMU) ./mkoffsets > $@ | ||
75 | |||
76 | bytecodes_arm.s: bytecodes_arm.def mkbc | ||
77 | @echo Generatine ARM assembler bytecode sequences | ||
78 | $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) | ||
79 | |||
80 | -mkbc: $(GAMMADIR)/tools/mkbc.c | ||
81 | +mkbc: $(GAMMADIR)/tools/mkbc.c | ||
82 | @echo Compiling mkbc tool | ||
83 | - $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) | ||
84 | + $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE) | ||
85 | |||
86 | -mkoffsets: asm_helper.cpp | ||
87 | +mkoffsets: asm_helper.cpp | ||
88 | @echo Compiling offset generator | ||
89 | $(QUIETLY) $(REMOVE_TARGET) | ||
90 | - $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
91 | + $(CC_COMPILE) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
92 | |||
93 | endif | ||
94 | |||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch new file mode 100644 index 0000000..6ec83bb --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch | |||
@@ -0,0 +1,229 @@ | |||
1 | Index: openjdk/jdk/make/sun/awt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/sun/awt/Makefile 2009-01-24 17:54:57.000000000 +0100 | ||
4 | +++ openjdk/jdk/make/sun/awt/Makefile 2009-01-24 17:55:07.000000000 +0100 | ||
5 | @@ -509,10 +509,10 @@ | ||
6 | # | ||
7 | |||
8 | ifeq ($(PLATFORM), linux) | ||
9 | -CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
10 | - -I$(OPENWIN_HOME)/include \ | ||
11 | - -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
12 | - -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
13 | +#CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
14 | +# -I$(OPENWIN_HOME)/include \ | ||
15 | +# -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
16 | +CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
17 | endif | ||
18 | CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
19 | -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ | ||
20 | @@ -536,7 +536,7 @@ | ||
21 | $(EVENT_MODEL) | ||
22 | |||
23 | ifeq ($(PLATFORM), linux) | ||
24 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
25 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
26 | endif | ||
27 | |||
28 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
29 | Index: openjdk/jdk/make/sun/awt/mawt.gmk | ||
30 | =================================================================== | ||
31 | --- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:54:57.000000000 +0100 | ||
32 | +++ openjdk/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:55:07.000000000 +0100 | ||
33 | @@ -194,8 +194,8 @@ | ||
34 | CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
35 | |||
36 | ifndef HEADLESS | ||
37 | -CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
38 | -LDFLAGS += -L$(OPENWIN_LIB) | ||
39 | +#CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
40 | +#LDFLAGS += -L$(OPENWIN_LIB) | ||
41 | |||
42 | endif # !HEADLESS | ||
43 | |||
44 | @@ -223,8 +223,8 @@ | ||
45 | |||
46 | ifeq ($(PLATFORM), linux) | ||
47 | # Checking for the X11/extensions headers at the additional location | ||
48 | - CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
49 | - -I/usr/include/X11/extensions | ||
50 | +# CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
51 | +# -I/usr/include/X11/extensions | ||
52 | endif | ||
53 | |||
54 | ifeq ($(PLATFORM), solaris) | ||
55 | Index: openjdk/jdk/make/sun/xawt/Makefile | ||
56 | =================================================================== | ||
57 | --- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-01-24 17:54:57.000000000 +0100 | ||
58 | +++ openjdk/jdk/make/sun/xawt/Makefile 2009-01-24 17:55:07.000000000 +0100 | ||
59 | @@ -123,11 +123,12 @@ | ||
60 | -I$(PLATFORM_SRC)/native/sun/awt | ||
61 | |||
62 | ifeq ($(PLATFORM), linux) | ||
63 | +# Very unsuitable for cross-compilation. | ||
64 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
65 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
66 | - -I/usr/include/X11/extensions \ | ||
67 | - -I$(MOTIF_DIR)/include \ | ||
68 | - -I$(OPENWIN_HOME)/include | ||
69 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
70 | +# -I/usr/include/X11/extensions \ | ||
71 | +# -I$(MOTIF_DIR)/include \ | ||
72 | +# -I$(OPENWIN_HOME)/include | ||
73 | endif | ||
74 | |||
75 | ifeq ($(PLATFORM), solaris) | ||
76 | Index: openjdk/hotspot/make/linux/makefiles/vm.make | ||
77 | =================================================================== | ||
78 | --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:54:57.000000000 +0100 | ||
79 | +++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:55:07.000000000 +0100 | ||
80 | @@ -170,6 +170,7 @@ | ||
81 | LIBS_VM += $(LLVM_LIBS) | ||
82 | endif | ||
83 | |||
84 | +LFLAGS_VM += $(OE_LDFLAGS) | ||
85 | LINK_VM = $(LINK_LIB.c) | ||
86 | |||
87 | # rule for building precompiled header | ||
88 | Index: openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
89 | =================================================================== | ||
90 | --- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:54:57.000000000 +0100 | ||
91 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:55:07.000000000 +0100 | ||
92 | @@ -343,7 +343,7 @@ | ||
93 | echo "rm -f Queens.class"; \ | ||
94 | echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ | ||
95 | echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ | ||
96 | - echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ | ||
97 | + echo 'echo Silently skipping the execution of the gamma program'; \ | ||
98 | ) > $@ | ||
99 | $(QUIETLY) chmod +x $@ | ||
100 | |||
101 | Index: openjdk/corba/make/common/Defs-linux.gmk | ||
102 | =================================================================== | ||
103 | --- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100 | ||
104 | +++ openjdk/corba/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100 | ||
105 | @@ -82,9 +82,9 @@ | ||
106 | CC_NO_OPT = | ||
107 | |||
108 | ifeq ($(PRODUCT), java) | ||
109 | - _OPT = $(CC_HIGHER_OPT) | ||
110 | + _OPT = $(OE_CFLAGS) | ||
111 | else | ||
112 | - _OPT = $(CC_LOWER_OPT) | ||
113 | + _OPT = $(OE_CFLAGS) | ||
114 | CPPFLAGS_DBG += -DLOGGING | ||
115 | endif | ||
116 | |||
117 | @@ -94,7 +94,7 @@ | ||
118 | # as the default. | ||
119 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
120 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
121 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
122 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
123 | CFLAGS_REQUIRED_hppa += | ||
124 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
125 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
126 | @@ -221,7 +221,7 @@ | ||
127 | # | ||
128 | # -L paths for finding and -ljava | ||
129 | # | ||
130 | -LDFLAGS_OPT = -Xlinker -O1 | ||
131 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
132 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
133 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
134 | |||
135 | Index: openjdk/jdk/make/common/Defs-linux.gmk | ||
136 | =================================================================== | ||
137 | --- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100 | ||
138 | +++ openjdk/jdk/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100 | ||
139 | @@ -92,9 +92,9 @@ | ||
140 | CC_NO_OPT = | ||
141 | |||
142 | ifeq ($(PRODUCT), java) | ||
143 | - _OPT = $(CC_HIGHER_OPT) | ||
144 | + _OPT = $(OE_CFLAGS) | ||
145 | else | ||
146 | - _OPT = $(CC_LOWER_OPT) | ||
147 | + _OPT = $(OE_CFLAGS) | ||
148 | CPPFLAGS_DBG += -DLOGGING | ||
149 | endif | ||
150 | |||
151 | @@ -104,7 +104,7 @@ | ||
152 | # as the default. | ||
153 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
154 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
155 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
156 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
157 | CFLAGS_REQUIRED_hppa += | ||
158 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
159 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
160 | @@ -231,7 +231,7 @@ | ||
161 | # | ||
162 | # -L paths for finding and -ljava | ||
163 | # | ||
164 | -LDFLAGS_OPT = -Xlinker -O1 | ||
165 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
166 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
167 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
168 | |||
169 | Index: openjdk/hotspot/make/linux/makefiles/gcc.make | ||
170 | =================================================================== | ||
171 | --- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:54:57.000000000 +0100 | ||
172 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:55:07.000000000 +0100 | ||
173 | @@ -119,7 +119,7 @@ | ||
174 | CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) | ||
175 | |||
176 | # The flags to use for an Optimized g++ build | ||
177 | -OPT_CFLAGS += -O3 | ||
178 | +OPT_CFLAGS += $(OE_CFLAGS) | ||
179 | |||
180 | # Hotspot uses very unstrict aliasing turn this optimization off | ||
181 | OPT_CFLAGS += -fno-strict-aliasing | ||
182 | @@ -148,7 +148,7 @@ | ||
183 | endif | ||
184 | |||
185 | # Enable linker optimization | ||
186 | -LFLAGS += -Xlinker -O1 | ||
187 | +LFLAGS += $(OE_LDFLAGS) | ||
188 | |||
189 | # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. | ||
190 | MAPFLAG = -Xlinker --version-script=FILENAME | ||
191 | Index: openjdk/hotspot/make/linux/makefiles/launcher.make | ||
192 | =================================================================== | ||
193 | --- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:55:19.000000000 +0100 | ||
194 | +++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:56:05.000000000 +0100 | ||
195 | @@ -44,7 +44,7 @@ | ||
196 | LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) | ||
197 | else | ||
198 | LAUNCHER.o = launcher.o | ||
199 | - LFLAGS_LAUNCHER += -L `pwd` | ||
200 | + LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS) | ||
201 | LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ | ||
202 | endif | ||
203 | |||
204 | Index: icedtea6-1.8.5/build/openjdk/jdk/make/sun/xawt/Makefile | ||
205 | =================================================================== | ||
206 | --- openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:17:03.926207269 +0100 | ||
207 | +++ openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:30:11.956186631 +0100 | ||
208 | @@ -245,7 +245,7 @@ | ||
209 | $(CHMOD) +w $@;\ | ||
210 | else \ | ||
211 | $(ECHO) GENERATING $@; \ | ||
212 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
213 | + $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
214 | fi | ||
215 | @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
216 | $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
217 | Index: openjdk/hotspot/make/linux/makefiles/jsig.make | ||
218 | =================================================================== | ||
219 | --- openjdk/hotspot/make/linux/makefiles/jsig.make 2010-02-17 04:11:04.000000000 +0100 | ||
220 | +++ openjdk/hotspot/make/linux/makefiles/jsig.make 2011-11-18 22:56:03.923900991 +0100 | ||
221 | @@ -39,7 +39,7 @@ | ||
222 | # cause problems with interposing. See CR: 6466665 | ||
223 | # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) | ||
224 | |||
225 | -LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT | ||
226 | +LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(OE_LDFLAGS) | ||
227 | |||
228 | # DEBUG_BINARIES overrides everything, use full -g debug information | ||
229 | ifeq ($(DEBUG_BINARIES), true) | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch b/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch new file mode 100644 index 0000000..59d806d --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: icedtea6-1.8/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/Makefile.am 2010-06-17 10:29:13.654666801 +0200 | ||
4 | +++ icedtea6-1.8/Makefile.am 2010-06-17 10:30:50.334670771 +0200 | ||
5 | @@ -1750,7 +1745,7 @@ | ||
6 | stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR) | ||
7 | if WITH_RHINO | ||
8 | mkdir -p rhino/rhino.{old,new} | ||
9 | - (cd rhino/rhino.old ; jar xf $(RHINO_JAR)) | ||
10 | + (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) | ||
11 | $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \ | ||
12 | com.redhat.rewriter.ClassRewriter \ | ||
13 | $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \ | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch b/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch new file mode 100644 index 0000000..01dcb82 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch | |||
@@ -0,0 +1,131 @@ | |||
1 | Index: openjdk/jdk/src/share/classes/javax/swing/HasGetTransferHandler.java | ||
2 | =================================================================== | ||
3 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
4 | +++ openjdk/jdk/src/share/classes/javax/swing/HasGetTransferHandler.java 2011-11-18 20:44:00.281649848 +0100 | ||
5 | @@ -0,0 +1,38 @@ | ||
6 | +/* | ||
7 | + * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. | ||
8 | + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
9 | + * | ||
10 | + * This code is free software; you can redistribute it and/or modify it | ||
11 | + * under the terms of the GNU General Public License version 2 only, as | ||
12 | + * published by the Free Software Foundation. Sun designates this | ||
13 | + * particular file as subject to the "Classpath" exception as provided | ||
14 | + * by Sun in the LICENSE file that accompanied this code. | ||
15 | + * | ||
16 | + * This code is distributed in the hope that it will be useful, but WITHOUT | ||
17 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
18 | + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
19 | + * version 2 for more details (a copy is included in the LICENSE file that | ||
20 | + * accompanied this code). | ||
21 | + * | ||
22 | + * You should have received a copy of the GNU General Public License version | ||
23 | + * 2 along with this work; if not, write to the Free Software Foundation, | ||
24 | + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
25 | + * | ||
26 | + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
27 | + * CA 95054 USA or visit www.sun.com if you need additional information or | ||
28 | + * have any questions. | ||
29 | + */ | ||
30 | +package javax.swing; | ||
31 | + | ||
32 | +/** | ||
33 | + * An interface to tag things with a {@code getTransferHandler} method. | ||
34 | + */ | ||
35 | +interface HasGetTransferHandler { | ||
36 | + | ||
37 | + /** Returns the {@code TransferHandler}. | ||
38 | + * | ||
39 | + * @return The {@code TransferHandler} or {@code null} | ||
40 | + */ | ||
41 | + public TransferHandler getTransferHandler(); | ||
42 | +} | ||
43 | + | ||
44 | Index: openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java | ||
45 | =================================================================== | ||
46 | --- openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java 2011-11-18 18:51:22.000000000 +0100 | ||
47 | +++ openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java 2011-11-18 20:44:01.628219313 +0100 | ||
48 | @@ -122,18 +122,6 @@ | ||
49 | public static final int LINK = DnDConstants.ACTION_LINK; | ||
50 | |||
51 | /** | ||
52 | - * An interface to tag things with a {@code getTransferHandler} method. | ||
53 | - */ | ||
54 | - interface HasGetTransferHandler { | ||
55 | - | ||
56 | - /** Returns the {@code TransferHandler}. | ||
57 | - * | ||
58 | - * @return The {@code TransferHandler} or {@code null} | ||
59 | - */ | ||
60 | - public TransferHandler getTransferHandler(); | ||
61 | - } | ||
62 | - | ||
63 | - /** | ||
64 | * Represents a location where dropped data should be inserted. | ||
65 | * This is a base class that only encapsulates a point. | ||
66 | * Components supporting drop may provide subclasses of this | ||
67 | diff --git a/jdk/src/share/classes/javax/swing/JApplet.java b/jdk/src/share/classes/javax/swing/JApplet.java | ||
68 | index 47f792a..72c2cf9 100644 | ||
69 | --- openjdk/jdk/src/share/classes/javax/swing/JApplet.java | ||
70 | +++ openjdk/jdk/src/share/classes/javax/swing/JApplet.java | ||
71 | @@ -91,7 +91,7 @@ import javax.accessibility.*; | ||
72 | */ | ||
73 | public class JApplet extends Applet implements Accessible, | ||
74 | RootPaneContainer, | ||
75 | - TransferHandler.HasGetTransferHandler | ||
76 | + HasGetTransferHandler | ||
77 | { | ||
78 | /** | ||
79 | * @see #getRootPane | ||
80 | diff --git a/jdk/src/share/classes/javax/swing/JComponent.java b/jdk/src/share/classes/javax/swing/JComponent.java | ||
81 | index 4293a4f..0c0a1dc 100644 | ||
82 | --- openjdk/jdk/src/share/classes/javax/swing/JComponent.java | ||
83 | +++ openjdk/jdk/src/share/classes/javax/swing/JComponent.java | ||
84 | @@ -171,7 +171,7 @@ import sun.swing.UIClientPropertyKey; | ||
85 | * @author Arnaud Weber | ||
86 | */ | ||
87 | public abstract class JComponent extends Container implements Serializable, | ||
88 | - TransferHandler.HasGetTransferHandler | ||
89 | + HasGetTransferHandler | ||
90 | { | ||
91 | /** | ||
92 | * @see #getUIClassID | ||
93 | diff --git a/jdk/src/share/classes/javax/swing/JDialog.java b/jdk/src/share/classes/javax/swing/JDialog.java | ||
94 | index a0193d1..aeeb243 100644 | ||
95 | --- openjdk/jdk/src/share/classes/javax/swing/JDialog.java | ||
96 | +++ openjdk/jdk/src/share/classes/javax/swing/JDialog.java | ||
97 | @@ -97,7 +97,7 @@ import javax.accessibility.*; | ||
98 | public class JDialog extends Dialog implements WindowConstants, | ||
99 | Accessible, | ||
100 | RootPaneContainer, | ||
101 | - TransferHandler.HasGetTransferHandler | ||
102 | + HasGetTransferHandler | ||
103 | { | ||
104 | /** | ||
105 | * Key into the AppContext, used to check if should provide decorations | ||
106 | diff --git a/jdk/src/share/classes/javax/swing/JFrame.java b/jdk/src/share/classes/javax/swing/JFrame.java | ||
107 | index 9910b43..4cb8f58 100644 | ||
108 | --- openjdk/jdk/src/share/classes/javax/swing/JFrame.java | ||
109 | +++ openjdk/jdk/src/share/classes/javax/swing/JFrame.java | ||
110 | @@ -109,7 +109,7 @@ import javax.accessibility.*; | ||
111 | public class JFrame extends Frame implements WindowConstants, | ||
112 | Accessible, | ||
113 | RootPaneContainer, | ||
114 | - TransferHandler.HasGetTransferHandler | ||
115 | + HasGetTransferHandler | ||
116 | { | ||
117 | /** | ||
118 | * The exit application default window close operation. If a window | ||
119 | diff --git a/jdk/src/share/classes/javax/swing/JWindow.java b/jdk/src/share/classes/javax/swing/JWindow.java | ||
120 | index c94803c..85bbb57 100644 | ||
121 | --- openjdk/jdk/src/share/classes/javax/swing/JWindow.java | ||
122 | +++ openjdk/jdk/src/share/classes/javax/swing/JWindow.java | ||
123 | @@ -91,7 +91,7 @@ import javax.accessibility.*; | ||
124 | */ | ||
125 | public class JWindow extends Window implements Accessible, | ||
126 | RootPaneContainer, | ||
127 | - TransferHandler.HasGetTransferHandler | ||
128 | + HasGetTransferHandler | ||
129 | { | ||
130 | /** | ||
131 | * The <code>JRootPane</code> instance that manages the | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch new file mode 100644 index 0000000..5f2c98b --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/rules.make | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:22:33.201668748 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:23:08.480415783 +0100 | ||
5 | @@ -39,6 +39,7 @@ | ||
6 | # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++). | ||
7 | C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) | ||
8 | CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) | ||
9 | +CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS) | ||
10 | |||
11 | AS.S = $(AS) $(ASFLAGS) | ||
12 | |||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch new file mode 100644 index 0000000..faa90ea --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200 | ||
4 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200 | ||
5 | @@ -49,7 +49,6 @@ | ||
6 | # include <string.h> | ||
7 | # include <syscall.h> | ||
8 | # include <sys/sysinfo.h> | ||
9 | -# include <gnu/libc-version.h> | ||
10 | # include <sys/ipc.h> | ||
11 | # include <sys/shm.h> | ||
12 | # include <link.h> | ||
13 | @@ -544,9 +543,7 @@ | ||
14 | os::Linux::set_glibc_version(str); | ||
15 | } else { | ||
16 | // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version() | ||
17 | - static char _gnu_libc_version[32]; | ||
18 | - jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version), | ||
19 | - "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release()); | ||
20 | + static char _gnu_libc_version[32] = "2.9"; | ||
21 | os::Linux::set_glibc_version(_gnu_libc_version); | ||
22 | } | ||
23 | |||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch new file mode 100644 index 0000000..7c5da59 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:28.576131825 +0200 | ||
4 | +++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:55.555711815 +0200 | ||
5 | @@ -235,8 +235,8 @@ | ||
6 | |||
7 | // Checking for finiteness | ||
8 | |||
9 | -inline int g_isfinite(jfloat f) { return finite(f); } | ||
10 | -inline int g_isfinite(jdouble f) { return finite(f); } | ||
11 | +inline int g_isfinite(jfloat f) { return isfinite(f); } | ||
12 | +inline int g_isfinite(jdouble f) { return isfinite(f); } | ||
13 | |||
14 | |||
15 | // Wide characters | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch new file mode 100644 index 0000000..494e965 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:47:12.695674808 +0200 | ||
4 | +++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:48:08.699007491 +0200 | ||
5 | @@ -220,14 +220,14 @@ | ||
6 | // checking for nanness | ||
7 | #ifdef SOLARIS | ||
8 | #ifdef SPARC | ||
9 | -inline int g_isnan(float f) { return isnanf(f); } | ||
10 | +inline int g_isnan(float f) { return __isnanf(f); } | ||
11 | #else | ||
12 | // isnanf() broken on Intel Solaris use isnand() | ||
13 | inline int g_isnan(float f) { return isnand(f); } | ||
14 | #endif | ||
15 | inline int g_isnan(double f) { return isnand(f); } | ||
16 | #elif LINUX | ||
17 | -inline int g_isnan(float f) { return isnanf(f); } | ||
18 | +inline int g_isnan(float f) { return __isnanf(f); } | ||
19 | inline int g_isnan(double f) { return isnan(f); } | ||
20 | #else | ||
21 | #error "missing platform-specific definition here" | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch new file mode 100644 index 0000000..7da41fd --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200 | ||
4 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200 | ||
5 | @@ -4325,7 +4325,22 @@ | ||
6 | // Linux doesn't yet have a (official) notion of processor sets, | ||
7 | // so just return the system wide load average. | ||
8 | int os::loadavg(double loadavg[], int nelem) { | ||
9 | - return ::getloadavg(loadavg, nelem); | ||
10 | + | ||
11 | + FILE *LOADAVG; | ||
12 | + double avg[3] = { 0.0, 0.0, 0.0 }; | ||
13 | + int i, res = -1;; | ||
14 | + | ||
15 | + if ((LOADAVG = fopen("/proc/loadavg", "r"))) { | ||
16 | + fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); | ||
17 | + res = 0; | ||
18 | + fclose(LOADAVG); | ||
19 | + } | ||
20 | + | ||
21 | + for (i = 0; (i < nelem) && (i < 3); i++) { | ||
22 | + loadavg[i] = avg[i]; | ||
23 | + } | ||
24 | + | ||
25 | + return res; | ||
26 | } | ||
27 | |||
28 | void os::pause() { | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch new file mode 100644 index 0000000..9c70ba1 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-13 15:18:05.655136951 +0200 | ||
4 | +++ openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-13 15:20:29.601377967 +0200 | ||
5 | @@ -51,7 +51,7 @@ | ||
6 | { | ||
7 | const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL); | ||
8 | // look up existing handle only, do not load | ||
9 | - void *hModule = dlopen(libName, RTLD_NOLOAD); | ||
10 | + void *hModule = dlopen(libName, RTLD_LAZY); | ||
11 | dprintf2("-handle for %s: %u\n", libName, hModule); | ||
12 | (*env)->ReleaseStringUTFChars(env, jLibName, libName); | ||
13 | return (jlong)hModule; | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch new file mode 100644 index 0000000..68f8581 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | Index: openjdk/jdk/make/java/npt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200 | ||
4 | +++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200 | ||
5 | @@ -65,6 +65,8 @@ | ||
6 | # We don't want to link against -ljava | ||
7 | JAVALIB= | ||
8 | |||
9 | +LDLIBS += -liconv | ||
10 | + | ||
11 | # Add -export options to explicitly spell exported symbols | ||
12 | ifeq ($(PLATFORM), windows) | ||
13 | OTHER_LCF += -export:nptInitialize -export:nptTerminate | ||
14 | Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile | ||
15 | =================================================================== | ||
16 | --- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200 | ||
17 | +++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200 | ||
18 | @@ -123,6 +123,8 @@ | ||
19 | # We don't want to link against -ljava | ||
20 | JAVALIB= | ||
21 | |||
22 | +LDLIBS += -liconv | ||
23 | + | ||
24 | # | ||
25 | # Add to ambient vpath so we pick up the library files | ||
26 | # | ||
27 | Index: openjdk/jdk/make/sun/splashscreen/Makefile | ||
28 | =================================================================== | ||
29 | --- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200 | ||
30 | +++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200 | ||
31 | @@ -55,6 +55,8 @@ | ||
32 | |||
33 | JAVALIB= | ||
34 | |||
35 | +LDLIBS += -liconv | ||
36 | + | ||
37 | # | ||
38 | # C Flags | ||
39 | # | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch new file mode 100644 index 0000000..5423fde --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:45:56.607257503 +0200 | ||
4 | +++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:47:19.727254686 +0200 | ||
5 | @@ -27,9 +27,6 @@ | ||
6 | #include <X11/Xutil.h> | ||
7 | #include <X11/Xos.h> | ||
8 | #include <X11/Xatom.h> | ||
9 | -#ifdef __linux__ | ||
10 | -#include <execinfo.h> | ||
11 | -#endif | ||
12 | |||
13 | #include <jvm.h> | ||
14 | #include <jni.h> | ||
15 | @@ -689,26 +686,6 @@ | ||
16 | return ret; | ||
17 | } | ||
18 | |||
19 | -#ifdef __linux__ | ||
20 | -void print_stack(void) | ||
21 | -{ | ||
22 | - void *array[10]; | ||
23 | - size_t size; | ||
24 | - char **strings; | ||
25 | - size_t i; | ||
26 | - | ||
27 | - size = backtrace (array, 10); | ||
28 | - strings = backtrace_symbols (array, size); | ||
29 | - | ||
30 | - fprintf (stderr, "Obtained %zd stack frames.\n", size); | ||
31 | - | ||
32 | - for (i = 0; i < size; i++) | ||
33 | - fprintf (stderr, "%s\n", strings[i]); | ||
34 | - | ||
35 | - free (strings); | ||
36 | -} | ||
37 | -#endif | ||
38 | - | ||
39 | Window get_xawt_root_shell(JNIEnv *env) { | ||
40 | static jclass classXRootWindow = NULL; | ||
41 | static jmethodID methodGetXRootWindow = NULL; | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch new file mode 100644 index 0000000..40564f0 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: openjdk/jdk/make/com/sun/java/pack/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:21.548426411 +0200 | ||
4 | +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:43.858007543 +0200 | ||
5 | @@ -103,6 +103,7 @@ | ||
6 | OTHER_LDLIBS += $(LIBCXX) -lc | ||
7 | # setup the list of libraries to link in... | ||
8 | ifeq ($(PLATFORM), linux) | ||
9 | + OTHER_LDLIBS += -lpthread | ||
10 | ifeq ("$(CC_VER_MAJOR)", "3") | ||
11 | OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic | ||
12 | endif | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch new file mode 100644 index 0000000..ee24afa --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/launcher.make | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-16 17:30:56.000000000 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-16 17:31:13.000000000 +0100 | ||
5 | @@ -45,7 +45,7 @@ | ||
6 | else | ||
7 | LAUNCHER.o = launcher.o | ||
8 | LFLAGS_LAUNCHER += -L `pwd` | ||
9 | - LIBS_LAUNCHER += -l$(JVM) $(LIBS) | ||
10 | + LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ | ||
11 | endif | ||
12 | |||
13 | LINK_LAUNCHER = $(LINK.c) | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch new file mode 100644 index 0000000..024969d --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch | |||
@@ -0,0 +1,148 @@ | |||
1 | Index: openjdk/jdk/make/java/net/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/make/java/net/Makefile 2010-07-05 12:28:58.476625401 +0200 | ||
4 | +++ openjdk/jdk/make/java/net/Makefile 2010-07-05 12:29:11.876625138 +0200 | ||
5 | @@ -25,7 +25,7 @@ | ||
6 | |||
7 | BUILDDIR = ../.. | ||
8 | PACKAGE = java.net | ||
9 | -LIBRARY = net | ||
10 | +LIBRARY = javanet | ||
11 | PRODUCT = sun | ||
12 | include $(BUILDDIR)/common/Defs.gmk | ||
13 | |||
14 | Index: openjdk/jdk/make/java/nio/Makefile | ||
15 | =================================================================== | ||
16 | --- openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:31:27.046626250 +0200 | ||
17 | +++ openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:32:06.647874890 +0200 | ||
18 | @@ -139,11 +139,11 @@ | ||
19 | endif | ||
20 | ifeq ($(PLATFORM), linux) | ||
21 | COMPILER_WARNINGS_FATAL=true | ||
22 | -OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl | ||
23 | +OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl | ||
24 | endif | ||
25 | ifeq ($(PLATFORM), solaris) | ||
26 | OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \ | ||
27 | - -L$(LIBDIR)/$(LIBARCH) -ljava -lnet | ||
28 | + -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet | ||
29 | endif # PLATFORM | ||
30 | |||
31 | # | ||
32 | Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java | ||
33 | =================================================================== | ||
34 | --- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:40:56.467876415 +0200 | ||
35 | +++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:41:43.326628410 +0200 | ||
36 | @@ -58,7 +58,7 @@ | ||
37 | */ | ||
38 | static { | ||
39 | java.security.AccessController.doPrivileged( | ||
40 | - new sun.security.action.LoadLibraryAction("net")); | ||
41 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
42 | } | ||
43 | |||
44 | /** | ||
45 | Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java | ||
46 | =================================================================== | ||
47 | --- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:01.027875484 +0200 | ||
48 | +++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:56.826626386 +0200 | ||
49 | @@ -74,7 +74,7 @@ | ||
50 | */ | ||
51 | static { | ||
52 | java.security.AccessController.doPrivileged( | ||
53 | - new sun.security.action.LoadLibraryAction("net")); | ||
54 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
55 | } | ||
56 | |||
57 | /** | ||
58 | Index: openjdk/jdk/src/share/classes/java/net/DatagramPacket.java | ||
59 | =================================================================== | ||
60 | --- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:41:02.017875980 +0200 | ||
61 | +++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:42:06.057875677 +0200 | ||
62 | @@ -47,7 +47,7 @@ | ||
63 | */ | ||
64 | static { | ||
65 | java.security.AccessController.doPrivileged( | ||
66 | - new sun.security.action.LoadLibraryAction("net")); | ||
67 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
68 | init(); | ||
69 | } | ||
70 | |||
71 | Index: openjdk/jdk/src/share/classes/java/net/InetAddress.java | ||
72 | =================================================================== | ||
73 | --- openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:41:02.756626429 +0200 | ||
74 | +++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:42:15.997875786 +0200 | ||
75 | @@ -230,7 +230,7 @@ | ||
76 | static { | ||
77 | preferIPv6Address = java.security.AccessController.doPrivileged( | ||
78 | new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue(); | ||
79 | - AccessController.doPrivileged(new LoadLibraryAction("net")); | ||
80 | + AccessController.doPrivileged(new LoadLibraryAction("javanet")); | ||
81 | init(); | ||
82 | } | ||
83 | |||
84 | Index: openjdk/jdk/src/share/classes/java/net/NetworkInterface.java | ||
85 | =================================================================== | ||
86 | --- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:41:03.547875282 +0200 | ||
87 | +++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:42:22.647875475 +0200 | ||
88 | @@ -52,7 +52,7 @@ | ||
89 | private boolean virtual = false; | ||
90 | |||
91 | static { | ||
92 | - AccessController.doPrivileged(new LoadLibraryAction("net")); | ||
93 | + AccessController.doPrivileged(new LoadLibraryAction("javanet")); | ||
94 | init(); | ||
95 | } | ||
96 | |||
97 | Index: openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java | ||
98 | =================================================================== | ||
99 | --- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:41:04.306628153 +0200 | ||
100 | +++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:42:32.666627264 +0200 | ||
101 | @@ -89,7 +89,7 @@ | ||
102 | }}); | ||
103 | if (b != null && b.booleanValue()) { | ||
104 | java.security.AccessController.doPrivileged( | ||
105 | - new sun.security.action.LoadLibraryAction("net")); | ||
106 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
107 | hasSystemProxies = init(); | ||
108 | } | ||
109 | } | ||
110 | Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/share/classes/sun/nio/ch/Util.java | ||
111 | =================================================================== | ||
112 | --- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:41:05.086626745 +0200 | ||
113 | +++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:42:39.266626410 +0200 | ||
114 | @@ -354,7 +354,7 @@ | ||
115 | return; | ||
116 | loaded = true; | ||
117 | java.security.AccessController | ||
118 | - .doPrivileged(new sun.security.action.LoadLibraryAction("net")); | ||
119 | + .doPrivileged(new sun.security.action.LoadLibraryAction("javanet")); | ||
120 | java.security.AccessController | ||
121 | .doPrivileged(new sun.security.action.LoadLibraryAction("nio")); | ||
122 | // IOUtil must be initialized; Its native methods are called from | ||
123 | Index: openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java | ||
124 | =================================================================== | ||
125 | --- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:05.896626691 +0200 | ||
126 | +++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:45.606625991 +0200 | ||
127 | @@ -244,7 +244,7 @@ | ||
128 | |||
129 | static { | ||
130 | java.security.AccessController.doPrivileged( | ||
131 | - new sun.security.action.LoadLibraryAction("net")); | ||
132 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
133 | } | ||
134 | |||
135 | } | ||
136 | Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java | ||
137 | =================================================================== | ||
138 | --- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:06.786627210 +0200 | ||
139 | +++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:51.926627747 +0200 | ||
140 | @@ -160,7 +160,7 @@ | ||
141 | |||
142 | static { | ||
143 | java.security.AccessController.doPrivileged( | ||
144 | - new sun.security.action.LoadLibraryAction("net")); | ||
145 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
146 | init0(); | ||
147 | |||
148 | // start the address listener thread | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch b/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch new file mode 100644 index 0000000..e47ee50 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Index: openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 20:38:09.000000000 +0100 | ||
4 | +++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 21:03:15.781644337 +0100 | ||
5 | @@ -38,7 +38,11 @@ | ||
6 | #include <llvm/ModuleProvider.h> | ||
7 | #endif | ||
8 | #include <llvm/Support/IRBuilder.h> | ||
9 | +#if SHARK_LLVM_VERSION >= 29 | ||
10 | +#include <llvm/Support/Threading.h> | ||
11 | +#else | ||
12 | #include <llvm/System/Threading.h> | ||
13 | +#endif | ||
14 | #include <llvm/Target/TargetSelect.h> | ||
15 | #include <llvm/Type.h> | ||
16 | #include <llvm/ExecutionEngine/JITMemoryManager.h> | ||
17 | @@ -47,8 +51,12 @@ | ||
18 | #include <llvm/ExecutionEngine/JIT.h> | ||
19 | #include <llvm/ADT/StringMap.h> | ||
20 | #include <llvm/Support/Debug.h> | ||
21 | +#if SHARK_LLVM_VERSION >= 29 | ||
22 | +#include <llvm/Support/Host.h> | ||
23 | +#else | ||
24 | #include <llvm/System/Host.h> | ||
25 | #endif | ||
26 | +#endif | ||
27 | |||
28 | #include <map> | ||
29 | |||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch new file mode 100644 index 0000000..f2ad035 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/gcc.make | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:35.758533706 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:42.761456458 +0100 | ||
5 | @@ -98,9 +98,6 @@ | ||
6 | CFLAGS += -pipe | ||
7 | endif | ||
8 | |||
9 | -# Compiler warnings are treated as errors | ||
10 | -WARNINGS_ARE_ERRORS = -Werror | ||
11 | - | ||
12 | # Except for a few acceptable ones | ||
13 | # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit | ||
14 | # conversions which might affect the values. To avoid that, we need to turn | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch new file mode 100644 index 0000000..9f875de --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100 | ||
4 | +++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100 | ||
5 | @@ -27,13 +27,11 @@ | ||
6 | |||
7 | #include "jfdlibm.h" | ||
8 | |||
9 | -#ifdef __NEWVALID /* special setup for Sun test regime */ | ||
10 | #if defined(i386) || defined(i486) || \ | ||
11 | defined(intel) || defined(x86) || \ | ||
12 | defined(i86pc) || defined(_M_IA64) || defined(ia64) | ||
13 | #define _LITTLE_ENDIAN | ||
14 | #endif | ||
15 | -#endif | ||
16 | |||
17 | #ifdef _LITTLE_ENDIAN | ||
18 | #define __HI(x) *(1+(int*)&x) | ||
diff --git a/recipes-core/openjdk/openjdk-6/jvm.cfg b/recipes-core/openjdk/openjdk-6/jvm.cfg new file mode 100644 index 0000000..9e008e9 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/jvm.cfg | |||
@@ -0,0 +1,41 @@ | |||
1 | # Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. | ||
2 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
3 | # | ||
4 | # This code is free software; you can redistribute it and/or modify it | ||
5 | # under the terms of the GNU General Public License version 2 only, as | ||
6 | # published by the Free Software Foundation. Sun designates this | ||
7 | # particular file as subject to the "Classpath" exception as provided | ||
8 | # by Sun in the LICENSE file that accompanied this code. | ||
9 | # | ||
10 | # This code is distributed in the hope that it will be useful, but WITHOUT | ||
11 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
12 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
13 | # version 2 for more details (a copy is included in the LICENSE file that | ||
14 | # accompanied this code). | ||
15 | # | ||
16 | # You should have received a copy of the GNU General Public License version | ||
17 | # 2 along with this work; if not, write to the Free Software Foundation, | ||
18 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
19 | # | ||
20 | # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
21 | # CA 95054 USA or visit www.sun.com if you need additional information or | ||
22 | # have any questions. | ||
23 | # | ||
24 | # | ||
25 | # List of JVMs that can be used as an option to java, javac, etc. | ||
26 | # Order is important -- first in this list is the default JVM. | ||
27 | # NOTE that this both this file and its format are UNSUPPORTED and | ||
28 | # WILL GO AWAY in a future release. | ||
29 | # | ||
30 | # You may also select a JVM in an arbitrary location with the | ||
31 | # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
32 | # and may not be available in a future release. | ||
33 | # | ||
34 | -server ERROR | ||
35 | -client IGNORE | ||
36 | -hotspot ERROR | ||
37 | -classic WARN | ||
38 | -native ERROR | ||
39 | -green ERROR | ||
40 | -zero ALIASED_TO -server | ||
41 | -cacao ERROR | ||
diff --git a/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch b/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch new file mode 100644 index 0000000..13280b3 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | Index: icedtea6/ports/hotspot/tools/mkbc.c | ||
2 | =================================================================== | ||
3 | --- icedtea6.orig/ports/hotspot/tools/mkbc.c 2010-04-01 12:25:13.791317722 +0200 | ||
4 | +++ icedtea6/ports/hotspot/tools/mkbc.c 2010-04-01 12:27:34.151606177 +0200 | ||
5 | @@ -602,4 +602,6 @@ | ||
6 | if (ferror(bci_f)) fatal("Error writing bci"); | ||
7 | if (source_f != stdin) fclose(source_f); | ||
8 | if (bci_f != stdout) fclose(bci_f); | ||
9 | + | ||
10 | + return 0; | ||
11 | } | ||
diff --git a/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch new file mode 100644 index 0000000..df9e147 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch | |||
@@ -0,0 +1,113 @@ | |||
1 | Index: icedtea6-1.8/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:42:48.412103129 +0200 | ||
4 | +++ icedtea6-1.8/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:50:51.680282178 +0200 | ||
5 | @@ -32,6 +32,96 @@ | ||
6 | |||
7 | #if SHARK_LLVM_VERSION >= 27 | ||
8 | namespace { | ||
9 | + | ||
10 | +#if defined(__arm__) && defined(__linux__) | ||
11 | +#include <fcntl.h> | ||
12 | +#include <linux/auxvec.h> | ||
13 | +#include <asm/hwcap.h> | ||
14 | +#define VECBUFF_SIZE 32 | ||
15 | + | ||
16 | +bool TestARMLinuxHWCAP(int feature) { | ||
17 | + int fd; | ||
18 | + unsigned vecs[VECBUFF_SIZE]; | ||
19 | + unsigned *p; | ||
20 | + int i, n; | ||
21 | + int rc; | ||
22 | + | ||
23 | + rc = 0; | ||
24 | + fd = open("/proc/self/auxv", O_RDONLY); | ||
25 | + if (fd < 0) return 0; | ||
26 | + do { | ||
27 | + n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); | ||
28 | + p = vecs; | ||
29 | + i = n/8; | ||
30 | + while (--i >=0) { | ||
31 | + unsigned tag = *p++; | ||
32 | + unsigned value = *p++; | ||
33 | + if (tag == 0) goto fini; | ||
34 | + if(tag == AT_HWCAP && (value & feature)) { | ||
35 | + rc = 1; | ||
36 | + goto fini; | ||
37 | + } | ||
38 | + } | ||
39 | + } while (n == VECBUFF_SIZE * sizeof(unsigned)); | ||
40 | +fini: | ||
41 | + close(fd); | ||
42 | + return rc; | ||
43 | +} | ||
44 | + | ||
45 | +char* TestARMLinuxAT(int auxvec) { | ||
46 | + int fd; | ||
47 | + unsigned vecs[VECBUFF_SIZE]; | ||
48 | + unsigned *p; | ||
49 | + int i, n; | ||
50 | + char* rc; | ||
51 | + | ||
52 | + rc = 0; | ||
53 | + fd = open("/proc/self/auxv", O_RDONLY); | ||
54 | + if (fd < 0) return 0; | ||
55 | + do { | ||
56 | + n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); | ||
57 | + p = vecs; | ||
58 | + i = n/8; | ||
59 | + while (--i >=0) { | ||
60 | + unsigned tag = *p++; | ||
61 | + unsigned value = *p++; | ||
62 | + if (tag == 0) goto fini; | ||
63 | + if(tag == (unsigned) auxvec ) { | ||
64 | + rc = (char*)value; | ||
65 | + goto fini; | ||
66 | + } | ||
67 | + } | ||
68 | + } while (n == VECBUFF_SIZE * sizeof(unsigned)); | ||
69 | +fini: | ||
70 | + close(fd); | ||
71 | + return rc; | ||
72 | +} | ||
73 | + | ||
74 | +bool getARMHostCPUFeatures(StringMap<bool> &Features) { | ||
75 | + // FIXME LLVM PR6561 // Features["neon"]=TestARMLinuxHWCAP(HWCAP_NEON); | ||
76 | + Features["thumb2"]=TestARMLinuxHWCAP(HWCAP_THUMBEE); | ||
77 | + Features["vfp2"]=TestARMLinuxHWCAP(HWCAP_VFP); | ||
78 | + | ||
79 | + std::string testArchKey(TestARMLinuxAT(AT_PLATFORM)); | ||
80 | + | ||
81 | + StringMap<std::string> archLinuxToLLVMMap; | ||
82 | + archLinuxToLLVMMap["v4l"]="v4t"; | ||
83 | + archLinuxToLLVMMap["v5l"]="v5t"; | ||
84 | + archLinuxToLLVMMap["v6l"]="v6"; | ||
85 | + // FIXME change this from v6 to v7a when LLVM PR7048 have been fixed | ||
86 | + archLinuxToLLVMMap["v7l"]="v6"; | ||
87 | + | ||
88 | + llvm::StringMapIterator<std::string> resultIterator(archLinuxToLLVMMap.find( | ||
89 | + testArchKey)); | ||
90 | + if(resultIterator->first()) { | ||
91 | + std::string arch(resultIterator->second); | ||
92 | + Features[arch]=true; | ||
93 | + } | ||
94 | + | ||
95 | + return true; | ||
96 | +} | ||
97 | +#endif | ||
98 | + | ||
99 | cl::opt<std::string> | ||
100 | MCPU("mcpu"); | ||
101 | |||
102 | @@ -64,7 +154,11 @@ | ||
103 | #if SHARK_LLVM_VERSION >= 27 | ||
104 | // Finetune LLVM for the current host CPU. | ||
105 | StringMap<bool> Features; | ||
106 | +#if defined(__arm__) && defined(__linux__) | ||
107 | + bool gotCpuFeatures = getARMHostCPUFeatures(Features); | ||
108 | +#else | ||
109 | bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features); | ||
110 | +#endif | ||
111 | std::string cpu("-mcpu=" + llvm::sys::getHostCPUName()); | ||
112 | |||
113 | std::vector<const char*> args; | ||
diff --git a/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch b/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch new file mode 100644 index 0000000..4e89967 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: icedtea6-1.8/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/Makefile.am 2010-06-30 11:30:49.526648376 +0200 | ||
4 | +++ icedtea6-1.8/Makefile.am 2010-06-30 11:42:02.606648734 +0200 | ||
5 | @@ -1882,7 +1882,7 @@ | ||
6 | # configure script arguments, quoted in single quotes | ||
7 | CONFIGURE_ARGS = @CONFIGURE_ARGS@ | ||
8 | ADD_ZERO_CONFIGURE_ARGS = \ | ||
9 | - --with-openjdk=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \ | ||
10 | + --with-openjdk=$(abs_top_builddir)/bootstrap/jdk1.6.0 \ | ||
11 | --enable-zero | ||
12 | if ADD_SHARK_BUILD | ||
13 | ADD_ZERO_CONFIGURE_ARGS += \ | ||
diff --git a/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch b/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch new file mode 100644 index 0000000..ca21ccf --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Index: icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:26:16.885292426 +0200 | ||
4 | +++ icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:29:19.034668305 +0200 | ||
5 | @@ -266,7 +266,15 @@ | ||
6 | volatile jlong* dest, | ||
7 | jlong compare_value) { | ||
8 | |||
9 | +#ifdef ARM | ||
10 | + return arm_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value); | ||
11 | +#else | ||
12 | +#ifdef M68K | ||
13 | + return m68k_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value); | ||
14 | +#else | ||
15 | return __sync_val_compare_and_swap(dest, compare_value, exchange_value); | ||
16 | +#endif // M68K | ||
17 | +#endif // ARM | ||
18 | } | ||
19 | |||
20 | inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, | ||
diff --git a/recipes-core/openjdk/openjdk-6_6b18-1.8.11.bb b/recipes-core/openjdk/openjdk-6_6b18-1.8.11.bb new file mode 100644 index 0000000..c611d31 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6_6b18-1.8.11.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require openjdk-6-release-6b18.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
6 | |||
7 | ICEDTEA = "icedtea6-1.8.11" | ||
8 | |||
9 | SRC_URI[iced.md5sum] = "e0edfb08a4eedf1b9f1cef26a9bd4ab4" | ||
10 | SRC_URI[iced.sha256sum] = "6eb418ec0609080a71bda16896124d6e1ac23b2f54af52e05fc22c719e12ca29" | ||
11 | |||
diff --git a/recipes-core/rhino/rhino/rhino b/recipes-core/rhino/rhino/rhino new file mode 100644 index 0000000..e2f87f6 --- /dev/null +++ b/recipes-core/rhino/rhino/rhino | |||
@@ -0,0 +1,8 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | if [ ! $JAVA ]; then | ||
4 | JAVA=java | ||
5 | fi | ||
6 | |||
7 | $JAVA -jar /usr/share/java/js.jar $@ | ||
8 | |||
diff --git a/recipes-core/rhino/rhino/rhino-jsc b/recipes-core/rhino/rhino/rhino-jsc new file mode 100644 index 0000000..d5f50e8 --- /dev/null +++ b/recipes-core/rhino/rhino/rhino-jsc | |||
@@ -0,0 +1,8 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | if [ ! $JAVA ]; then | ||
4 | JAVA=java | ||
5 | fi | ||
6 | |||
7 | $JAVA -cp .:/usr/share/java/js.jar org.mozilla.javascript.tools.jsc.Main $@ | ||
8 | |||
diff --git a/recipes-core/rhino/rhino_1.7r2.bb b/recipes-core/rhino/rhino_1.7r2.bb new file mode 100644 index 0000000..3a3f553 --- /dev/null +++ b/recipes-core/rhino/rhino_1.7r2.bb | |||
@@ -0,0 +1,46 @@ | |||
1 | DESCRIPTION = "Lexical analyzer generator for Java" | ||
2 | LICENSE = "GPL MPL" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b8ba559ba419681dbf8280b6721df0af" | ||
4 | |||
5 | BBCLASSEXTEND = "native" | ||
6 | |||
7 | inherit java-library | ||
8 | |||
9 | SRC_URI = "\ | ||
10 | ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip \ | ||
11 | file://rhino \ | ||
12 | file://rhino-jsc \ | ||
13 | " | ||
14 | |||
15 | S = "${WORKDIR}/rhino1_7R2" | ||
16 | |||
17 | PACKAGES = "${JPN} rhino" | ||
18 | |||
19 | FILES_${PN} = "${bindir}/rhino ${bindir}/rhino-jsc" | ||
20 | RDEPENDS_${PN} = "java2-runtime ${JPN}" | ||
21 | RDEPENDS_${PN}_virtclass-native = "" | ||
22 | |||
23 | do_compile() { | ||
24 | mkdir -p build | ||
25 | |||
26 | # Compatibility fix for jamvm which has non-genericised | ||
27 | # java.lang classes. :( | ||
28 | bcp_arg="-bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip" | ||
29 | |||
30 | javac $bcp_arg -source 1.5 -sourcepath src -d build `find src -name "*.java"` | ||
31 | |||
32 | mkdir -p build/org/mozilla/javascript/resources | ||
33 | cp src/org/mozilla/javascript/resources/*.properties build/org/mozilla/javascript/resources | ||
34 | |||
35 | fastjar -m ${S}/src/manifest -C build -c -f ${JARFILENAME} . | ||
36 | } | ||
37 | |||
38 | do_install_append() { | ||
39 | install -d ${D}${bindir} | ||
40 | |||
41 | install -m 0755 ${WORKDIR}/rhino ${D}${bindir} | ||
42 | install -m 0755 ${WORKDIR}/rhino-jsc ${D}${bindir} | ||
43 | } | ||
44 | |||
45 | SRC_URI[md5sum] = "40d0a9abec8169e42920214b37fa8e0e" | ||
46 | SRC_URI[sha256sum] = "677f7dc1b67a1587bc03974d5f0720474a56b8f29835e1d860739908df8462dc" | ||
diff --git a/recipes-core/servlet-api/jsp2.0_5.5.26.bb b/recipes-core/servlet-api/jsp2.0_5.5.26.bb new file mode 100644 index 0000000..ca94f08 --- /dev/null +++ b/recipes-core/servlet-api/jsp2.0_5.5.26.bb | |||
@@ -0,0 +1,45 @@ | |||
1 | DESCRIPTION = "Java Server Page (JSP) API 2.0 (from Tomcat 5.5)" | ||
2 | LICENSE = "AL2.0" | ||
3 | AUTHOR = "Apache Software Foundation" | ||
4 | |||
5 | SRC_URI = "http://archive.apache.org/dist/tomcat/tomcat-5/v${PV}/src/apache-tomcat-${PV}-src.tar.gz" | ||
6 | |||
7 | S = "${WORKDIR}/apache-tomcat-${PV}-src/servletapi/jsr152" | ||
8 | |||
9 | inherit java-library | ||
10 | |||
11 | DEPENDS = "servlet2.4" | ||
12 | RDEPENDS_${PN} = "libservlet2.4-java" | ||
13 | |||
14 | # Value of implementation.revision in build.xml | ||
15 | IMPL_REVISION = "public_draft" | ||
16 | |||
17 | JARFILENAME = "jsp-api-2.0.${IMPL_REVISION}.jar" | ||
18 | ALTJARFILENAMES = "jsp-api-2.0.jar jsp-api.jar" | ||
19 | |||
20 | do_unpackpost() { | ||
21 | sed -i -e "s|@implementation.version@|${IMPL_REVISION}|" src/etc/manifest | ||
22 | } | ||
23 | |||
24 | addtask unpackpost after do_unpack before do_patch | ||
25 | |||
26 | do_compile() { | ||
27 | mkdir -p build | ||
28 | |||
29 | oe_makeclasspath cp -s servlet-api-2.4 | ||
30 | javac -sourcepath src/share -d build -cp $cp `find src/share/javax -name \*.java` | ||
31 | |||
32 | # Copy extraneous files according to build.xml's compile task | ||
33 | (cd src/share && find . -name "*.properties" -exec cp {} ../../build/{} \;) | ||
34 | |||
35 | mkdir -p build/javax/servlet/jsp/resources | ||
36 | cp src/share/dtd/jsp*.dtd build/javax/servlet/jsp/resources | ||
37 | cp src/share/dtd/jsp*.xsd build/javax/servlet/jsp/resources | ||
38 | cp src/share/dtd/web-jsp*.dtd build/javax/servlet/jsp/resources | ||
39 | cp src/share/dtd/web-jsp*.xsd build/javax/servlet/jsp/resources | ||
40 | |||
41 | fastjar -C build -c -m src/etc/manifest -f ${JARFILENAME} . | ||
42 | } | ||
43 | |||
44 | SRC_URI[md5sum] = "642b6526354cb18c5b5d77ebef8109ae" | ||
45 | SRC_URI[sha256sum] = "ddc677d7391c438e6102d0b3e9653eaca661344ef74b0260c1f488340d660395" | ||
diff --git a/recipes-core/servlet-api/servlet2.3_4.1.37.bb b/recipes-core/servlet-api/servlet2.3_4.1.37.bb new file mode 100644 index 0000000..ecdf95d --- /dev/null +++ b/recipes-core/servlet-api/servlet2.3_4.1.37.bb | |||
@@ -0,0 +1,48 @@ | |||
1 | DESCRIPTION = "Servlet API 2.3 (from Tomcat 4.1)" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
5 | |||
6 | SRC_URI = "http://archive.apache.org/dist/tomcat/tomcat-4/v${PV}/src/apache-tomcat-${PV}-src.tar.gz" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | S = "${WORKDIR}/apache-tomcat-${PV}-src/servletapi" | ||
11 | |||
12 | DEPENDS = "fastjar-native" | ||
13 | |||
14 | # Value of implementation.revision in build.xml | ||
15 | IMPL_REVISION = "1" | ||
16 | |||
17 | JARFILENAME = "servlet-2.3.${IMPL_REVISION}.jar" | ||
18 | ALTJARFILENAMES = "servlet-2.3.jar servlet2.3.jar" | ||
19 | |||
20 | do_unpackpost() { | ||
21 | sed -i -e "s|@implementation.version@|${IMPL_REVISION}|" src/etc/manifest | ||
22 | } | ||
23 | |||
24 | addtask unpackpost after do_unpack before do_patch | ||
25 | |||
26 | do_compile() { | ||
27 | mkdir -p build | ||
28 | |||
29 | javac -sourcepath src/share -d build `find src/share/javax -name \*.java` | ||
30 | |||
31 | # Copy extraneous files according to build.xml's compile task | ||
32 | (cd src/share && find . -name "*.properties" -exec cp {} ../../build/{} \;) | ||
33 | |||
34 | mkdir -p build/javax/servlet/resources | ||
35 | cp src/share/dtd/web-app*.dtd build/javax/servlet/resources | ||
36 | |||
37 | mkdir -p build/javax/servlet/jsp/resources | ||
38 | cp src/share/dtd/web-jsptaglibrary*.dtd build/javax/servlet/jsp/resources | ||
39 | cp src/share/dtd/jspxml.* build/javax/servlet/jsp/resources | ||
40 | |||
41 | fastjar -C build -c -m src/etc/manifest -f ${JARFILENAME} . | ||
42 | } | ||
43 | |||
44 | SRC_URI[md5sum] = "fe50177a25a084ad1abf4a201d08c2a6" | ||
45 | SRC_URI[sha256sum] = "65e4cc9d3ea4a7f30044bfd6c660c772adb75ac152d775342deb6049a0d19d74" | ||
46 | |||
47 | NATIVE_INSTALL_WORKS = "1" | ||
48 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/servlet-api/servlet2.4_5.5.26.bb b/recipes-core/servlet-api/servlet2.4_5.5.26.bb new file mode 100644 index 0000000..ee80e5e --- /dev/null +++ b/recipes-core/servlet-api/servlet2.4_5.5.26.bb | |||
@@ -0,0 +1,41 @@ | |||
1 | DESCRIPTION = "Servlet API 2.4 (from Tomcat 5.5)" | ||
2 | LICENSE = "AL2.0" | ||
3 | AUTHOR = "Apache Software Foundation" | ||
4 | |||
5 | SRC_URI = "http://archive.apache.org/dist/tomcat/tomcat-5/v${PV}/src/apache-tomcat-${PV}-src.tar.gz" | ||
6 | |||
7 | S = "${WORKDIR}/apache-tomcat-${PV}-src/servletapi/jsr154" | ||
8 | |||
9 | inherit java-library | ||
10 | |||
11 | DEPENDS = "fastjar-native" | ||
12 | |||
13 | # Value of implementation.revision in build.xml | ||
14 | IMPL_REVISION = "1" | ||
15 | |||
16 | JARFILENAME = "servlet-api-2.4.${IMPL_REVISION}.jar" | ||
17 | ALTJARFILENAMES = "servlet-api-2.4.jar servlet-api.jar servlet2.4.jar" | ||
18 | |||
19 | do_unpackpost() { | ||
20 | sed -i -e "s|2.3.@implementation.version@|2.4.${IMPL_REVISION}|" src/etc/manifest | ||
21 | } | ||
22 | |||
23 | addtask unpackpost after do_unpack before do_patch | ||
24 | |||
25 | do_compile() { | ||
26 | mkdir -p build | ||
27 | |||
28 | javac -sourcepath src/share -d build `find src/share/javax -name \*.java` | ||
29 | |||
30 | # Copy extraneous files according to build.xml's compile task | ||
31 | (cd src/share && find . -name "*.properties" -exec cp {} ../../build/{} \;) | ||
32 | |||
33 | mkdir -p build/javax/servlet/resources | ||
34 | cp src/share/dtd/jsp*.dtd build/javax/servlet/resources | ||
35 | cp src/share/dtd/web-jsp*.dtd build/javax/servlet/resources | ||
36 | |||
37 | fastjar -C build -c -m src/etc/manifest -f ${JARFILENAME} . | ||
38 | } | ||
39 | |||
40 | SRC_URI[md5sum] = "642b6526354cb18c5b5d77ebef8109ae" | ||
41 | SRC_URI[sha256sum] = "ddc677d7391c438e6102d0b3e9653eaca661344ef74b0260c1f488340d660395" | ||
diff --git a/recipes-core/xalan-j/xalan-j_2.7.1.bb b/recipes-core/xalan-j/xalan-j_2.7.1.bb new file mode 100644 index 0000000..95dc8a1 --- /dev/null +++ b/recipes-core/xalan-j/xalan-j_2.7.1.bb | |||
@@ -0,0 +1,65 @@ | |||
1 | DESCRIPTION = "Java XSLT processor" | ||
2 | LICENSE = "AL2.0" | ||
3 | LIC_FILES_CHKSUM = " \ | ||
4 | file://${WORKDIR}/bsf-2.4.0/LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3 \ | ||
5 | file://${WORKDIR}/xalan-j_2_7_1/LICENSE.txt;md5=f4411652c74c374bb2564394185289ee \ | ||
6 | " | ||
7 | AUTHOR = "Apache Software Foundation" | ||
8 | HOMEPAGE = "http://xml.apache.org/xalan-j" | ||
9 | |||
10 | DEPENDS = "xerces-j regexp jlex cup jaxp1.3 bcel" | ||
11 | DEPENDS_virtclass-native = " \ | ||
12 | xerces-j-native regexp-native jlex-native cup-native jaxp1.3-native bcel-native \ | ||
13 | " | ||
14 | |||
15 | |||
16 | SRC_URI = "\ | ||
17 | http://archive.apache.org/dist/xml/${BPN}/${BPN}_2_7_1-src.tar.gz;name=archive \ | ||
18 | http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-2.4.0.tar.gz;name=bsf \ | ||
19 | " | ||
20 | |||
21 | S = "${WORKDIR}/${BPN}_2_7_1" | ||
22 | |||
23 | inherit java-library | ||
24 | |||
25 | JPN = "libxalan2-java" | ||
26 | |||
27 | JARFILENAME = "xalan2-${PV}.jar" | ||
28 | ALTJARFILENAMES = "xalan2.jar" | ||
29 | |||
30 | do_compile() { | ||
31 | mkdir -p build | ||
32 | |||
33 | oe_makeclasspath cp -s xercesImpl regexp jlex cup bcel jaxp-1.3 | ||
34 | scp="src:${WORKDIR}/bsf-2.4.0/src" | ||
35 | |||
36 | javac -J-Xmx512M -sourcepath $scp -cp $cp -d build `find src -name \*.java` | ||
37 | (cd src && find org -name "*.properties" -exec cp {} ../build/{} \;) | ||
38 | |||
39 | # Remove BSF classes | ||
40 | rm -rf build-xalan/org/apache/bsf | ||
41 | |||
42 | mkdir -p build-serializer/org/apache/xml | ||
43 | mv build/org/apache/xml/serializer build-serializer/org/apache/xml | ||
44 | |||
45 | fastjar -C build -c -f ${JARFILENAME} . | ||
46 | fastjar -C build-serializer -c -f serializer-${PV}.jar . | ||
47 | } | ||
48 | |||
49 | do_install_append() { | ||
50 | oe_jarinstall serializer-${PV}.jar serializer.jar | ||
51 | } | ||
52 | |||
53 | |||
54 | PACKAGES = "libxalan2-serializer-java ${JPN}" | ||
55 | |||
56 | FILES_libxalan2-serializer-java = "${datadir_java}/serializer*.jar" | ||
57 | |||
58 | SRC_URI[archive.md5sum] = "fc805051f0fe505c7a4b1b5c8db9b9e3" | ||
59 | SRC_URI[archive.sha256sum] = "fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043" | ||
60 | SRC_URI[bsf.md5sum] = "7e58b2a009c0f70ab36bbef420b25c07" | ||
61 | SRC_URI[bsf.sha256sum] = "5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9" | ||
62 | |||
63 | NATIVE_INSTALL_WORKS = "1" | ||
64 | BBCLASSEXTEND = "native" | ||
65 | |||
diff --git a/recipes-core/xerces-j/xerces-j_2.9.1.bb b/recipes-core/xerces-j/xerces-j_2.9.1.bb new file mode 100644 index 0000000..79aef01 --- /dev/null +++ b/recipes-core/xerces-j/xerces-j_2.9.1.bb | |||
@@ -0,0 +1,61 @@ | |||
1 | DESCRIPTION = "Reference implementation of XNI, the Xerces Native Interface, and also a fully conforming XML Schema processor." | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = " \ | ||
5 | file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
6 | file://LICENSE.DOM-documentation.html;md5=b05e182e1962778d7b207cbf3fe4acef \ | ||
7 | file://LICENSE.DOM-software.html;md5=3aec153ae803c31acdae63bac18506b9 \ | ||
8 | file://LICENSE.resolver.txt;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
9 | file://LICENSE.serializer.txt;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
10 | " | ||
11 | |||
12 | SRC_URI = "http://www.apache.org/dist/xerces/j/Xerces-J-src.${PV}.tar.gz" | ||
13 | |||
14 | S = "${WORKDIR}/xerces-2_9_1" | ||
15 | |||
16 | inherit java-library | ||
17 | |||
18 | JPN = "libxerces2-java" | ||
19 | |||
20 | DEPENDS = "fastjar-native jaxp1.3 xml-commons-resolver1.1" | ||
21 | DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native xml-commons-resolver1.1-native" | ||
22 | |||
23 | RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" | ||
24 | RDEPENDS_${PN}_virtclass-native = "" | ||
25 | |||
26 | do_unpackpost() { | ||
27 | find src -exec \ | ||
28 | sed -i -e "s|@impl.name@|Xerces-J ${PV}|" \ | ||
29 | -e "s|@impl.version@|${PV}|" {} \; | ||
30 | } | ||
31 | |||
32 | addtask unpackpost after do_unpack before do_patch | ||
33 | |||
34 | JARFILENAME = "xercesImpl.jar" | ||
35 | ALTJARFILENAMES = "" | ||
36 | |||
37 | do_compile() { | ||
38 | mkdir -p build | ||
39 | |||
40 | # Prepend the bootclasspath with the earlier XML API to make | ||
41 | # compilation succeed. | ||
42 | oe_makeclasspath bcp -s jaxp-1.3 resolver | ||
43 | bcp=$bcp:${STAGING_DATADIR_NATIVE}/classpath/glibj.zip | ||
44 | |||
45 | javac -sourcepath src -d build -bootclasspath $bcp `find src -name "*.java"` | ||
46 | |||
47 | (cd src && find org ! -name "*.java" -exec cp {} ../build/{} \;) | ||
48 | |||
49 | fastjar -C build -c -m src/manifest.xerces -f ${JARFILENAME} . | ||
50 | |||
51 | # Like Debian we provide a symlink called xmlParserAPIs.jar pointing to the JAXP | ||
52 | # classes. | ||
53 | ln -sf ${D}${datadir_java}/xmlParserAPIs.jar jaxp-1.3.jar | ||
54 | |||
55 | } | ||
56 | |||
57 | SRC_URI[md5sum] = "e340cba4a2abf4f0f833488380821153" | ||
58 | SRC_URI[sha256sum] = "13af0062a72a4a0d541ca5336391eafa4d580258cacf4a5e062ea584ca950592" | ||
59 | |||
60 | NATIVE_INSTALL_WORKS = "1" | ||
61 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/xml-commons/dom4j-1.6.1/debian.patch b/recipes-core/xml-commons/dom4j-1.6.1/debian.patch new file mode 100644 index 0000000..87fda85 --- /dev/null +++ b/recipes-core/xml-commons/dom4j-1.6.1/debian.patch | |||
@@ -0,0 +1,1628 @@ | |||
1 | --- dom4j-1.6.1+dfsg.orig/src/java/org/jaxen/dom4j/DocumentNavigator.java | ||
2 | +++ dom4j-1.6.1+dfsg/src/java/org/jaxen/dom4j/DocumentNavigator.java | ||
3 | @@ -0,0 +1,501 @@ | ||
4 | +package org.jaxen.dom4j; | ||
5 | + | ||
6 | +/* | ||
7 | + * $Header: /home/projects/jaxen/scm/jaxen/src/java/main/org/jaxen/dom4j/DocumentNavigator.java,v 1.33 2006/07/03 13:17:30 elharo Exp $ | ||
8 | + * $Revision: 1.33 $ | ||
9 | + * $Date: 2006/07/03 13:17:30 $ | ||
10 | + * | ||
11 | + * ==================================================================== | ||
12 | + * | ||
13 | + * Copyright 2000-2005 bob mcwhirter & James Strachan. | ||
14 | + * All rights reserved. | ||
15 | + * | ||
16 | + * | ||
17 | + * Redistribution and use in source and binary forms, with or without | ||
18 | + * modification, are permitted provided that the following conditions are | ||
19 | + * met: | ||
20 | + * | ||
21 | + * * Redistributions of source code must retain the above copyright | ||
22 | + * notice, this list of conditions and the following disclaimer. | ||
23 | + * | ||
24 | + * * Redistributions in binary form must reproduce the above copyright | ||
25 | + * notice, this list of conditions and the following disclaimer in the | ||
26 | + * documentation and/or other materials provided with the distribution. | ||
27 | + * | ||
28 | + * * Neither the name of the Jaxen Project nor the names of its | ||
29 | + * contributors may be used to endorse or promote products derived | ||
30 | + * from this software without specific prior written permission. | ||
31 | + * | ||
32 | + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS | ||
33 | + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||
34 | + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A | ||
35 | + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER | ||
36 | + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
37 | + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
38 | + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
39 | + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
40 | + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
41 | + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
42 | + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
43 | + * | ||
44 | + * ==================================================================== | ||
45 | + * This software consists of voluntary contributions made by many | ||
46 | + * individuals on behalf of the Jaxen Project and was originally | ||
47 | + * created by bob mcwhirter <bob@werken.com> and | ||
48 | + * James Strachan <jstrachan@apache.org>. For more information on the | ||
49 | + * Jaxen Project, please see <http://www.jaxen.org/>. | ||
50 | + * | ||
51 | + * $Id: DocumentNavigator.java,v 1.33 2006/07/03 13:17:30 elharo Exp $ | ||
52 | +*/ | ||
53 | + | ||
54 | +import java.util.ArrayList; | ||
55 | +import java.util.HashSet; | ||
56 | +import java.util.Iterator; | ||
57 | +import java.util.List; | ||
58 | + | ||
59 | +import org.dom4j.Attribute; | ||
60 | +import org.dom4j.Branch; | ||
61 | +import org.dom4j.CDATA; | ||
62 | +import org.dom4j.Comment; | ||
63 | +import org.dom4j.Document; | ||
64 | +import org.dom4j.DocumentException; | ||
65 | +import org.dom4j.Element; | ||
66 | +import org.dom4j.Namespace; | ||
67 | +import org.dom4j.Node; | ||
68 | +import org.dom4j.ProcessingInstruction; | ||
69 | +import org.dom4j.QName; | ||
70 | +import org.dom4j.Text; | ||
71 | +import org.dom4j.io.SAXReader; | ||
72 | +import org.jaxen.DefaultNavigator; | ||
73 | +import org.jaxen.FunctionCallException; | ||
74 | +import org.jaxen.NamedAccessNavigator; | ||
75 | +import org.jaxen.Navigator; | ||
76 | +import org.jaxen.XPath; | ||
77 | +import org.jaxen.JaxenConstants; | ||
78 | +import org.jaxen.saxpath.SAXPathException; | ||
79 | +import org.jaxen.util.SingleObjectIterator; | ||
80 | + | ||
81 | +/** | ||
82 | + * Interface for navigating around the DOM4J object model. | ||
83 | + * | ||
84 | + * <p> | ||
85 | + * This class is not intended for direct usage, but is | ||
86 | + * used by the Jaxen engine during evaluation. | ||
87 | + * </p> | ||
88 | + * | ||
89 | + * @see XPath | ||
90 | + * | ||
91 | + * @author <a href="mailto:bob@werken.com">bob mcwhirter</a> | ||
92 | + * @author Stephen Colebourne | ||
93 | + */ | ||
94 | +public class DocumentNavigator extends DefaultNavigator implements NamedAccessNavigator | ||
95 | +{ | ||
96 | + | ||
97 | + /** | ||
98 | + * | ||
99 | + */ | ||
100 | + private static final long serialVersionUID = 5582300797286535936L; | ||
101 | + private transient SAXReader reader; | ||
102 | + | ||
103 | + /** Singleton implementation. | ||
104 | + */ | ||
105 | + private static class Singleton | ||
106 | + { | ||
107 | + /** Singleton instance. | ||
108 | + */ | ||
109 | + private static DocumentNavigator instance = new DocumentNavigator(); | ||
110 | + } | ||
111 | + | ||
112 | + /** Retrieve the singleton instance of this <code>DocumentNavigator</code>. | ||
113 | + */ | ||
114 | + public static Navigator getInstance() | ||
115 | + { | ||
116 | + return Singleton.instance; | ||
117 | + } | ||
118 | + | ||
119 | + public boolean isElement(Object obj) | ||
120 | + { | ||
121 | + return obj instanceof Element; | ||
122 | + } | ||
123 | + | ||
124 | + public boolean isComment(Object obj) | ||
125 | + { | ||
126 | + return obj instanceof Comment; | ||
127 | + } | ||
128 | + | ||
129 | + public boolean isText(Object obj) | ||
130 | + { | ||
131 | + return ( obj instanceof Text | ||
132 | + || | ||
133 | + obj instanceof CDATA ); | ||
134 | + } | ||
135 | + | ||
136 | + public boolean isAttribute(Object obj) | ||
137 | + { | ||
138 | + return obj instanceof Attribute; | ||
139 | + } | ||
140 | + | ||
141 | + public boolean isProcessingInstruction(Object obj) | ||
142 | + { | ||
143 | + return obj instanceof ProcessingInstruction; | ||
144 | + } | ||
145 | + | ||
146 | + public boolean isDocument(Object obj) | ||
147 | + { | ||
148 | + return obj instanceof Document; | ||
149 | + } | ||
150 | + | ||
151 | + public boolean isNamespace(Object obj) | ||
152 | + { | ||
153 | + return obj instanceof Namespace; | ||
154 | + } | ||
155 | + | ||
156 | + public String getElementName(Object obj) | ||
157 | + { | ||
158 | + Element elem = (Element) obj; | ||
159 | + | ||
160 | + return elem.getName(); | ||
161 | + } | ||
162 | + | ||
163 | + public String getElementNamespaceUri(Object obj) | ||
164 | + { | ||
165 | + Element elem = (Element) obj; | ||
166 | + | ||
167 | + String uri = elem.getNamespaceURI(); | ||
168 | + if ( uri == null) | ||
169 | + return ""; | ||
170 | + else | ||
171 | + return uri; | ||
172 | + } | ||
173 | + | ||
174 | + public String getElementQName(Object obj) | ||
175 | + { | ||
176 | + Element elem = (Element) obj; | ||
177 | + | ||
178 | + return elem.getQualifiedName(); | ||
179 | + } | ||
180 | + | ||
181 | + public String getAttributeName(Object obj) | ||
182 | + { | ||
183 | + Attribute attr = (Attribute) obj; | ||
184 | + | ||
185 | + return attr.getName(); | ||
186 | + } | ||
187 | + | ||
188 | + public String getAttributeNamespaceUri(Object obj) | ||
189 | + { | ||
190 | + Attribute attr = (Attribute) obj; | ||
191 | + | ||
192 | + String uri = attr.getNamespaceURI(); | ||
193 | + if ( uri == null) | ||
194 | + return ""; | ||
195 | + else | ||
196 | + return uri; | ||
197 | + } | ||
198 | + | ||
199 | + public String getAttributeQName(Object obj) | ||
200 | + { | ||
201 | + Attribute attr = (Attribute) obj; | ||
202 | + | ||
203 | + return attr.getQualifiedName(); | ||
204 | + } | ||
205 | + | ||
206 | + public Iterator getChildAxisIterator(Object contextNode) | ||
207 | + { | ||
208 | + Iterator result = null; | ||
209 | + if ( contextNode instanceof Branch ) | ||
210 | + { | ||
211 | + Branch node = (Branch) contextNode; | ||
212 | + result = node.nodeIterator(); | ||
213 | + } | ||
214 | + if (result != null) { | ||
215 | + return result; | ||
216 | + } | ||
217 | + return JaxenConstants.EMPTY_ITERATOR; | ||
218 | + } | ||
219 | + | ||
220 | + /** | ||
221 | + * Retrieves an <code>Iterator</code> over the child elements that | ||
222 | + * match the supplied name. | ||
223 | + * | ||
224 | + * @param contextNode the origin context node | ||
225 | + * @param localName the local name of the children to return, always present | ||
226 | + * @param namespacePrefix the prefix of the namespace of the children to return | ||
227 | + * @param namespaceURI the uri of the namespace of the children to return | ||
228 | + * | ||
229 | + * @return an Iterator that traverses the named children, or null if none | ||
230 | + */ | ||
231 | + public Iterator getChildAxisIterator( | ||
232 | + Object contextNode, String localName, String namespacePrefix, String namespaceURI) { | ||
233 | + | ||
234 | + if ( contextNode instanceof Element ) { | ||
235 | + Element node = (Element) contextNode; | ||
236 | + return node.elementIterator(QName.get(localName, namespacePrefix, namespaceURI)); | ||
237 | + } | ||
238 | + if ( contextNode instanceof Document ) { | ||
239 | + Document node = (Document) contextNode; | ||
240 | + Element el = node.getRootElement(); | ||
241 | + if (el == null || el.getName().equals(localName) == false) { | ||
242 | + return JaxenConstants.EMPTY_ITERATOR; | ||
243 | + } | ||
244 | + if (namespaceURI != null) { | ||
245 | + if (namespaceURI.equals(el.getNamespaceURI()) == false) { | ||
246 | + return JaxenConstants.EMPTY_ITERATOR; | ||
247 | + } | ||
248 | + } | ||
249 | + return new SingleObjectIterator(el); | ||
250 | + } | ||
251 | + | ||
252 | + return JaxenConstants.EMPTY_ITERATOR; | ||
253 | + } | ||
254 | + | ||
255 | + public Iterator getParentAxisIterator(Object contextNode) | ||
256 | + { | ||
257 | + if ( contextNode instanceof Document ) | ||
258 | + { | ||
259 | + return JaxenConstants.EMPTY_ITERATOR; | ||
260 | + } | ||
261 | + | ||
262 | + Node node = (Node) contextNode; | ||
263 | + | ||
264 | + Object parent = node.getParent(); | ||
265 | + | ||
266 | + if ( parent == null ) | ||
267 | + { | ||
268 | + parent = node.getDocument(); | ||
269 | + } | ||
270 | + | ||
271 | + return new SingleObjectIterator( parent ); | ||
272 | + } | ||
273 | + | ||
274 | + public Iterator getAttributeAxisIterator(Object contextNode) | ||
275 | + { | ||
276 | + if ( ! ( contextNode instanceof Element ) ) | ||
277 | + { | ||
278 | + return JaxenConstants.EMPTY_ITERATOR; | ||
279 | + } | ||
280 | + | ||
281 | + Element elem = (Element) contextNode; | ||
282 | + | ||
283 | + return elem.attributeIterator(); | ||
284 | + } | ||
285 | + | ||
286 | + /** | ||
287 | + * Retrieves an <code>Iterator</code> over the attribute elements that | ||
288 | + * match the supplied name. | ||
289 | + * | ||
290 | + * @param contextNode the origin context node | ||
291 | + * @param localName the local name of the attributes to return, always present | ||
292 | + * @param namespacePrefix the prefix of the namespace of the attributes to return | ||
293 | + * @param namespaceURI the URI of the namespace of the attributes to return | ||
294 | + * @return an Iterator that traverses the named attributes, not null | ||
295 | + */ | ||
296 | + public Iterator getAttributeAxisIterator( | ||
297 | + Object contextNode, String localName, String namespacePrefix, String namespaceURI) { | ||
298 | + | ||
299 | + if ( contextNode instanceof Element ) { | ||
300 | + Element node = (Element) contextNode; | ||
301 | + Attribute attr = node.attribute(QName.get(localName, namespacePrefix, namespaceURI)); | ||
302 | + if (attr == null) { | ||
303 | + return JaxenConstants.EMPTY_ITERATOR; | ||
304 | + } | ||
305 | + return new SingleObjectIterator(attr); | ||
306 | + } | ||
307 | + return JaxenConstants.EMPTY_ITERATOR; | ||
308 | + } | ||
309 | + | ||
310 | + public Iterator getNamespaceAxisIterator(Object contextNode) | ||
311 | + { | ||
312 | + if ( ! ( contextNode instanceof Element ) ) | ||
313 | + { | ||
314 | + return JaxenConstants.EMPTY_ITERATOR; | ||
315 | + } | ||
316 | + | ||
317 | + Element element = (Element) contextNode; | ||
318 | + List nsList = new ArrayList(); | ||
319 | + HashSet prefixes = new HashSet(); | ||
320 | + for ( Element context = element; context != null; context = context.getParent() ) { | ||
321 | + List declaredNS = new ArrayList(context.declaredNamespaces()); | ||
322 | + declaredNS.add(context.getNamespace()); | ||
323 | + | ||
324 | + for ( Iterator iter = context.attributes().iterator(); iter.hasNext(); ) | ||
325 | + { | ||
326 | + Attribute attr = (Attribute) iter.next(); | ||
327 | + declaredNS.add(attr.getNamespace()); | ||
328 | + } | ||
329 | + | ||
330 | + for ( Iterator iter = declaredNS.iterator(); iter.hasNext(); ) | ||
331 | + { | ||
332 | + Namespace namespace = (Namespace) iter.next(); | ||
333 | + if (namespace != Namespace.NO_NAMESPACE) | ||
334 | + { | ||
335 | + String prefix = namespace.getPrefix(); | ||
336 | + if ( ! prefixes.contains( prefix ) ) { | ||
337 | + prefixes.add( prefix ); | ||
338 | + nsList.add( namespace.asXPathResult( element ) ); | ||
339 | + } | ||
340 | + } | ||
341 | + } | ||
342 | + } | ||
343 | + nsList.add( Namespace.XML_NAMESPACE.asXPathResult( element ) ); | ||
344 | + return nsList.iterator(); | ||
345 | + } | ||
346 | + | ||
347 | + public Object getDocumentNode(Object contextNode) | ||
348 | + { | ||
349 | + if ( contextNode instanceof Document ) | ||
350 | + { | ||
351 | + return contextNode; | ||
352 | + } | ||
353 | + else if ( contextNode instanceof Node ) | ||
354 | + { | ||
355 | + Node node = (Node) contextNode; | ||
356 | + return node.getDocument(); | ||
357 | + } | ||
358 | + return null; | ||
359 | + } | ||
360 | + | ||
361 | + /** Returns a parsed form of the given XPath string, which will be suitable | ||
362 | + * for queries on DOM4J documents. | ||
363 | + */ | ||
364 | + public XPath parseXPath (String xpath) throws SAXPathException | ||
365 | + { | ||
366 | + return new Dom4jXPath(xpath); | ||
367 | + } | ||
368 | + | ||
369 | + public Object getParentNode(Object contextNode) | ||
370 | + { | ||
371 | + if ( contextNode instanceof Node ) | ||
372 | + { | ||
373 | + Node node = (Node) contextNode; | ||
374 | + Object answer = node.getParent(); | ||
375 | + if ( answer == null ) | ||
376 | + { | ||
377 | + answer = node.getDocument(); | ||
378 | + if (answer == contextNode) { | ||
379 | + return null; | ||
380 | + } | ||
381 | + } | ||
382 | + return answer; | ||
383 | + } | ||
384 | + return null; | ||
385 | + } | ||
386 | + | ||
387 | + public String getTextStringValue(Object obj) | ||
388 | + { | ||
389 | + return getNodeStringValue( (Node) obj ); | ||
390 | + } | ||
391 | + | ||
392 | + public String getElementStringValue(Object obj) | ||
393 | + { | ||
394 | + return getNodeStringValue( (Node) obj ); | ||
395 | + } | ||
396 | + | ||
397 | + public String getAttributeStringValue(Object obj) | ||
398 | + { | ||
399 | + return getNodeStringValue( (Node) obj ); | ||
400 | + } | ||
401 | + | ||
402 | + private String getNodeStringValue(Node node) | ||
403 | + { | ||
404 | + return node.getStringValue(); | ||
405 | + } | ||
406 | + | ||
407 | + public String getNamespaceStringValue(Object obj) | ||
408 | + { | ||
409 | + Namespace ns = (Namespace) obj; | ||
410 | + | ||
411 | + return ns.getURI(); | ||
412 | + } | ||
413 | + | ||
414 | + public String getNamespacePrefix(Object obj) | ||
415 | + { | ||
416 | + Namespace ns = (Namespace) obj; | ||
417 | + | ||
418 | + return ns.getPrefix(); | ||
419 | + } | ||
420 | + | ||
421 | + public String getCommentStringValue(Object obj) | ||
422 | + { | ||
423 | + Comment cmt = (Comment) obj; | ||
424 | + | ||
425 | + return cmt.getText(); | ||
426 | + } | ||
427 | + | ||
428 | + public String translateNamespacePrefixToUri(String prefix, Object context) | ||
429 | + { | ||
430 | + Element element = null; | ||
431 | + if ( context instanceof Element ) | ||
432 | + { | ||
433 | + element = (Element) context; | ||
434 | + } | ||
435 | + else if ( context instanceof Node ) | ||
436 | + { | ||
437 | + Node node = (Node) context; | ||
438 | + element = node.getParent(); | ||
439 | + } | ||
440 | + if ( element != null ) | ||
441 | + { | ||
442 | + Namespace namespace = element.getNamespaceForPrefix( prefix ); | ||
443 | + | ||
444 | + if ( namespace != null ) | ||
445 | + { | ||
446 | + return namespace.getURI(); | ||
447 | + } | ||
448 | + } | ||
449 | + return null; | ||
450 | + } | ||
451 | + | ||
452 | + public short getNodeType(Object node) | ||
453 | + { | ||
454 | + if ( node instanceof Node ) | ||
455 | + { | ||
456 | + return ((Node) node).getNodeType(); | ||
457 | + } | ||
458 | + return 0; | ||
459 | + } | ||
460 | + | ||
461 | + public Object getDocument(String uri) throws FunctionCallException | ||
462 | + { | ||
463 | + try | ||
464 | + { | ||
465 | + return getSAXReader().read( uri ); | ||
466 | + } | ||
467 | + catch (DocumentException e) | ||
468 | + { | ||
469 | + throw new FunctionCallException("Failed to parse document for URI: " + uri, e); | ||
470 | + } | ||
471 | + } | ||
472 | + | ||
473 | + public String getProcessingInstructionTarget(Object obj) | ||
474 | + { | ||
475 | + ProcessingInstruction pi = (ProcessingInstruction) obj; | ||
476 | + | ||
477 | + return pi.getTarget(); | ||
478 | + } | ||
479 | + | ||
480 | + public String getProcessingInstructionData(Object obj) | ||
481 | + { | ||
482 | + ProcessingInstruction pi = (ProcessingInstruction) obj; | ||
483 | + | ||
484 | + return pi.getText(); | ||
485 | + } | ||
486 | + | ||
487 | + // Properties | ||
488 | + //------------------------------------------------------------------------- | ||
489 | + public SAXReader getSAXReader() | ||
490 | + { | ||
491 | + if ( reader == null ) | ||
492 | + { | ||
493 | + reader = new SAXReader(); | ||
494 | + reader.setMergeAdjacentText( true ); | ||
495 | + } | ||
496 | + return reader; | ||
497 | + } | ||
498 | + | ||
499 | + public void setSAXReader(SAXReader reader) | ||
500 | + { | ||
501 | + this.reader = reader; | ||
502 | + } | ||
503 | + | ||
504 | +} | ||
505 | --- dom4j-1.6.1+dfsg.orig/src/java/org/jaxen/dom4j/Dom4jXPath.java | ||
506 | +++ dom4j-1.6.1+dfsg/src/java/org/jaxen/dom4j/Dom4jXPath.java | ||
507 | @@ -0,0 +1,94 @@ | ||
508 | +/* | ||
509 | + * $Header: /home/projects/jaxen/scm/jaxen/src/java/main/org/jaxen/dom4j/Dom4jXPath.java,v 1.8 2006/06/03 20:44:53 elharo Exp $ | ||
510 | + * $Revision: 1.8 $ | ||
511 | + * $Date: 2006/06/03 20:44:53 $ | ||
512 | + * | ||
513 | + * ==================================================================== | ||
514 | + * | ||
515 | + * Copyright 2000-2002 bob mcwhirter & James Strachan. | ||
516 | + * All rights reserved. | ||
517 | + * | ||
518 | + * Redistribution and use in source and binary forms, with or without | ||
519 | + * modification, are permitted provided that the following conditions are | ||
520 | + * met: | ||
521 | + * | ||
522 | + * * Redistributions of source code must retain the above copyright | ||
523 | + * notice, this list of conditions and the following disclaimer. | ||
524 | + * | ||
525 | + * * Redistributions in binary form must reproduce the above copyright | ||
526 | + * notice, this list of conditions and the following disclaimer in the | ||
527 | + * documentation and/or other materials provided with the distribution. | ||
528 | + * | ||
529 | + * * Neither the name of the Jaxen Project nor the names of its | ||
530 | + * contributors may be used to endorse or promote products derived | ||
531 | + * from this software without specific prior written permission. | ||
532 | + * | ||
533 | + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS | ||
534 | + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||
535 | + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A | ||
536 | + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER | ||
537 | + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
538 | + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
539 | + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
540 | + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
541 | + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
542 | + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
543 | + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
544 | + * | ||
545 | + * ==================================================================== | ||
546 | + * This software consists of voluntary contributions made by many | ||
547 | + * individuals on behalf of the Jaxen Project and was originally | ||
548 | + * created by bob mcwhirter <bob@werken.com> and | ||
549 | + * James Strachan <jstrachan@apache.org>. For more information on the | ||
550 | + * Jaxen Project, please see <http://www.jaxen.org/>. | ||
551 | + * | ||
552 | + * $Id: Dom4jXPath.java,v 1.8 2006/06/03 20:44:53 elharo Exp $ | ||
553 | + */ | ||
554 | + | ||
555 | + | ||
556 | + | ||
557 | +package org.jaxen.dom4j; | ||
558 | + | ||
559 | +import org.jaxen.BaseXPath; | ||
560 | +import org.jaxen.JaxenException; | ||
561 | + | ||
562 | +/** An XPath implementation for the dom4j model | ||
563 | + * | ||
564 | + * <p>This is the main entry point for matching an XPath against a DOM | ||
565 | + * tree. You create a compiled XPath object, then match it against | ||
566 | + * one or more context nodes using the {@link #selectNodes(Object)} | ||
567 | + * method, as in the following example:</p> | ||
568 | + * | ||
569 | + * <pre> | ||
570 | + * Node node = ...; | ||
571 | + * XPath path = new Dom4jXPath("a/b/c"); | ||
572 | + * List results = path.selectNodes(node); | ||
573 | + * </pre> | ||
574 | + * | ||
575 | + * @see BaseXPath | ||
576 | + * @see <a href="http://dom4j.org/">The dom4j website</a> | ||
577 | + * | ||
578 | + * @author <a href="mailto:bob@werken.com">bob mcwhirter</a> | ||
579 | + * @author <a href="mailto:jstachan@apache.org">James Strachan</a> | ||
580 | + * | ||
581 | + * @version $Revision: 1.8 $ | ||
582 | + */ | ||
583 | +public class Dom4jXPath extends BaseXPath | ||
584 | +{ | ||
585 | + /** | ||
586 | + * | ||
587 | + */ | ||
588 | + private static final long serialVersionUID = -75510941087659775L; | ||
589 | + | ||
590 | + /** Construct given an XPath expression string. | ||
591 | + * | ||
592 | + * @param xpathExpr the XPath expression | ||
593 | + * | ||
594 | + * @throws JaxenException if there is a syntax error while | ||
595 | + * parsing the expression | ||
596 | + */ | ||
597 | + public Dom4jXPath(String xpathExpr) throws JaxenException | ||
598 | + { | ||
599 | + super( xpathExpr, DocumentNavigator.getInstance() ); | ||
600 | + } | ||
601 | +} | ||
602 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMAttribute.java | ||
603 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMAttribute.java | ||
604 | @@ -14,7 +14,10 @@ | ||
605 | import org.w3c.dom.DOMException; | ||
606 | import org.w3c.dom.Document; | ||
607 | import org.w3c.dom.NamedNodeMap; | ||
608 | +import org.w3c.dom.Node; | ||
609 | import org.w3c.dom.NodeList; | ||
610 | +import org.w3c.dom.TypeInfo; | ||
611 | +import org.w3c.dom.UserDataHandler; | ||
612 | |||
613 | /** | ||
614 | * <p> | ||
615 | @@ -179,6 +182,76 @@ | ||
616 | public org.w3c.dom.Element getOwnerElement() { | ||
617 | return DOMNodeHelper.asDOMElement(getParent()); | ||
618 | } | ||
619 | + | ||
620 | + public TypeInfo getSchemaTypeInfo() { | ||
621 | + // TODO Auto-generated method stub | ||
622 | + return null; | ||
623 | + } | ||
624 | + | ||
625 | + public boolean isId() { | ||
626 | + // TODO Auto-generated method stub | ||
627 | + return false; | ||
628 | + } | ||
629 | + | ||
630 | + public String getBaseURI() { | ||
631 | + // TODO Auto-generated method stub | ||
632 | + return null; | ||
633 | + } | ||
634 | + | ||
635 | + public short compareDocumentPosition(Node other) throws DOMException { | ||
636 | + // TODO Auto-generated method stub | ||
637 | + return 0; | ||
638 | + } | ||
639 | + | ||
640 | + public String getTextContent() throws DOMException { | ||
641 | + // TODO Auto-generated method stub | ||
642 | + return null; | ||
643 | + } | ||
644 | + | ||
645 | + public void setTextContent(String textContent) throws DOMException { | ||
646 | + // TODO Auto-generated method stub | ||
647 | + | ||
648 | + } | ||
649 | + | ||
650 | + public boolean isSameNode(Node other) { | ||
651 | + // TODO Auto-generated method stub | ||
652 | + return false; | ||
653 | + } | ||
654 | + | ||
655 | + public String lookupPrefix(String namespaceURI) { | ||
656 | + // TODO Auto-generated method stub | ||
657 | + return null; | ||
658 | + } | ||
659 | + | ||
660 | + public boolean isDefaultNamespace(String namespaceURI) { | ||
661 | + // TODO Auto-generated method stub | ||
662 | + return false; | ||
663 | + } | ||
664 | + | ||
665 | + public String lookupNamespaceURI(String prefix) { | ||
666 | + // TODO Auto-generated method stub | ||
667 | + return null; | ||
668 | + } | ||
669 | + | ||
670 | + public boolean isEqualNode(Node arg) { | ||
671 | + // TODO Auto-generated method stub | ||
672 | + return false; | ||
673 | + } | ||
674 | + | ||
675 | + public Object getFeature(String feature, String version) { | ||
676 | + // TODO Auto-generated method stub | ||
677 | + return null; | ||
678 | + } | ||
679 | + | ||
680 | + public Object setUserData(String key, Object data, UserDataHandler handler) { | ||
681 | + // TODO Auto-generated method stub | ||
682 | + return null; | ||
683 | + } | ||
684 | + | ||
685 | + public Object getUserData(String key) { | ||
686 | + // TODO Auto-generated method stub | ||
687 | + return null; | ||
688 | + } | ||
689 | } | ||
690 | |||
691 | /* | ||
692 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMCDATA.java | ||
693 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMCDATA.java | ||
694 | @@ -14,7 +14,10 @@ | ||
695 | import org.w3c.dom.DOMException; | ||
696 | import org.w3c.dom.Document; | ||
697 | import org.w3c.dom.NamedNodeMap; | ||
698 | +import org.w3c.dom.Node; | ||
699 | import org.w3c.dom.NodeList; | ||
700 | +import org.w3c.dom.Text; | ||
701 | +import org.w3c.dom.UserDataHandler; | ||
702 | |||
703 | /** | ||
704 | * <p> | ||
705 | @@ -225,6 +228,81 @@ | ||
706 | protected CDATA createCDATA(String text) { | ||
707 | return new DOMCDATA(text); | ||
708 | } | ||
709 | + | ||
710 | + public boolean isElementContentWhitespace() { | ||
711 | + // TODO Auto-generated method stub | ||
712 | + return false; | ||
713 | + } | ||
714 | + | ||
715 | + public String getWholeText() { | ||
716 | + // TODO Auto-generated method stub | ||
717 | + return null; | ||
718 | + } | ||
719 | + | ||
720 | + public Text replaceWholeText(String content) throws DOMException { | ||
721 | + // TODO Auto-generated method stub | ||
722 | + return null; | ||
723 | + } | ||
724 | + | ||
725 | + public String getBaseURI() { | ||
726 | + // TODO Auto-generated method stub | ||
727 | + return null; | ||
728 | + } | ||
729 | + | ||
730 | + public short compareDocumentPosition(Node other) throws DOMException { | ||
731 | + // TODO Auto-generated method stub | ||
732 | + return 0; | ||
733 | + } | ||
734 | + | ||
735 | + public String getTextContent() throws DOMException { | ||
736 | + // TODO Auto-generated method stub | ||
737 | + return null; | ||
738 | + } | ||
739 | + | ||
740 | + public void setTextContent(String textContent) throws DOMException { | ||
741 | + // TODO Auto-generated method stub | ||
742 | + | ||
743 | + } | ||
744 | + | ||
745 | + public boolean isSameNode(Node other) { | ||
746 | + // TODO Auto-generated method stub | ||
747 | + return false; | ||
748 | + } | ||
749 | + | ||
750 | + public String lookupPrefix(String namespaceURI) { | ||
751 | + // TODO Auto-generated method stub | ||
752 | + return null; | ||
753 | + } | ||
754 | + | ||
755 | + public boolean isDefaultNamespace(String namespaceURI) { | ||
756 | + // TODO Auto-generated method stub | ||
757 | + return false; | ||
758 | + } | ||
759 | + | ||
760 | + public String lookupNamespaceURI(String prefix) { | ||
761 | + // TODO Auto-generated method stub | ||
762 | + return null; | ||
763 | + } | ||
764 | + | ||
765 | + public boolean isEqualNode(Node arg) { | ||
766 | + // TODO Auto-generated method stub | ||
767 | + return false; | ||
768 | + } | ||
769 | + | ||
770 | + public Object getFeature(String feature, String version) { | ||
771 | + // TODO Auto-generated method stub | ||
772 | + return null; | ||
773 | + } | ||
774 | + | ||
775 | + public Object setUserData(String key, Object data, UserDataHandler handler) { | ||
776 | + // TODO Auto-generated method stub | ||
777 | + return null; | ||
778 | + } | ||
779 | + | ||
780 | + public Object getUserData(String key) { | ||
781 | + // TODO Auto-generated method stub | ||
782 | + return null; | ||
783 | + } | ||
784 | } | ||
785 | |||
786 | /* | ||
787 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMComment.java | ||
788 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMComment.java | ||
789 | @@ -13,7 +13,9 @@ | ||
790 | import org.w3c.dom.DOMException; | ||
791 | import org.w3c.dom.Document; | ||
792 | import org.w3c.dom.NamedNodeMap; | ||
793 | +import org.w3c.dom.Node; | ||
794 | import org.w3c.dom.NodeList; | ||
795 | +import org.w3c.dom.UserDataHandler; | ||
796 | |||
797 | /** | ||
798 | * <p> | ||
799 | @@ -187,6 +189,66 @@ | ||
800 | throws DOMException { | ||
801 | DOMNodeHelper.replaceData(this, offset, count, arg); | ||
802 | } | ||
803 | + | ||
804 | + public String getBaseURI() { | ||
805 | + // TODO Auto-generated method stub | ||
806 | + return null; | ||
807 | + } | ||
808 | + | ||
809 | + public short compareDocumentPosition(Node other) throws DOMException { | ||
810 | + // TODO Auto-generated method stub | ||
811 | + return 0; | ||
812 | + } | ||
813 | + | ||
814 | + public String getTextContent() throws DOMException { | ||
815 | + // TODO Auto-generated method stub | ||
816 | + return null; | ||
817 | + } | ||
818 | + | ||
819 | + public void setTextContent(String textContent) throws DOMException { | ||
820 | + // TODO Auto-generated method stub | ||
821 | + | ||
822 | + } | ||
823 | + | ||
824 | + public boolean isSameNode(Node other) { | ||
825 | + // TODO Auto-generated method stub | ||
826 | + return false; | ||
827 | + } | ||
828 | + | ||
829 | + public String lookupPrefix(String namespaceURI) { | ||
830 | + // TODO Auto-generated method stub | ||
831 | + return null; | ||
832 | + } | ||
833 | + | ||
834 | + public boolean isDefaultNamespace(String namespaceURI) { | ||
835 | + // TODO Auto-generated method stub | ||
836 | + return false; | ||
837 | + } | ||
838 | + | ||
839 | + public String lookupNamespaceURI(String prefix) { | ||
840 | + // TODO Auto-generated method stub | ||
841 | + return null; | ||
842 | + } | ||
843 | + | ||
844 | + public boolean isEqualNode(Node arg) { | ||
845 | + // TODO Auto-generated method stub | ||
846 | + return false; | ||
847 | + } | ||
848 | + | ||
849 | + public Object getFeature(String feature, String version) { | ||
850 | + // TODO Auto-generated method stub | ||
851 | + return null; | ||
852 | + } | ||
853 | + | ||
854 | + public Object setUserData(String key, Object data, UserDataHandler handler) { | ||
855 | + // TODO Auto-generated method stub | ||
856 | + return null; | ||
857 | + } | ||
858 | + | ||
859 | + public Object getUserData(String key) { | ||
860 | + // TODO Auto-generated method stub | ||
861 | + return null; | ||
862 | + } | ||
863 | } | ||
864 | |||
865 | /* | ||
866 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMDocumentFactory.java | ||
867 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMDocumentFactory.java | ||
868 | @@ -174,6 +174,11 @@ | ||
869 | docType.getPublicId(), docType.getSystemId()); | ||
870 | } | ||
871 | } | ||
872 | + | ||
873 | + public Object getFeature(String arg0, String arg1) { | ||
874 | + // TODO Auto-generated method stub | ||
875 | + return null; | ||
876 | + } | ||
877 | } | ||
878 | |||
879 | |||
880 | @@ -213,4 +218,4 @@ | ||
881 | * POSSIBILITY OF SUCH DAMAGE. | ||
882 | * | ||
883 | * Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. | ||
884 | - */ | ||
885 | \ No newline at end of file | ||
886 | + */ | ||
887 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMDocument.java | ||
888 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMDocument.java | ||
889 | @@ -15,12 +15,15 @@ | ||
890 | |||
891 | import org.w3c.dom.Attr; | ||
892 | import org.w3c.dom.CDATASection; | ||
893 | +import org.w3c.dom.DOMConfiguration; | ||
894 | import org.w3c.dom.DOMException; | ||
895 | import org.w3c.dom.Document; | ||
896 | import org.w3c.dom.EntityReference; | ||
897 | import org.w3c.dom.NamedNodeMap; | ||
898 | +import org.w3c.dom.Node; | ||
899 | import org.w3c.dom.NodeList; | ||
900 | import org.w3c.dom.ProcessingInstruction; | ||
901 | +import org.w3c.dom.UserDataHandler; | ||
902 | |||
903 | /** | ||
904 | * <p> | ||
905 | @@ -301,6 +304,136 @@ | ||
906 | return super.getDocumentFactory(); | ||
907 | } | ||
908 | } | ||
909 | + | ||
910 | + public String getInputEncoding() { | ||
911 | + // TODO Auto-generated method stub | ||
912 | + return null; | ||
913 | + } | ||
914 | + | ||
915 | + public String getXmlEncoding() { | ||
916 | + // TODO Auto-generated method stub | ||
917 | + return null; | ||
918 | + } | ||
919 | + | ||
920 | + public boolean getXmlStandalone() { | ||
921 | + // TODO Auto-generated method stub | ||
922 | + return false; | ||
923 | + } | ||
924 | + | ||
925 | + public void setXmlStandalone(boolean arg0) throws DOMException { | ||
926 | + // TODO Auto-generated method stub | ||
927 | + | ||
928 | + } | ||
929 | + | ||
930 | + public String getXmlVersion() { | ||
931 | + // TODO Auto-generated method stub | ||
932 | + return null; | ||
933 | + } | ||
934 | + | ||
935 | + public void setXmlVersion(String arg0) throws DOMException { | ||
936 | + // TODO Auto-generated method stub | ||
937 | + | ||
938 | + } | ||
939 | + | ||
940 | + public boolean getStrictErrorChecking() { | ||
941 | + // TODO Auto-generated method stub | ||
942 | + return false; | ||
943 | + } | ||
944 | + | ||
945 | + public void setStrictErrorChecking(boolean arg0) { | ||
946 | + // TODO Auto-generated method stub | ||
947 | + | ||
948 | + } | ||
949 | + | ||
950 | + public String getDocumentURI() { | ||
951 | + // TODO Auto-generated method stub | ||
952 | + return null; | ||
953 | + } | ||
954 | + | ||
955 | + public void setDocumentURI(String arg0) { | ||
956 | + // TODO Auto-generated method stub | ||
957 | + | ||
958 | + } | ||
959 | + | ||
960 | + public Node adoptNode(Node arg0) throws DOMException { | ||
961 | + // TODO Auto-generated method stub | ||
962 | + return null; | ||
963 | + } | ||
964 | + | ||
965 | + public DOMConfiguration getDomConfig() { | ||
966 | + // TODO Auto-generated method stub | ||
967 | + return null; | ||
968 | + } | ||
969 | + | ||
970 | + public void normalizeDocument() { | ||
971 | + // TODO Auto-generated method stub | ||
972 | + | ||
973 | + } | ||
974 | + | ||
975 | + public Node renameNode(Node arg0, String arg1, String arg2) throws DOMException { | ||
976 | + // TODO Auto-generated method stub | ||
977 | + return null; | ||
978 | + } | ||
979 | + | ||
980 | + public String getBaseURI() { | ||
981 | + // TODO Auto-generated method stub | ||
982 | + return null; | ||
983 | + } | ||
984 | + | ||
985 | + public short compareDocumentPosition(Node arg0) throws DOMException { | ||
986 | + // TODO Auto-generated method stub | ||
987 | + return 0; | ||
988 | + } | ||
989 | + | ||
990 | + public String getTextContent() throws DOMException { | ||
991 | + // TODO Auto-generated method stub | ||
992 | + return null; | ||
993 | + } | ||
994 | + | ||
995 | + public void setTextContent(String arg0) throws DOMException { | ||
996 | + // TODO Auto-generated method stub | ||
997 | + | ||
998 | + } | ||
999 | + | ||
1000 | + public boolean isSameNode(Node arg0) { | ||
1001 | + // TODO Auto-generated method stub | ||
1002 | + return false; | ||
1003 | + } | ||
1004 | + | ||
1005 | + public String lookupPrefix(String arg0) { | ||
1006 | + // TODO Auto-generated method stub | ||
1007 | + return null; | ||
1008 | + } | ||
1009 | + | ||
1010 | + public boolean isDefaultNamespace(String arg0) { | ||
1011 | + // TODO Auto-generated method stub | ||
1012 | + return false; | ||
1013 | + } | ||
1014 | + | ||
1015 | + public String lookupNamespaceURI(String arg0) { | ||
1016 | + // TODO Auto-generated method stub | ||
1017 | + return null; | ||
1018 | + } | ||
1019 | + | ||
1020 | + public boolean isEqualNode(Node arg0) { | ||
1021 | + // TODO Auto-generated method stub | ||
1022 | + return false; | ||
1023 | + } | ||
1024 | + | ||
1025 | + public Object getFeature(String arg0, String arg1) { | ||
1026 | + // TODO Auto-generated method stub | ||
1027 | + return null; | ||
1028 | + } | ||
1029 | + | ||
1030 | + public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) { | ||
1031 | + // TODO Auto-generated method stub | ||
1032 | + return null; | ||
1033 | + } | ||
1034 | + | ||
1035 | + public Object getUserData(String arg0) { | ||
1036 | + // TODO Auto-generated method stub | ||
1037 | + return null; | ||
1038 | + } | ||
1039 | } | ||
1040 | |||
1041 | /* | ||
1042 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMDocumentType.java | ||
1043 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMDocumentType.java | ||
1044 | @@ -12,7 +12,9 @@ | ||
1045 | import org.w3c.dom.DOMException; | ||
1046 | import org.w3c.dom.Document; | ||
1047 | import org.w3c.dom.NamedNodeMap; | ||
1048 | +import org.w3c.dom.Node; | ||
1049 | import org.w3c.dom.NodeList; | ||
1050 | +import org.w3c.dom.UserDataHandler; | ||
1051 | |||
1052 | /** | ||
1053 | * <p> | ||
1054 | @@ -177,6 +179,66 @@ | ||
1055 | public String getInternalSubset() { | ||
1056 | return getElementName(); | ||
1057 | } | ||
1058 | + | ||
1059 | + public String getBaseURI() { | ||
1060 | + // TODO Auto-generated method stub | ||
1061 | + return null; | ||
1062 | + } | ||
1063 | + | ||
1064 | + public short compareDocumentPosition(Node arg0) throws DOMException { | ||
1065 | + // TODO Auto-generated method stub | ||
1066 | + return 0; | ||
1067 | + } | ||
1068 | + | ||
1069 | + public String getTextContent() throws DOMException { | ||
1070 | + // TODO Auto-generated method stub | ||
1071 | + return null; | ||
1072 | + } | ||
1073 | + | ||
1074 | + public void setTextContent(String arg0) throws DOMException { | ||
1075 | + // TODO Auto-generated method stub | ||
1076 | + | ||
1077 | + } | ||
1078 | + | ||
1079 | + public boolean isSameNode(Node arg0) { | ||
1080 | + // TODO Auto-generated method stub | ||
1081 | + return false; | ||
1082 | + } | ||
1083 | + | ||
1084 | + public String lookupPrefix(String arg0) { | ||
1085 | + // TODO Auto-generated method stub | ||
1086 | + return null; | ||
1087 | + } | ||
1088 | + | ||
1089 | + public boolean isDefaultNamespace(String arg0) { | ||
1090 | + // TODO Auto-generated method stub | ||
1091 | + return false; | ||
1092 | + } | ||
1093 | + | ||
1094 | + public String lookupNamespaceURI(String arg0) { | ||
1095 | + // TODO Auto-generated method stub | ||
1096 | + return null; | ||
1097 | + } | ||
1098 | + | ||
1099 | + public boolean isEqualNode(Node arg0) { | ||
1100 | + // TODO Auto-generated method stub | ||
1101 | + return false; | ||
1102 | + } | ||
1103 | + | ||
1104 | + public Object getFeature(String arg0, String arg1) { | ||
1105 | + // TODO Auto-generated method stub | ||
1106 | + return null; | ||
1107 | + } | ||
1108 | + | ||
1109 | + public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) { | ||
1110 | + // TODO Auto-generated method stub | ||
1111 | + return null; | ||
1112 | + } | ||
1113 | + | ||
1114 | + public Object getUserData(String arg0) { | ||
1115 | + // TODO Auto-generated method stub | ||
1116 | + return null; | ||
1117 | + } | ||
1118 | } | ||
1119 | |||
1120 | /* | ||
1121 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMElement.java | ||
1122 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMElement.java | ||
1123 | @@ -16,11 +16,14 @@ | ||
1124 | import org.dom4j.QName; | ||
1125 | import org.dom4j.tree.DefaultElement; | ||
1126 | |||
1127 | +import org.w3c.dom.Attr; | ||
1128 | import org.w3c.dom.DOMException; | ||
1129 | import org.w3c.dom.Document; | ||
1130 | import org.w3c.dom.NamedNodeMap; | ||
1131 | import org.w3c.dom.Node; | ||
1132 | import org.w3c.dom.NodeList; | ||
1133 | +import org.w3c.dom.TypeInfo; | ||
1134 | +import org.w3c.dom.UserDataHandler; | ||
1135 | |||
1136 | /** | ||
1137 | * <p> | ||
1138 | @@ -389,6 +392,86 @@ | ||
1139 | |||
1140 | return getDocumentFactory().createQName(localName, prefix, namespace); | ||
1141 | } | ||
1142 | + | ||
1143 | + public TypeInfo getSchemaTypeInfo() { | ||
1144 | + // TODO Auto-generated method stub | ||
1145 | + return null; | ||
1146 | + } | ||
1147 | + | ||
1148 | + public void setIdAttribute(String arg0, boolean arg1) throws DOMException { | ||
1149 | + // TODO Auto-generated method stub | ||
1150 | + | ||
1151 | + } | ||
1152 | + | ||
1153 | + public void setIdAttributeNS(String arg0, String arg1, boolean arg2) throws DOMException { | ||
1154 | + // TODO Auto-generated method stub | ||
1155 | + | ||
1156 | + } | ||
1157 | + | ||
1158 | + public void setIdAttributeNode(Attr arg0, boolean arg1) throws DOMException { | ||
1159 | + // TODO Auto-generated method stub | ||
1160 | + | ||
1161 | + } | ||
1162 | + | ||
1163 | + public String getBaseURI() { | ||
1164 | + // TODO Auto-generated method stub | ||
1165 | + return null; | ||
1166 | + } | ||
1167 | + | ||
1168 | + public short compareDocumentPosition(Node arg0) throws DOMException { | ||
1169 | + // TODO Auto-generated method stub | ||
1170 | + return 0; | ||
1171 | + } | ||
1172 | + | ||
1173 | + public String getTextContent() throws DOMException { | ||
1174 | + // TODO Auto-generated method stub | ||
1175 | + return null; | ||
1176 | + } | ||
1177 | + | ||
1178 | + public void setTextContent(String arg0) throws DOMException { | ||
1179 | + // TODO Auto-generated method stub | ||
1180 | + | ||
1181 | + } | ||
1182 | + | ||
1183 | + public boolean isSameNode(Node arg0) { | ||
1184 | + // TODO Auto-generated method stub | ||
1185 | + return false; | ||
1186 | + } | ||
1187 | + | ||
1188 | + public String lookupPrefix(String arg0) { | ||
1189 | + // TODO Auto-generated method stub | ||
1190 | + return null; | ||
1191 | + } | ||
1192 | + | ||
1193 | + public boolean isDefaultNamespace(String arg0) { | ||
1194 | + // TODO Auto-generated method stub | ||
1195 | + return false; | ||
1196 | + } | ||
1197 | + | ||
1198 | + public String lookupNamespaceURI(String arg0) { | ||
1199 | + // TODO Auto-generated method stub | ||
1200 | + return null; | ||
1201 | + } | ||
1202 | + | ||
1203 | + public boolean isEqualNode(Node arg0) { | ||
1204 | + // TODO Auto-generated method stub | ||
1205 | + return false; | ||
1206 | + } | ||
1207 | + | ||
1208 | + public Object getFeature(String arg0, String arg1) { | ||
1209 | + // TODO Auto-generated method stub | ||
1210 | + return null; | ||
1211 | + } | ||
1212 | + | ||
1213 | + public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) { | ||
1214 | + // TODO Auto-generated method stub | ||
1215 | + return null; | ||
1216 | + } | ||
1217 | + | ||
1218 | + public Object getUserData(String arg0) { | ||
1219 | + // TODO Auto-generated method stub | ||
1220 | + return null; | ||
1221 | + } | ||
1222 | } | ||
1223 | |||
1224 | /* | ||
1225 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMEntityReference.java | ||
1226 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMEntityReference.java | ||
1227 | @@ -13,7 +13,9 @@ | ||
1228 | import org.w3c.dom.DOMException; | ||
1229 | import org.w3c.dom.Document; | ||
1230 | import org.w3c.dom.NamedNodeMap; | ||
1231 | +import org.w3c.dom.Node; | ||
1232 | import org.w3c.dom.NodeList; | ||
1233 | +import org.w3c.dom.UserDataHandler; | ||
1234 | |||
1235 | /** | ||
1236 | * <p> | ||
1237 | @@ -166,6 +168,66 @@ | ||
1238 | public boolean hasAttributes() { | ||
1239 | return DOMNodeHelper.hasAttributes(this); | ||
1240 | } | ||
1241 | + | ||
1242 | + public String getBaseURI() { | ||
1243 | + // TODO Auto-generated method stub | ||
1244 | + return null; | ||
1245 | + } | ||
1246 | + | ||
1247 | + public short compareDocumentPosition(Node arg0) throws DOMException { | ||
1248 | + // TODO Auto-generated method stub | ||
1249 | + return 0; | ||
1250 | + } | ||
1251 | + | ||
1252 | + public String getTextContent() throws DOMException { | ||
1253 | + // TODO Auto-generated method stub | ||
1254 | + return null; | ||
1255 | + } | ||
1256 | + | ||
1257 | + public void setTextContent(String arg0) throws DOMException { | ||
1258 | + // TODO Auto-generated method stub | ||
1259 | + | ||
1260 | + } | ||
1261 | + | ||
1262 | + public boolean isSameNode(Node arg0) { | ||
1263 | + // TODO Auto-generated method stub | ||
1264 | + return false; | ||
1265 | + } | ||
1266 | + | ||
1267 | + public String lookupPrefix(String arg0) { | ||
1268 | + // TODO Auto-generated method stub | ||
1269 | + return null; | ||
1270 | + } | ||
1271 | + | ||
1272 | + public boolean isDefaultNamespace(String arg0) { | ||
1273 | + // TODO Auto-generated method stub | ||
1274 | + return false; | ||
1275 | + } | ||
1276 | + | ||
1277 | + public String lookupNamespaceURI(String arg0) { | ||
1278 | + // TODO Auto-generated method stub | ||
1279 | + return null; | ||
1280 | + } | ||
1281 | + | ||
1282 | + public boolean isEqualNode(Node arg0) { | ||
1283 | + // TODO Auto-generated method stub | ||
1284 | + return false; | ||
1285 | + } | ||
1286 | + | ||
1287 | + public Object getFeature(String arg0, String arg1) { | ||
1288 | + // TODO Auto-generated method stub | ||
1289 | + return null; | ||
1290 | + } | ||
1291 | + | ||
1292 | + public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) { | ||
1293 | + // TODO Auto-generated method stub | ||
1294 | + return null; | ||
1295 | + } | ||
1296 | + | ||
1297 | + public Object getUserData(String arg0) { | ||
1298 | + // TODO Auto-generated method stub | ||
1299 | + return null; | ||
1300 | + } | ||
1301 | } | ||
1302 | |||
1303 | /* | ||
1304 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMNamespace.java | ||
1305 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMNamespace.java | ||
1306 | @@ -13,7 +13,9 @@ | ||
1307 | import org.w3c.dom.DOMException; | ||
1308 | import org.w3c.dom.Document; | ||
1309 | import org.w3c.dom.NamedNodeMap; | ||
1310 | +import org.w3c.dom.Node; | ||
1311 | import org.w3c.dom.NodeList; | ||
1312 | +import org.w3c.dom.UserDataHandler; | ||
1313 | |||
1314 | /** | ||
1315 | * <p> | ||
1316 | @@ -140,6 +142,66 @@ | ||
1317 | public boolean hasAttributes() { | ||
1318 | return DOMNodeHelper.hasAttributes(this); | ||
1319 | } | ||
1320 | + | ||
1321 | + public String getBaseURI() { | ||
1322 | + // TODO Auto-generated method stub | ||
1323 | + return null; | ||
1324 | + } | ||
1325 | + | ||
1326 | + public short compareDocumentPosition(Node arg0) throws DOMException { | ||
1327 | + // TODO Auto-generated method stub | ||
1328 | + return 0; | ||
1329 | + } | ||
1330 | + | ||
1331 | + public String getTextContent() throws DOMException { | ||
1332 | + // TODO Auto-generated method stub | ||
1333 | + return null; | ||
1334 | + } | ||
1335 | + | ||
1336 | + public void setTextContent(String arg0) throws DOMException { | ||
1337 | + // TODO Auto-generated method stub | ||
1338 | + | ||
1339 | + } | ||
1340 | + | ||
1341 | + public boolean isSameNode(Node arg0) { | ||
1342 | + // TODO Auto-generated method stub | ||
1343 | + return false; | ||
1344 | + } | ||
1345 | + | ||
1346 | + public String lookupPrefix(String arg0) { | ||
1347 | + // TODO Auto-generated method stub | ||
1348 | + return null; | ||
1349 | + } | ||
1350 | + | ||
1351 | + public boolean isDefaultNamespace(String arg0) { | ||
1352 | + // TODO Auto-generated method stub | ||
1353 | + return false; | ||
1354 | + } | ||
1355 | + | ||
1356 | + public String lookupNamespaceURI(String arg0) { | ||
1357 | + // TODO Auto-generated method stub | ||
1358 | + return null; | ||
1359 | + } | ||
1360 | + | ||
1361 | + public boolean isEqualNode(Node arg0) { | ||
1362 | + // TODO Auto-generated method stub | ||
1363 | + return false; | ||
1364 | + } | ||
1365 | + | ||
1366 | + public Object getFeature(String arg0, String arg1) { | ||
1367 | + // TODO Auto-generated method stub | ||
1368 | + return null; | ||
1369 | + } | ||
1370 | + | ||
1371 | + public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) { | ||
1372 | + // TODO Auto-generated method stub | ||
1373 | + return null; | ||
1374 | + } | ||
1375 | + | ||
1376 | + public Object getUserData(String arg0) { | ||
1377 | + // TODO Auto-generated method stub | ||
1378 | + return null; | ||
1379 | + } | ||
1380 | } | ||
1381 | |||
1382 | /* | ||
1383 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMProcessingInstruction.java | ||
1384 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMProcessingInstruction.java | ||
1385 | @@ -15,7 +15,9 @@ | ||
1386 | import org.w3c.dom.DOMException; | ||
1387 | import org.w3c.dom.Document; | ||
1388 | import org.w3c.dom.NamedNodeMap; | ||
1389 | +import org.w3c.dom.Node; | ||
1390 | import org.w3c.dom.NodeList; | ||
1391 | +import org.w3c.dom.UserDataHandler; | ||
1392 | |||
1393 | /** | ||
1394 | * <p> | ||
1395 | @@ -177,6 +179,66 @@ | ||
1396 | } | ||
1397 | } | ||
1398 | |||
1399 | + public String getBaseURI() { | ||
1400 | + // TODO Auto-generated method stub | ||
1401 | + return null; | ||
1402 | + } | ||
1403 | + | ||
1404 | + public short compareDocumentPosition(Node arg0) throws DOMException { | ||
1405 | + // TODO Auto-generated method stub | ||
1406 | + return 0; | ||
1407 | + } | ||
1408 | + | ||
1409 | + public String getTextContent() throws DOMException { | ||
1410 | + // TODO Auto-generated method stub | ||
1411 | + return null; | ||
1412 | + } | ||
1413 | + | ||
1414 | + public void setTextContent(String arg0) throws DOMException { | ||
1415 | + // TODO Auto-generated method stub | ||
1416 | + | ||
1417 | + } | ||
1418 | + | ||
1419 | + public boolean isSameNode(Node arg0) { | ||
1420 | + // TODO Auto-generated method stub | ||
1421 | + return false; | ||
1422 | + } | ||
1423 | + | ||
1424 | + public String lookupPrefix(String arg0) { | ||
1425 | + // TODO Auto-generated method stub | ||
1426 | + return null; | ||
1427 | + } | ||
1428 | + | ||
1429 | + public boolean isDefaultNamespace(String arg0) { | ||
1430 | + // TODO Auto-generated method stub | ||
1431 | + return false; | ||
1432 | + } | ||
1433 | + | ||
1434 | + public String lookupNamespaceURI(String arg0) { | ||
1435 | + // TODO Auto-generated method stub | ||
1436 | + return null; | ||
1437 | + } | ||
1438 | + | ||
1439 | + public boolean isEqualNode(Node arg0) { | ||
1440 | + // TODO Auto-generated method stub | ||
1441 | + return false; | ||
1442 | + } | ||
1443 | + | ||
1444 | + public Object getFeature(String arg0, String arg1) { | ||
1445 | + // TODO Auto-generated method stub | ||
1446 | + return null; | ||
1447 | + } | ||
1448 | + | ||
1449 | + public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) { | ||
1450 | + // TODO Auto-generated method stub | ||
1451 | + return null; | ||
1452 | + } | ||
1453 | + | ||
1454 | + public Object getUserData(String arg0) { | ||
1455 | + // TODO Auto-generated method stub | ||
1456 | + return null; | ||
1457 | + } | ||
1458 | + | ||
1459 | // Implementation methods | ||
1460 | // ------------------------------------------------------------------------- | ||
1461 | } | ||
1462 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/dom/DOMText.java | ||
1463 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/dom/DOMText.java | ||
1464 | @@ -14,7 +14,9 @@ | ||
1465 | import org.w3c.dom.DOMException; | ||
1466 | import org.w3c.dom.Document; | ||
1467 | import org.w3c.dom.NamedNodeMap; | ||
1468 | +import org.w3c.dom.Node; | ||
1469 | import org.w3c.dom.NodeList; | ||
1470 | +import org.w3c.dom.UserDataHandler; | ||
1471 | |||
1472 | /** | ||
1473 | * <p> | ||
1474 | @@ -224,6 +226,81 @@ | ||
1475 | protected Text createText(String text) { | ||
1476 | return new DOMText(text); | ||
1477 | } | ||
1478 | + | ||
1479 | + public boolean isElementContentWhitespace() { | ||
1480 | + // TODO Auto-generated method stub | ||
1481 | + return false; | ||
1482 | + } | ||
1483 | + | ||
1484 | + public String getWholeText() { | ||
1485 | + // TODO Auto-generated method stub | ||
1486 | + return null; | ||
1487 | + } | ||
1488 | + | ||
1489 | + public org.w3c.dom.Text replaceWholeText(String arg0) throws DOMException { | ||
1490 | + // TODO Auto-generated method stub | ||
1491 | + return null; | ||
1492 | + } | ||
1493 | + | ||
1494 | + public String getBaseURI() { | ||
1495 | + // TODO Auto-generated method stub | ||
1496 | + return null; | ||
1497 | + } | ||
1498 | + | ||
1499 | + public short compareDocumentPosition(Node arg0) throws DOMException { | ||
1500 | + // TODO Auto-generated method stub | ||
1501 | + return 0; | ||
1502 | + } | ||
1503 | + | ||
1504 | + public String getTextContent() throws DOMException { | ||
1505 | + // TODO Auto-generated method stub | ||
1506 | + return null; | ||
1507 | + } | ||
1508 | + | ||
1509 | + public void setTextContent(String arg0) throws DOMException { | ||
1510 | + // TODO Auto-generated method stub | ||
1511 | + | ||
1512 | + } | ||
1513 | + | ||
1514 | + public boolean isSameNode(Node arg0) { | ||
1515 | + // TODO Auto-generated method stub | ||
1516 | + return false; | ||
1517 | + } | ||
1518 | + | ||
1519 | + public String lookupPrefix(String arg0) { | ||
1520 | + // TODO Auto-generated method stub | ||
1521 | + return null; | ||
1522 | + } | ||
1523 | + | ||
1524 | + public boolean isDefaultNamespace(String arg0) { | ||
1525 | + // TODO Auto-generated method stub | ||
1526 | + return false; | ||
1527 | + } | ||
1528 | + | ||
1529 | + public String lookupNamespaceURI(String arg0) { | ||
1530 | + // TODO Auto-generated method stub | ||
1531 | + return null; | ||
1532 | + } | ||
1533 | + | ||
1534 | + public boolean isEqualNode(Node arg0) { | ||
1535 | + // TODO Auto-generated method stub | ||
1536 | + return false; | ||
1537 | + } | ||
1538 | + | ||
1539 | + public Object getFeature(String arg0, String arg1) { | ||
1540 | + // TODO Auto-generated method stub | ||
1541 | + return null; | ||
1542 | + } | ||
1543 | + | ||
1544 | + public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) { | ||
1545 | + // TODO Auto-generated method stub | ||
1546 | + return null; | ||
1547 | + } | ||
1548 | + | ||
1549 | + public Object getUserData(String arg0) { | ||
1550 | + // TODO Auto-generated method stub | ||
1551 | + return null; | ||
1552 | + } | ||
1553 | } | ||
1554 | |||
1555 | /* | ||
1556 | --- dom4j-1.6.1+dfsg.orig/src/java/org/dom4j/tree/NamespaceCache.java | ||
1557 | +++ dom4j-1.6.1+dfsg/src/java/org/dom4j/tree/NamespaceCache.java | ||
1558 | @@ -26,42 +26,46 @@ | ||
1559 | * @version $Revision: 1.15 $ | ||
1560 | */ | ||
1561 | public class NamespaceCache { | ||
1562 | - private static final String CONCURRENTREADERHASHMAP_CLASS | ||
1563 | - = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap"; | ||
1564 | + private static final String BACKPORT_CONCURRENTHASHMAP_CLASS | ||
1565 | + = "edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap"; | ||
1566 | + private static final String OSWEGO_CONCURRENTHASHMAP_CLASS | ||
1567 | + = "EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap"; | ||
1568 | |||
1569 | /** | ||
1570 | * Cache of {@link Map}instances indexed by URI which contain caches of | ||
1571 | * {@link Namespace}for each prefix | ||
1572 | */ | ||
1573 | - protected static Map cache; | ||
1574 | + protected static Map cache = newConcurrentHashMap(); | ||
1575 | |||
1576 | /** | ||
1577 | * Cache of {@link Namespace}instances indexed by URI for default | ||
1578 | * namespaces with no prefixes | ||
1579 | */ | ||
1580 | - protected static Map noPrefixCache; | ||
1581 | + protected static Map noPrefixCache = newConcurrentHashMap(); | ||
1582 | |||
1583 | - static { | ||
1584 | + protected static Map newConcurrentHashMap() | ||
1585 | + { | ||
1586 | /* Try the java.util.concurrent.ConcurrentHashMap first. */ | ||
1587 | try { | ||
1588 | Class clazz = Class | ||
1589 | .forName("java.util.concurrent.ConcurrentHashMap"); | ||
1590 | Constructor construct = clazz.getConstructor(new Class[] { | ||
1591 | Integer.TYPE, Float.TYPE, Integer.TYPE }); | ||
1592 | - cache = (Map) construct.newInstance(new Object[] {new Integer(11), | ||
1593 | + return (Map) construct.newInstance(new Object[] {new Integer(11), | ||
1594 | new Float(0.75f), new Integer(1) }); | ||
1595 | - noPrefixCache = (Map) construct.newInstance(new Object[] { | ||
1596 | - new Integer(11), new Float(0.75f), new Integer(1) }); | ||
1597 | } catch (Throwable t1) { | ||
1598 | - /* Try to use the util.concurrent library (if in classpath) */ | ||
1599 | try { | ||
1600 | - Class clazz = Class.forName(CONCURRENTREADERHASHMAP_CLASS); | ||
1601 | - cache = (Map) clazz.newInstance(); | ||
1602 | - noPrefixCache = (Map) clazz.newInstance(); | ||
1603 | + /* Try to use the backport-util-concurrent library */ | ||
1604 | + Class clazz = Class.forName(BACKPORT_CONCURRENTHASHMAP_CLASS); | ||
1605 | + return (Map) clazz.newInstance(); | ||
1606 | } catch (Throwable t2) { | ||
1607 | - /* If previous implementations fail, use internal one */ | ||
1608 | - cache = new ConcurrentReaderHashMap(); | ||
1609 | - noPrefixCache = new ConcurrentReaderHashMap(); | ||
1610 | + try { | ||
1611 | + /* Try to use the oswego concurrent library */ | ||
1612 | + Class clazz = Class.forName(OSWEGO_CONCURRENTHASHMAP_CLASS); | ||
1613 | + return (Map) clazz.newInstance(); | ||
1614 | + } catch (Throwable t3) { | ||
1615 | + return null; | ||
1616 | + } | ||
1617 | } | ||
1618 | } | ||
1619 | } | ||
1620 | @@ -154,7 +158,7 @@ | ||
1621 | answer = (Map) cache.get(uri); | ||
1622 | |||
1623 | if (answer == null) { | ||
1624 | - answer = new ConcurrentReaderHashMap(); | ||
1625 | + answer = newConcurrentHashMap(); | ||
1626 | cache.put(uri, answer); | ||
1627 | } | ||
1628 | } | ||
diff --git a/recipes-core/xml-commons/dom4j_1.6.1.bb b/recipes-core/xml-commons/dom4j_1.6.1.bb new file mode 100644 index 0000000..94bd807 --- /dev/null +++ b/recipes-core/xml-commons/dom4j_1.6.1.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | DESCRIPTION = "dom4j is a simple and flexible Java library for working with XML, XPath and XSLT" | ||
2 | LICENSE = "BSD" | ||
3 | |||
4 | HOMEPAGE = "http://dom4j.org | ||
5 | |||
6 | DEPENDS = "fastjar-native xerces-j xalan-j xpp2 xpp3 jaxen" | ||
7 | |||
8 | SRC_URI = "\ | ||
9 | ${SOURCEFORGE_MIRROR}/dom4j/${P}.tar.gz;name=archive \ | ||
10 | http://apache.org/dist/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz;name=jaxme \ | ||
11 | file://debian.patch \ | ||
12 | " | ||
13 | |||
14 | inherit java-library | ||
15 | |||
16 | do_compile() { | ||
17 | mkdir -p build | ||
18 | |||
19 | oe_makeclasspath cp -s xercesImpl xalan2 xpp2 xpp3 jaxen | ||
20 | scp="src/java:${WORKDIR}/ws-jaxme-0.5.2/src/api" | ||
21 | |||
22 | javac -sourcepath $scp -cp $cp -d build `find src/java -name "*.java" -and -not -wholename "*datatype*"` | ||
23 | (cd src && find org -name "*.properties" -exec cp {} ../build/{} \;) | ||
24 | |||
25 | rm -rf build/org/w3c | ||
26 | rm -rf build/javax | ||
27 | |||
28 | fastjar -C build -c -f ${JARFILENAME} . | ||
29 | } | ||
30 | |||
31 | |||
32 | SRC_URI[archive.md5sum] = "1e7ef6d20939315714de4a8502f27b2d" | ||
33 | SRC_URI[archive.sha256sum] = "01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f" | ||
34 | SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4" | ||
35 | SRC_URI[jaxme.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc" | ||
diff --git a/recipes-core/xml-commons/jaxen_1.1.1.bb b/recipes-core/xml-commons/jaxen_1.1.1.bb new file mode 100644 index 0000000..7180dda --- /dev/null +++ b/recipes-core/xml-commons/jaxen_1.1.1.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | DESCRIPTION = "XPath library written in Java" | ||
2 | LICENSE = "BSD" | ||
3 | |||
4 | HOMEPAGE = "http://jaxen.codehaus.org/ | ||
5 | |||
6 | DEPENDS = "fastjar-native xerces-j xom" | ||
7 | |||
8 | SRC_URI = "\ | ||
9 | http://dist.codehaus.org/jaxen/distributions/jaxen-${PV}-src.tar.gz;name=archive \ | ||
10 | http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz;name=jdom \ | ||
11 | " | ||
12 | |||
13 | inherit java-library | ||
14 | |||
15 | do_compile() { | ||
16 | mkdir -p build | ||
17 | |||
18 | oe_makeclasspath cp -s xercesImpl xom | ||
19 | scp="src/java/main:${WORKDIR}/jdom-1.1/src/java" | ||
20 | |||
21 | javac -sourcepath $scp -cp $cp -d build `find src/java/main -name "*.java" -and -not -wholename "*dom4j*"` | ||
22 | (cd src && find org -name "*.properties" -exec cp {} ../build/{} \;) | ||
23 | |||
24 | rm -rf build/org/jdom | ||
25 | |||
26 | fastjar -C build -c -f ${JARFILENAME} . | ||
27 | } | ||
28 | |||
29 | |||
30 | SRC_URI[archive.md5sum] = "b598ae6b7e765a92e13667b0a80392f4" | ||
31 | SRC_URI[archive.sha256sum] = "f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca" | ||
32 | SRC_URI[jdom.md5sum] = "22745cbaaddb12884ed8ee09083d8fe2" | ||
33 | SRC_URI[jdom.sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056" | ||
diff --git a/recipes-core/xml-commons/jaxme_0.5.2.bb b/recipes-core/xml-commons/jaxme_0.5.2.bb new file mode 100644 index 0000000..304c06d --- /dev/null +++ b/recipes-core/xml-commons/jaxme_0.5.2.bb | |||
@@ -0,0 +1,64 @@ | |||
1 | DESCRIPTION = "Implementation of the JAXB API" | ||
2 | LICENSE = "AL2.0" | ||
3 | |||
4 | AUTHOR = "Apache Software Foundation" | ||
5 | HOMEPAGE = "http://ws.apache.org/jaxme" | ||
6 | |||
7 | SRC_URI = "\ | ||
8 | http://apache.org/dist/ws/jaxme/source/ws-${P}-src.tar.gz;name=archive \ | ||
9 | http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2;name=ant \ | ||
10 | " | ||
11 | |||
12 | S = "${WORKDIR}/ws-${P}" | ||
13 | |||
14 | inherit java-library | ||
15 | |||
16 | DEPENDS = "fastjar-native log4j1.2 xerces-j xalan-j commons-codec hsqldb antlr antlr-native" | ||
17 | |||
18 | do_compile() { | ||
19 | oe_makeclasspath cp -s log4j-1.2 xercesImpl xalan2 commons-codec hsqldb antlr | ||
20 | cp=build-api:build-jaxme:build-js:build-xs:build-pm:$cp | ||
21 | |||
22 | |||
23 | jaxme_build src/api build-api $cp jaxmeapi-${PV}.jar | ||
24 | |||
25 | runantlr -o src/js/org/apache/ws/jaxme/js/jparser src/js/org/apache/ws/jaxme/js/jparser/java15.g | ||
26 | jaxme_build src/js build-js $cp jaxmejs-${PV}.jar | ||
27 | |||
28 | jaxme_build src/xs build-xs $cp jaxmexs-${PV}.jar | ||
29 | |||
30 | jaxme_build src/jaxme build-jaxme $cp ${JARFILENAME} | ||
31 | |||
32 | # jaxme_build src/pm build-pm $cp jaxmepm-${PV}.jar | ||
33 | } | ||
34 | |||
35 | do_install_append() { | ||
36 | oe_jarinstall jaxmeapi-${PV}.jar jaxmeapi.jar | ||
37 | oe_jarinstall jaxmejs-${PV}.jar jaxmejs.jar | ||
38 | oe_jarinstall jaxmexs-${PV}.jar jaxmexs.jar | ||
39 | oe_jarinstall jaxmepm-${PV}.jar jaxmepm.jar | ||
40 | } | ||
41 | |||
42 | # Compile helper | ||
43 | # 1 - source dir | ||
44 | # 2 - dest dir | ||
45 | # 3 - classpath | ||
46 | # 4 - jar file name | ||
47 | jaxme_build() { | ||
48 | mkdir -p $2 | ||
49 | |||
50 | ant_sourcepath=${WORKDIR}/apache-ant-1.7.1/src/main | ||
51 | |||
52 | echo "javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 \`find $1 -name "*.java"\`" | ||
53 | javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 `find $1 -name "*.java" -and -not \( -wholename "*junit*" -or -wholename "*examples*" \) ` | ||
54 | (cd $1 && find . -name "*.properties" -exec cp {} ${S}/$2/{} \;) | ||
55 | |||
56 | rm -rf $2/org/apache/tools | ||
57 | |||
58 | fastjar -C $2 -c -f $4 . | ||
59 | } | ||
60 | |||
61 | SRC_URI[archive.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4" | ||
62 | SRC_URI[archive.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc" | ||
63 | SRC_URI[ant.md5sum] = "0d68db4a1ada5c91bcbf53cefd0c2fd7" | ||
64 | SRC_URI[ant.sha256sum] = "4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6" | ||
diff --git a/recipes-core/xml-commons/jaxp1.3_1.3.04.bb b/recipes-core/xml-commons/jaxp1.3_1.3.04.bb new file mode 100644 index 0000000..8f2ba8c --- /dev/null +++ b/recipes-core/xml-commons/jaxp1.3_1.3.04.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | DESCRIPTION = "Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0 W3C PD" | ||
4 | LIC_FILES_CHKSUM = " \ | ||
5 | file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 \ | ||
6 | file://LICENSE.dom-documentation.txt;md5=31a36539f6ad4bbe3ac3bd45af0de5d3 \ | ||
7 | file://LICENSE.dom-software.txt;md5=f67bb4d271302ad59a39ab4b896db695 \ | ||
8 | file://LICENSE.sac.html;md5=0d5dd06baacb170df81f0079f4b1c7b9 \ | ||
9 | file://LICENSE.sax.txt;md5=3534555610af53d4b5a8a0d2fb017d35 \ | ||
10 | " | ||
11 | |||
12 | SRC_URI = "http://archive.apache.org/dist/xml/commons/source/xml-commons-external-${PV}-src.tar.gz;subdir=${BPN}-${PV}" | ||
13 | |||
14 | inherit java-library | ||
15 | |||
16 | DEPENDS = "fastjar-native" | ||
17 | |||
18 | JARFILENAME = "jaxp-1.3.jar" | ||
19 | ALTJARFILENAMES = "xml-apis.jar" | ||
20 | |||
21 | do_compile() { | ||
22 | mkdir -p build/license | ||
23 | javac -d build `find javax org -name \*.java` | ||
24 | |||
25 | cp LICENSE.*.txt README.*.txt build/license | ||
26 | |||
27 | fastjar -c -m manifest.commons -f ${JARFILENAME} -C build . | ||
28 | } | ||
29 | |||
30 | SRC_URI[md5sum] = "5536f87a816c766f4999ed60593a8701" | ||
31 | SRC_URI[sha256sum] = "8e8a412aeb95644eaf14ec1a5cfd04833e38cac4a01b83d73d7de2368a35a597" | ||
32 | |||
33 | NATIVE_INSTALL_WORKS = "1" | ||
34 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/xml-commons/jdom_1.1.bb b/recipes-core/xml-commons/jdom_1.1.bb new file mode 100644 index 0000000..1a77f05 --- /dev/null +++ b/recipes-core/xml-commons/jdom_1.1.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | DESCRIPTION = "Parses, manipulates, and outputs XML using standard Java constructs" | ||
2 | LICENSE = "BSD" | ||
3 | |||
4 | HOMEPAGE = "http://jdom.org/ | ||
5 | |||
6 | DEPENDS = "fastjar-native jaxen" | ||
7 | |||
8 | SRC_URI = "\ | ||
9 | http://www.jdom.org/dist/binary/archive/jdom-${PV}.tar.gz \ | ||
10 | " | ||
11 | |||
12 | inherit java-library | ||
13 | |||
14 | do_compile() { | ||
15 | mkdir -p build | ||
16 | |||
17 | oe_makeclasspath cp -s jaxen | ||
18 | |||
19 | javac -sourcepath src/java -cp $cp -d build `find src/java -name "*.java"` | ||
20 | |||
21 | fastjar -C build -c -f ${JARFILENAME} . | ||
22 | } | ||
23 | |||
24 | |||
25 | SRC_URI[md5sum] = "22745cbaaddb12884ed8ee09083d8fe2" | ||
26 | SRC_URI[sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056" | ||
diff --git a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb new file mode 100644 index 0000000..794ab4b --- /dev/null +++ b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb | |||
@@ -0,0 +1,42 @@ | |||
1 | DESCRIPTION = "Library to resolve various public or system identifiers into accessible URLs (Java)" | ||
2 | AUTHOR = "Apache Software Foundation" | ||
3 | LICENSE = "AL2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.resolver.txt;md5=d229da563da18fe5d58cd95a6467d584" | ||
5 | |||
6 | SRC_URI = "http://archive.apache.org/dist/xml/commons/xml-commons-resolver-${PV}.tar.gz" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | S = "${WORKDIR}/xml-commons-resolver-${PV}" | ||
11 | |||
12 | DEPENDS = "fastjar-native jaxp1.3" | ||
13 | DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native" | ||
14 | |||
15 | do_unpackpost() { | ||
16 | find src -exec \ | ||
17 | sed -i -e "s|@impl.name@|XmlResolver|" \ | ||
18 | -e "s|@impl.version@|1.2|" {} \; | ||
19 | } | ||
20 | |||
21 | addtask unpackpost after do_unpack before do_patch | ||
22 | |||
23 | JARFILENAME = "resolver.jar" | ||
24 | ALTJARFILENAMES = "" | ||
25 | |||
26 | do_compile() { | ||
27 | mkdir -p build | ||
28 | |||
29 | cp=${STAGING_DATADIR_JAVA}/jaxp1.3.jar | ||
30 | |||
31 | javac -sourcepath src -d build -classpath $cp `find src -name "*.java" -and -not -wholename "*tests*"` | ||
32 | |||
33 | (cd src && find org -name "*.xml" -o -name "*.txt" -o -name "*.src" -exec cp {} ../build/{} \;) | ||
34 | |||
35 | fastjar -C build -c -m src/manifest.resolver -f ${JARFILENAME} org | ||
36 | } | ||
37 | |||
38 | SRC_URI[md5sum] = "46d52acdb67ba60f0156043f30108766" | ||
39 | SRC_URI[sha256sum] = "55dbe7bd56452c175320ce9a97b752252c5537427221323c72e9b9c1ac221efe" | ||
40 | |||
41 | NATIVE_INSTALL_WORKS = "1" | ||
42 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-core/xml-commons/xom-1.1/04_remove_sun_import.patch b/recipes-core/xml-commons/xom-1.1/04_remove_sun_import.patch new file mode 100644 index 0000000..71f659d --- /dev/null +++ b/recipes-core/xml-commons/xom-1.1/04_remove_sun_import.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | diff -Nur xom-1.1/src15/nu/xom/JDK15XML1_0Parser.java xom-1.1.new/src15/nu/xom/JDK15XML1_0Parser.java | ||
2 | --- xom-1.1/src15/nu/xom/JDK15XML1_0Parser.java 2004-08-17 19:18:30.000000000 +0530 | ||
3 | +++ xom-1.1.new/src15/nu/xom/JDK15XML1_0Parser.java 2007-11-13 15:25:08.000000000 +0530 | ||
4 | @@ -24,9 +24,9 @@ | ||
5 | |||
6 | import org.xml.sax.SAXException; | ||
7 | |||
8 | -import com.sun.org.apache.xerces.internal.parsers.SAXParser; | ||
9 | -import com.sun.org.apache.xerces.internal.parsers.DTDConfiguration; | ||
10 | -import com.sun.org.apache.xerces.internal.impl.Constants | ||
11 | +import org.apache.xerces.parsers.SAXParser; | ||
12 | +import org.apache.xerces.parsers.DTDConfiguration; | ||
13 | +import org.apache.xerces.impl.Constants | ||
14 | ; | ||
15 | /** | ||
16 | * <p> | ||
17 | @@ -47,8 +47,8 @@ | ||
18 | |||
19 | super(new DTDConfiguration()); | ||
20 | // workaround for Java 1.5 beta 2 bugs | ||
21 | - com.sun.org.apache.xerces.internal.util.SecurityManager manager | ||
22 | - = new com.sun.org.apache.xerces.internal.util.SecurityManager(); | ||
23 | + org.apache.xerces.util.SecurityManager manager | ||
24 | + = new org.apache.xerces.util.SecurityManager(); | ||
25 | setProperty(Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY, manager); | ||
26 | |||
27 | } | ||
diff --git a/recipes-core/xml-commons/xom_1.1.bb b/recipes-core/xml-commons/xom_1.1.bb new file mode 100644 index 0000000..697e01d --- /dev/null +++ b/recipes-core/xml-commons/xom_1.1.bb | |||
@@ -0,0 +1,42 @@ | |||
1 | DESCRIPTION = "Tree-based API for processing XML with Java" | ||
2 | LICENSE = "LGPL" | ||
3 | |||
4 | HOMEPAGE = "http://xom.nu" | ||
5 | |||
6 | SRC_URI = "\ | ||
7 | http://www.cafeconleche.org/XOM/${P}-src.tar.gz;name=archive \ | ||
8 | http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.tar.gz;name=jaxen \ | ||
9 | file://04_remove_sun_import.patch \ | ||
10 | " | ||
11 | |||
12 | S = "${WORKDIR}/XOM" | ||
13 | |||
14 | inherit java-library | ||
15 | |||
16 | DEPENDS = "fastjar-native xerces-j xalan-j" | ||
17 | |||
18 | do_compile() { | ||
19 | mkdir -p build | ||
20 | |||
21 | oe_makeclasspath cp -s xercesImpl xalan2 | ||
22 | cp=build:$cp | ||
23 | |||
24 | scp="${WORKDIR}/jaxen-1.1.1/src/java/main" | ||
25 | |||
26 | javac -sourcepath src:$scp -cp $cp -d build `find src -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)` | ||
27 | javac -sourcepath fatsrc:$scp -cp $cp -d build `find fatsrc -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)` | ||
28 | javac -sourcepath src15:$scp -cp $cp -d build `find src15 -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)` | ||
29 | |||
30 | (cd src && find . -name "*.properties" -exec cp {} ../build/{} \;) | ||
31 | |||
32 | # Remove Jaxen classes from build | ||
33 | rm -rf build/org/jaxen | ||
34 | rm -rf build/org/w3c | ||
35 | |||
36 | fastjar -C build -c -f ${JARFILENAME} . | ||
37 | } | ||
38 | |||
39 | SRC_URI[archive.md5sum] = "e5ae82568d7b1faeb950140c34fbbcb1" | ||
40 | SRC_URI[archive.sha256sum] = "d648fd1f7b7437123afa63df06f6a6409a0487c99ca8f8beba75aaa474d65818" | ||
41 | SRC_URI[jaxen.md5sum] = "b598ae6b7e765a92e13667b0a80392f4" | ||
42 | SRC_URI[jaxen.sha256sum] = "f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca" | ||
diff --git a/recipes-core/xml-commons/xpp2_2.1.10.bb b/recipes-core/xml-commons/xpp2_2.1.10.bb new file mode 100644 index 0000000..2239173 --- /dev/null +++ b/recipes-core/xml-commons/xpp2_2.1.10.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | DESCRIPTION = "Streaming pull XML parser for java" | ||
2 | LICENSE = "BSD-like" | ||
3 | |||
4 | HOMEPAGE = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/" | ||
5 | |||
6 | SRC_URI = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz" | ||
7 | |||
8 | S = "${WORKDIR}/PullParser${PV}" | ||
9 | |||
10 | inherit java-library | ||
11 | |||
12 | DEPENDS = "fastjar-native virtual/javac-native" | ||
13 | |||
14 | do_compile() { | ||
15 | if [ -d build-oe ]; then | ||
16 | rm -rf build-oe | ||
17 | fi | ||
18 | mkdir -p build-oe | ||
19 | |||
20 | sourcepath="src/java/drivers/jaxp11:src/java/drivers/sax2:src/java/impl/factory:src/java/impl/format:src/java/impl/node:src/java/impl/pullparser:src/java/impl/tag:src/java/intf" | ||
21 | |||
22 | findpath="${sourcepath//:/ }" | ||
23 | |||
24 | javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"` | ||
25 | |||
26 | mkdir -p build-oe/META-INF/services | ||
27 | cp src/java/drivers/jaxp11/META-INF/services/javax.xml.parsers.SAXParserFactory build-oe/META-INF/services | ||
28 | cp src/java/impl/factory/META-INF/services/org.gjt.xpp.XmlPullParserFactory build-oe/META-INF/services | ||
29 | |||
30 | fastjar -C build-oe -c -f ${JARFILENAME} . | ||
31 | } | ||
32 | |||
33 | SRC_URI[md5sum] = "865ca4e2496c215d301b57450137626f" | ||
34 | SRC_URI[sha256sum] = "ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf" | ||
diff --git a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb new file mode 100644 index 0000000..40f7cb2 --- /dev/null +++ b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb | |||
@@ -0,0 +1,49 @@ | |||
1 | DESCRIPTION = "Streaming pull XML parser for Java (3rd edition)" | ||
2 | LICENSE = "BSD-like" | ||
3 | |||
4 | HOMEPAGE = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1" | ||
5 | |||
6 | SRC_URI = "http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/${P}_src.tgz" | ||
7 | |||
8 | inherit java-library | ||
9 | |||
10 | DEPENDS = "fastjar-native virtual/javac-native" | ||
11 | |||
12 | PACKAGES = "libxpp3-xpath-java ${JPN}" | ||
13 | |||
14 | do_compile() { | ||
15 | if [ -d build-oe ]; then | ||
16 | rm -rf build-oe | ||
17 | fi | ||
18 | mkdir -p build-oe | ||
19 | |||
20 | sourcepath="src/java/api:src/java/builder:src/java/dom2_builder:src/java/mxp1_min:src/java/mxp1_standard:src/java/parser_pool:src/java/sax2_driver:src/java/serializer_impl:src/java/util:src/java/wrapper" | ||
21 | findpath="${sourcepath//:/ }" | ||
22 | |||
23 | javac -sourcepath $sourcepath -d build-oe `find $findpath -name "*.java"` | ||
24 | |||
25 | mkdir -p build-oe/META-INF/services | ||
26 | cp src/java/mxp1_standard/META-INF/services/org.xml* build-oe/META-INF/services | ||
27 | fastjar -C build-oe -c -f ${JARFILENAME} . | ||
28 | |||
29 | if [ -d build-xpath ]; then | ||
30 | rm -rf build-xpath | ||
31 | fi | ||
32 | mkdir -p build-xpath | ||
33 | |||
34 | sourcepath="src/java/xpath" | ||
35 | findpath="${sourcepath//:/ }" | ||
36 | javac -sourcepath $sourcepath -cp build-oe -d build-xpath `find $findpath -name "*.java"` | ||
37 | |||
38 | fastjar -C build-xpath -c -f xpp3-xpath-${PV}.jar . | ||
39 | } | ||
40 | |||
41 | do_install_append() { | ||
42 | oe_jarinstall xpp3-xpath-${PV}.jar xpp3-xpath.jar | ||
43 | } | ||
44 | |||
45 | FILES_libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*" | ||
46 | |||
47 | |||
48 | SRC_URI[md5sum] = "e1b6aeaad1cd06e64568aae1a507d5c6" | ||
49 | SRC_URI[sha256sum] = "404c0cd332f54ecf9807dc86d365c17dcffab669994c9dcbbad31fbc4b59f811" | ||