Skip to content

Commit

Permalink
dev-java/icedtea-bin: Fix removal of files on arm, closes #623784
Browse files Browse the repository at this point in the history
The arm -> aarch32 symlink causes globbing to return duplicates and rm
therefore fails.

Package-Manager: Portage-2.3.6, Repoman-2.3.2
  • Loading branch information
chewi committed Jul 15, 2017
1 parent a56c7d8 commit fef98f3
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,15 @@ pkg_pretend() {
src_prepare() {
default

# I wouldn't normally use -f below but symlinks in the arm files
# make this fail otherwise and any other approach would be tedious.

if ! use alsa; then
rm -v */jre/lib/*/libjsoundalsa.* || die
rm -fv */jre/lib/*/libjsoundalsa.* || die
fi

if use headless-awt; then
rm -vr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
*/{,jre/}bin/policytool */bin/appletviewer || die
fi
}
Expand Down

0 comments on commit fef98f3

Please sign in to comment.