Skip to content

GitLab

I
icedtea
Commit 9f064ce4 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Initial commit

parents
Hide whitespace changes
Inline Side-by-side
Showing with 347 additions and 0 deletions
Makefile 0 → 100644
View file @ 9f064ce4
all: 8
gcj:
$(MAKE) -C ../gcj temporary
ant:
$(MAKE) -C ../ant temporary
clean:
$(MAKE) -C ../gcj clean
6: gcj ant build-6 clean
build-6:
dd if=/dev/zero of=swap bs=1048576 count=1024
chmod 600 swap
mkswap swap
swapon swap
tar xf icedtea6-1.13.13.tar.xz
patch -Np1 -d icedtea6-1.13.13 < icedtea6-1.13.13-fixed.patch
cp icedtea6/1.13.13/* icedtea6-1.13.13
ln -sfv /bin/head /usr/bin/head
ln -sfv /bin/find /usr/bin/find
ln -sfv /usr/bin/touch /bin/touch
cd icedtea6-1.13.13 && PATH=/build/usr/bin:$$PATH ./configure --prefix=/usr --with-jdk-home=/build/opt/gcj --without-rhino --disable-system-kerberos --disable-system-gif
$(MAKE) -C icedtea6-1.13.13 PATH=/build/usr/bin:$$PATH DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
cd icedtea6-1.13.13 && cp -R openjdk.build/j2sdk-image /opt/icedtea6-1.13.13
chown -R root:root /opt/icedtea6-1.13.13
ln -sfv -n icedtea6-1.13.13 /opt/java
rm /usr/bin/head
rm /usr/bin/find
rm /bin/touch
rm -rf icedtea6-1.13.13
swapoff swap
rm -rf swap
7: gcj ant build-6 build-7 clean
build-7:
dd if=/dev/zero of=swap bs=1048576 count=1024
chmod 600 swap
mkswap swap
swapon swap
ln -sfv /bin/head /usr/bin/head
ln -sfv /bin/find /usr/bin/find
ln -sfv /usr/bin/touch /bin/touch
tar xf icedtea-2.6.10.tar.xz
patch -Np1 -d icedtea-2.6.10 < icedtea-2.6.10-fixed.patch
cp icedtea7/2.6.10/* icedtea-2.6.10
cd icedtea-2.6.10 && PATH=/build/usr/bin:/opt/java/bin:$$PATH JAVA_HOME=/opt/java CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/java --without-rhino --disable-system-kerberos --disable-system-gif --disable-system-gtk --disable-system-pcsc --disable-system-sctp
$(MAKE) -C icedtea-2.6.10 PATH=/build/usr/bin:/opt/java/bin:$$PATH DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
cd icedtea-2.6.10 && cp -R openjdk.build/j2sdk-image /opt/icedtea-2.6.10
chown -R root:root /opt/icedtea-2.6.10
ln -sfv -n icedtea-2.6.10 /opt/java
rm -rf /opt/icedtea6-1.13.13
rm -rf icedtea-2.6.10
tar xf icedtea-2.6.20.tar.xz
patch -Np1 -d icedtea-2.6.20 < icedtea-2.6.20-fixed.patch
cp icedtea7/2.6.20/* icedtea-2.6.20
cd icedtea-2.6.20 && PATH=/build/usr/bin:/opt/java/bin:$$PATH JAVA_HOME=/opt/java CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/java --without-rhino --disable-system-kerberos --disable-system-gif --disable-system-gtk --disable-system-pcsc --disable-system-sctp
$(MAKE) -C icedtea-2.6.20 PATH=/build/usr/bin:/opt/java/bin:$$PATH DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
cd icedtea-2.6.20 && cp -R openjdk.build/j2sdk-image /opt/icedtea-2.6.20
chown -R root:root /opt/icedtea-2.6.20
ln -sfv -n icedtea-2.6.20 /opt/java
rm -rf /opt/icedtea-2.6.10
rm -rf icedtea-2.6.20
rm /usr/bin/head
rm /usr/bin/find
rm /bin/touch
swapoff swap
rm -rf swap
8: 7
$(MAKE) -C ../ant temporary
dd if=/dev/zero of=swap bs=1048576 count=1024
chmod 600 swap
mkswap swap
swapon swap
tar xf icedtea-3.14.0.tar.xz
cp icedtea8/3.14.0/* icedtea-3.14.0
cd icedtea-3.14.0 && PATH=/build/usr/bin:/opt/java/bin:$$PATH JAVA_HOME=/opt/java CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/java --disable-system-gif --disable-system-kerberos --disable-system-pcsc --disable-system-sctp
$(MAKE) -C icedtea-3.14.0 PATH=/build/usr/bin:/opt/java/bin:$$PATH
cd icedtea-3.14.0 && cp -R openjdk.build/images/j2sdk-image /opt/icedtea-3.14.0
chown -R root:root /opt/icedtea-3.14.0
ln -sfv -n icedtea-3.14.0 /opt/java
rm -rf /opt/icedtea-2.6.20
rm -rf icedtea-3.14.0
swapoff swap
rm -rf swap
icedtea-2.6.10-fixed.patch 0 → 100644
View file @ 9f064ce4
diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure
--- icedtea-2.6.10/configure 2017-05-17 12:48:59.353452900 +0930
+++ icedtea-2.6.10-fixed/configure 2020-01-07 14:54:20.037441291 +1030
@@ -15851,7 +15851,7 @@
fi
done
- for ac_header in sys/epoll.h attr/xattr.h
+ for ac_header in sys/epoll.h sys/xattr.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -15861,7 +15861,7 @@
_ACEOF
else
- as_fn_error $? "Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary." "$LINENO" 5
+ as_fn_error $? "Could not find required system headers; install the appropriate files from glibc-headers or libc6-dev or use --disable-compile-against-syscalls if necessary." "$LINENO" 5
fi
done
diff -uNr icedtea-2.6.10/Makefile.am icedtea-2.6.10-fixed/Makefile.am
--- icedtea-2.6.10/Makefile.am 2017-05-17 12:48:00.046401098 +0930
+++ icedtea-2.6.10-fixed/Makefile.am 2020-01-07 15:01:59.435405027 +1030
@@ -372,7 +372,7 @@
# Patch list
-ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch
# Conditional patches
diff -uNr icedtea-2.6.10/Makefile.in icedtea-2.6.10-fixed/Makefile.in
--- icedtea-2.6.10/Makefile.in 2017-05-17 12:49:00.769430260 +0930
+++ icedtea-2.6.10-fixed/Makefile.in 2020-01-07 15:02:14.007435732 +1030
@@ -786,7 +786,7 @@
MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list
-ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch $(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12) $(am__append_13) \
$(am__append_14) $(DISTRIBUTION_PATCHES)
diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.10/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch 2020-01-07 14:54:08.245416597 +1030
@@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
++++ openjdk.fixed/jdk/make/common/shared/Sanity.gmk 2020-01-04 12:48:58.464954070 +1030
+@@ -813,28 +813,8 @@
+ # Check for availability of FreeType (OpenJDK specific)
+ ######################################################
+
+-ifdef OPENJDK
+- ifndef CROSS_COMPILE_ARCH
+- # The freetypecheck Makefile prints out "Failed" if not good enough
+- $(TEMPDIR)/freetypeinfo: FRC
+- @$(prep-target)
+- @(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
+- $(ECHO) "Failed to build freetypecheck." ) > $@
+-
+- sane-freetype: $(TEMPDIR)/freetypeinfo
+- @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
+- $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
+- " or higher is required. \n" \
+- "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
+- fi
+- else
+- #do nothing (cross-compiling)
+- sane-freetype:
+- endif
+-else
+- #do nothing (not OpenJDK)
+- sane-freetype:
+-endif
++#do nothing
++sane-freetype:
+
+ ######################################################
+ # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.10/patches/jdk-fixed_xattr.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch 2020-01-07 15:00:21.034197666 +1030
@@ -0,0 +1,12 @@
+diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930
++++ openjdk.fixed/jdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2020-01-07 14:57:21.555821437 +1030
+@@ -38,7 +38,7 @@
+
+ #ifdef COMPILE_AGAINST_SYSCALLS
+ #include <sys/types.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #else
+ #include <syscalls_fp.h>
+ #endif
icedtea-2.6.20-fixed.patch 0 → 100644
View file @ 9f064ce4
diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure
--- icedtea-2.6.20/configure 2019-11-18 16:20:27.364013811 +1030
+++ icedtea-2.6.20-fixed/configure 2020-01-17 09:15:14.201255681 +1030
@@ -16089,7 +16089,7 @@
fi
done
- for ac_header in sys/epoll.h attr/xattr.h
+ for ac_header in sys/epoll.h sys/xattr.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -16099,7 +16099,7 @@
_ACEOF
else
- as_fn_error $? "Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary." "$LINENO" 5
+ as_fn_error $? "Could not find required system headers; install the appropriate files from glibc-headers or libc6-dev or use --disable-compile-against-syscalls if necessary." "$LINENO" 5
fi
done
diff -uNr icedtea-2.6.20/Makefile.am icedtea-2.6.20-fixed/Makefile.am
--- icedtea-2.6.20/Makefile.am 2019-11-15 15:15:51.645205555 +1030
+++ icedtea-2.6.20-fixed/Makefile.am 2020-01-17 09:17:38.971543733 +1030
@@ -369,7 +369,7 @@
# Patch list
-ICEDTEA_PATCHES = patches/8232643-pr3761.patch
+ICEDTEA_PATCHES = patches/8232643-pr3761.patch patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch
# Conditional patches
diff -uNr icedtea-2.6.20/Makefile.in icedtea-2.6.20-fixed/Makefile.in
--- icedtea-2.6.20/Makefile.in 2019-11-18 16:20:28.180001295 +1030
+++ icedtea-2.6.20-fixed/Makefile.in 2020-01-17 09:18:45.532676179 +1030
@@ -788,7 +788,7 @@
MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list
-ICEDTEA_PATCHES = patches/8232643-pr3761.patch $(am__append_8) \
+ICEDTEA_PATCHES = patches/8232643-pr3761.patch patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch $(am__append_8) \
$(am__append_9) $(am__append_10) $(am__append_11) \
$(am__append_12) $(am__append_13) $(DISTRIBUTION_PATCHES)
diff -uNr icedtea-2.6.20/patches/freetypecheck_fix.patch icedtea-2.6.20-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.20/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.20-fixed/patches/freetypecheck_fix.patch 2020-01-17 09:15:14.208255695 +1030
@@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
++++ openjdk.fixed/jdk/make/common/shared/Sanity.gmk 2020-01-04 12:48:58.464954070 +1030
+@@ -813,28 +813,8 @@
+ # Check for availability of FreeType (OpenJDK specific)
+ ######################################################
+
+-ifdef OPENJDK
+- ifndef CROSS_COMPILE_ARCH
+- # The freetypecheck Makefile prints out "Failed" if not good enough
+- $(TEMPDIR)/freetypeinfo: FRC
+- @$(prep-target)
+- @(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
+- $(ECHO) "Failed to build freetypecheck." ) > $@
+-
+- sane-freetype: $(TEMPDIR)/freetypeinfo
+- @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
+- $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
+- " or higher is required. \n" \
+- "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
+- fi
+- else
+- #do nothing (cross-compiling)
+- sane-freetype:
+- endif
+-else
+- #do nothing (not OpenJDK)
+- sane-freetype:
+-endif
++#do nothing
++sane-freetype:
+
+ ######################################################
+ # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea-2.6.20/patches/jdk-fixed_xattr.patch icedtea-2.6.20-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.20/patches/jdk-fixed_xattr.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.20-fixed/patches/jdk-fixed_xattr.patch 2020-01-17 09:15:14.208255695 +1030
@@ -0,0 +1,12 @@
+diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930
++++ openjdk.fixed/jdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2020-01-07 14:57:21.555821437 +1030
+@@ -38,7 +38,7 @@
+
+ #ifdef COMPILE_AGAINST_SYSCALLS
+ #include <sys/types.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #else
+ #include <syscalls_fp.h>
+ #endif
icedtea6-1.13.13-fixed.patch 0 → 100644
View file @ 9f064ce4
diff -uNr icedtea6-1.13.13/Makefile.am icedtea6-1.13.13-freetypecheck_fix/Makefile.am
--- icedtea6-1.13.13/Makefile.am 2017-01-05 06:52:49.112782727 +1030
+++ icedtea6-1.13.13-freetypecheck_fix/Makefile.am 2020-01-04 13:39:56.308372789 +1030
@@ -345,6 +345,7 @@
patches/nomotif-6706121.patch \
patches/nomotif.patch \
patches/nomotif-mtoolkit.patch \
+ patches/freetypecheck_fix.patch \
patches/alt-jar.patch \
patches/jdk-use-ssize_t.patch \
patches/arch.patch \
diff -uNr icedtea6-1.13.13/Makefile.in icedtea6-1.13.13-freetypecheck_fix/Makefile.in
--- icedtea6-1.13.13/Makefile.in 2017-01-05 06:53:00.576597287 +1030
+++ icedtea6-1.13.13-freetypecheck_fix/Makefile.in 2020-01-04 13:40:16.013407821 +1030
@@ -793,6 +793,7 @@
patches/gcc-suffix.patch patches/libraries-splashscreen.patch \
patches/uname.patch patches/nomotif-6706121.patch \
patches/nomotif.patch patches/nomotif-mtoolkit.patch \
+ patches/freetypecheck_fix.patch \
patches/alt-jar.patch patches/jdk-use-ssize_t.patch \
patches/arch.patch patches/lc_ctype.patch patches/xjc.patch \
patches/linker-libs-order.patch patches/testenv.patch \
diff -uNr icedtea6-1.13.13/patches/freetypecheck_fix.patch icedtea6-1.13.13-freetypecheck_fix/patches/freetypecheck_fix.patch
--- icedtea6-1.13.13/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea6-1.13.13-freetypecheck_fix/patches/freetypecheck_fix.patch 2020-01-04 12:49:36.800022175 +1030
@@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
++++ openjdk.fixed/jdk/make/common/shared/Sanity.gmk 2020-01-04 12:48:58.464954070 +1030
+@@ -811,29 +811,8 @@
+ # Check for availability of FreeType (OpenJDK specific)
+ ######################################################
+
+-ifdef OPENJDK
+-
+-#name of test program that prints out "Failed" if freetype is not good enough
+-FREETYPE_VERSION_CHECK_NAME = freetype_versioncheck
+-FREETYPE_VERSION_CHECK = $(TEMPDIR)/$(FREETYPE_VERSION_CHECK_NAME)$(EXE_SUFFIX)
+-
+-sane-freetype:
+- @-($(CD) $(BUILDDIR)/tools/freetypecheck && \
+- $(MAKE) REQUIRED_FREETYPE_VERSION=$(REQUIRED_FREETYPE_VERSION) \
+- FT_TEST=$(FREETYPE_VERSION_CHECK_NAME) \
+- FT_HEADERS=$(FREETYPE_HEADERS_PATH) \
+- FT_LIB=$(FREETYPE_LIB_PATH) \
+- XARCH=$(XARCH))
+- @if [ ! -r $(FREETYPE_VERSION_CHECK) -o \
+- "`$(FREETYPE_VERSION_CHECK) | $(GREP) Fail`" != "" ]; then \
+- $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
+- "or higher is required. \n" >> $(ERROR_FILE) ; \
+- fi
+-
+-else
+-#do nothing (not OpenJDK)
++#do nothing
+ sane-freetype:
+-endif
+
+ ######################################################
+ # CUPS_HEADERS_PATH must be valid
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment