From: Benjamin Drung Date: Fri, 18 Mar 2016 11:31:54 +0000 (+0100) Subject: Server JRE: Exclude libs that pull in X11 X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=267e00d6cd47b41b19335be01a58e877cb54c585;p=sven%2Fjava-package.git Server JRE: Exclude libs that pull in X11 Some libraries of the server JRE are linked against X11. Ignore them in the dh_shlibdeps run to avoid a dependency on X11. --- diff --git a/lib/javase.sh b/lib/javase.sh index 6309e9f..ed0745c 100644 --- a/lib/javase.sh +++ b/lib/javase.sh @@ -70,6 +70,18 @@ j2se_rules() { cat << EOF #!/usr/bin/make -f +# Exclude libraries that pull in ALSA or OpenGL which are not needed in normal operation +EXCLUDE_LIBS = \\ + --exclude=avplugin \\ + --exclude=fxavcodecplugin \\ + --exclude=libjsoundalsa.so \\ +EOF + for lib in $exlude_libs; do + printf '\t--exclude=%s \\\n' "$lib" + done + cat << EOF + \$(NULL) + %: dh \$@ @@ -77,7 +89,7 @@ override_dh_compress: dh_compress \$(shell find $j2se_name/man/ -type f ! -name '*.gz' -printf '${jvm_base##/}/%p\n') override_dh_shlibdeps: - dh_shlibdeps --exclude=fxavcodecplugin --exclude=avplugin -l\$(shell find $j2se_name -type f -name '*.so*' -printf '${jvm_base##/}/%h\n' | sort -u | tr '\n' ':' | sed 's/:\$\$//') + dh_shlibdeps \$(EXCLUDE_LIBS) -l\$(shell find $j2se_name -type f -name '*.so*' -printf '${jvm_base##/}/%h\n' | sort -u | tr '\n' ':' | sed 's/:\$\$//') override_dh_strip_nondeterminism: # Disable dh_strip_nondeterminism to speed up the build diff --git a/lib/oracle-server-jre.sh b/lib/oracle-server-jre.sh index 2f30f0b..c7ccbcf 100644 --- a/lib/oracle-server-jre.sh +++ b/lib/oracle-server-jre.sh @@ -81,6 +81,7 @@ EOF oracle_jre_bin_jre="policytool" oracle_jre_lib_hl="jexec" j2se_package="$j2se_vendor-java$j2se_release-server-jre" + exlude_libs="appletviewer libawt_xawt.so libsplashscreen.so policytool" j2se_run fi fi