diff --git a/openjdk10-boot/Pkgfile b/openjdk10-boot/Pkgfile
index 4e20d4a..00c1ff5 100644
--- a/openjdk10-boot/Pkgfile
+++ b/openjdk10-boot/Pkgfile
@@ -1,20 +1,18 @@
 # Description: OpenJDK 10 (minimal pkg for bootstrapping)
 # URL: https://openjdk.java.net/
 # Maintainer:
-# Depends on: alsa-lib cups fontconfig freetype giflib krb5 lcms2 libffi libjpeg-turbo libpng libxslt nss unzip xorg-libxrender xorg-libxt xorg-libxtst zip
+# Depends on: alsa-lib cups fontconfig giflib krb5 lcms2 libxslt nss unzip xorg-libxrender xorg-libxt xorg-libxtst zip
 
 name=openjdk10-boot
 version=10.0.2+13
 _boot_ver=20210207
 _cert_ver=20200215
-#_jdkhash=45b1d041a4ef
 release=1
 source=(https://crux.ster.zone/downloads/java/openjdk-$version.tar.bz2
   https://crux.ster.zone/downloads/java/openjdk9-boot-$_boot_ver.tar.xz
   https://crux.ster.zone/downloads/java/java_cacerts-$_cert_ver
   # https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/openjdk10-bootstrap/patches/fix-compiler-version-10%2B.patch
-  fix-compiler-version-10+.patch
-  make-4.3_breaks_build.patch)
+  fix-compiler-version-10+.patch make-4.3_breaks_build.patch)
 
 build() {
   patch -p1 -d $SRC/jdk10u-jdk-$version -i $SRC/make-4.3_breaks_build.patch
@@ -44,33 +42,36 @@ build() {
   mkdir $SRC/build-boot
   cd $SRC/build-boot
 
+  local _COMMON_OPTIONS="
+    --disable-hotspot-gtest
+    --disable-precompiled-headers
+    --disable-warnings-as-errors
+    --enable-dtrace=no
+    --enable-headless-only
+    --enable-unlimited-crypto
+    --with-native-debug-symbols=none
+    --with-debug-level=release
+    --with-stdc++lib=dynamic
+    --with-jvm-variants=server
+    --with-cacerts-file=$SRC/java_cacerts-$_cert_ver
+    --with-jtreg=no
+    --with-boot-jdk=$JAVA_HOME
+    --with-version-opt="CRUX-r$release"
+    --with-version-build="${version#*+}"
+    --with-vendor-name="CRUX"
+    --with-jobs=$JOBS
+    --with-libjpeg=system
+    --with-giflib=system
+    --with-libpng=system
+    --with-zlib=system
+    --with-lcms=system"
+
   export _CFLAGS+=' -fcommon'
   export _CXXFLAGS+=' -fcommon'
   LC_ALL=C
   /bin/bash ../jdk10u-jdk-$version/configure $PKGMK_JDK10 \
+    $_COMMON_OPTIONS \
     --prefix=$SRC/build-boot/images/jdk \
-    --disable-hotspot-gtest \
-    --disable-precompiled-headers \
-    --disable-warnings-as-errors \
-    --enable-dtrace=no \
-    --enable-headless-only \
-    --enable-unlimited-crypto \
-    --with-native-debug-symbols=none \
-    --with-debug-level=release \
-    --with-stdc++lib=dynamic \
-    --with-jvm-variants=server \
-    --with-cacerts-file=$SRC/java_cacerts-$_cert_ver \
-    --with-jtreg=no \
-    --with-boot-jdk=$JAVA_HOME \
-    --with-version-opt="CRUX-r$release" \
-    --with-version-build="${version#*+}" \
-    --with-vendor-name="CRUX" \
-    --with-jobs=$JOBS \
-    --with-libjpeg=system \
-    --with-giflib=system \
-    --with-libpng=system \
-    --with-zlib=system \
-    --with-lcms=system \
     --with-extra-cflags="$_CFLAGS" \
     --with-extra-cxxflags="$_CXXFLAGS"
 
@@ -88,28 +89,7 @@ build() {
   LC_ALL=C
   /bin/bash ../jdk10u-jdk-$version/configure $PKGMK_JDK10 \
     --prefix=/$name \
-    --disable-hotspot-gtest \
-    --disable-precompiled-headers \
-    --disable-warnings-as-errors \
-    --enable-dtrace=no \
-    --enable-headless-only \
-    --enable-unlimited-crypto \
-    --with-native-debug-symbols=none \
-    --with-debug-level=release \
-    --with-stdc++lib=dynamic \
-    --with-jvm-variants=server \
-    --with-cacerts-file=$SRC/java_cacerts-$_cert_ver \
-    --with-jtreg=no \
-    --with-boot-jdk=$JAVA_HOME \
-    --with-version-opt="CRUX-r$release" \
-    --with-version-build="${version#*+}" \
-    --with-vendor-name="CRUX" \
-    --with-jobs=$JOBS \
-    --with-libjpeg=system \
-    --with-giflib=system \
-    --with-libpng=system \
-    --with-zlib=system \
-    --with-lcms=system \
+    $_COMMON_OPTIONS \
     --with-extra-cflags="$_CFLAGS" \
     --with-extra-cxxflags="$_CXXFLAGS"