Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xx-apt: fix xx essentials #93

Merged
merged 1 commit into from
Nov 18, 2022
Merged

xx-apt: fix xx essentials #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions base/test-apk.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ load 'assert'
assert_output --partial "alpine-baselayout"
}

@test "essentials" {
run xx-apk list xx-c-essentials
assert_success

run xx-apk list xx-cxx-essentials
assert_success
}

@test "cross" {
target="arm64"
if [ "$(xx-info arch)" = "arm64" ]; then target="amd64"; fi
Expand Down
8 changes: 8 additions & 0 deletions base/test-apt.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ load 'assert'
assert_line "Package: gcc"
}

@test "essentials" {
run xx-apt show xx-c-essentials
assert_success

run xx-apt show xx-cxx-essentials
assert_success
}

@test "amd64" {
export TARGETARCH=amd64
if ! xx-info is-cross; then skip; fi
Expand Down
4 changes: 2 additions & 2 deletions base/xx-apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,13 @@ packages2=
for p in ${packages}; do
if [ "${p}" = "xx-c-essentials" ]; then
p="libc6-dev"
if "$arg0" info "libgcc-10-dev:${XX_PKG_ARCH}" >/dev/null 2>/dev/null; then
if checkpkg "libgcc-10-dev:${XX_PKG_ARCH}" >/dev/null 2>/dev/null; then
p="$p libgcc-10-dev"
else
p="$p libgcc-8-dev"
fi
elif [ "${p}" = "xx-cxx-essentials" ]; then
if "$arg0" info "libstdc++-10-dev:${XX_PKG_ARCH}" >/dev/null 2>/dev/null; then
if checkpkg "libstdc++-10-dev:${XX_PKG_ARCH}" >/dev/null 2>/dev/null; then
p="libstdc++-10-dev"
else
p="libstdc++-8-dev"
Expand Down