Skip to content

Remove inactive AIX-specific implementation from pkg/trace/watchdog #45122

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

Closed
rdesgroppes wants to merge 1 commit into from
Closed

Remove inactive AIX-specific implementation from pkg/trace/watchdog #45122

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
13 changes: 0 additions & 13 deletions deps/bzip2/overlay.BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@ cc_library(
"-D_FILE_OFFSET_BITS=64",
] + select(
{
#"@platforms//os:aix": [
# "-qpic=small",
# "-O2",
# "-D_ALL_SOURCE",
# "-D_LARGE_FILES",
#],
"@platforms//os:linux": [
"-fPIC",
"-O3",
Expand Down Expand Up @@ -118,13 +112,6 @@ cc_shared_library(
win_def_file = "libbz2.def",
deps = [":libbz2"],
user_link_flags = select({
#"//bazel/platforms:os_aix": [
# "-qmkshrobj",
# "-Wl,-soname",
#],
#"@platforms//os:linux": [
# "-Wl,'@rpath/libbz2.so.1.0.8'",
#],
"@platforms//os:macos": [
"-shared",
# "-Wl,-install_name",
Expand Down
2 changes: 0 additions & 2 deletions omnibus/config/software/python3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
elsif linux_target?
python_configure_options.push("--enable-shared",
"--enable-ipv6")
elsif aix?
# something here...
end

python_configure_options.push("--with-dbmliborder=")
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/setup/config_nix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2016-present Datadog, Inc.

//go:build linux || freebsd || netbsd || openbsd || solaris || dragonfly || aix
//go:build linux || freebsd || netbsd || openbsd || solaris || dragonfly

package setup

Expand Down
2 changes: 1 addition & 1 deletion pkg/pidfile/pidfile_nix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2016-present Datadog, Inc.

//go:build freebsd || linux || netbsd || openbsd || solaris || dragonfly || aix
//go:build freebsd || linux || netbsd || openbsd || solaris || dragonfly

package pidfile

Expand Down
2 changes: 1 addition & 1 deletion pkg/trace/watchdog/cpu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2016-present Datadog, Inc.

//go:build !windows && !aix
//go:build !windows

// Package watchdog monitors the trace-agent resource usage.
package watchdog
Expand Down
111 changes: 0 additions & 111 deletions pkg/trace/watchdog/cpu_aix.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/util/hostname/container_stub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2016-present Datadog, Inc.

//go:build freebsd || netbsd || openbsd || solaris || dragonfly || aix
//go:build freebsd || netbsd || openbsd || solaris || dragonfly

package hostname

Expand Down
2 changes: 1 addition & 1 deletion pkg/util/log/setup/defaults_nix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2016-present Datadog, Inc.

//go:build linux || freebsd || netbsd || openbsd || solaris || dragonfly || aix
//go:build linux || freebsd || netbsd || openbsd || solaris || dragonfly

package logs

Expand Down
2 changes: 1 addition & 1 deletion pkg/util/log/setup/log_nix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2016-present Datadog, Inc.

//go:build linux || freebsd || netbsd || openbsd || solaris || dragonfly || darwin || aix
//go:build linux || freebsd || netbsd || openbsd || solaris || dragonfly || darwin

package logs

Expand Down
Loading