-
Notifications
You must be signed in to change notification settings - Fork 22
agent-runtime-main: remove more solaris/aix leftovers #177
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -13,43 +13,21 @@ | |||||
| pkg.build_requires 'ruby-selinux' | ||||||
| end | ||||||
|
|
||||||
| if platform.name =~ /solaris-10-sparc/ | ||||||
| # This patch to gnulib fixes a linking error around symbol versioning in pthread. | ||||||
| pkg.add_source "file://resources/patches/augeas/augeas-#{version}-gnulib-pthread-in-use.patch" | ||||||
| pkg.configure do | ||||||
| # gnulib is a submodule, and its files don't exist until after configure, | ||||||
| # so we apply the patch manually here instead of using pkg.apply_patch. | ||||||
| ["/usr/bin/gpatch -p0 < ../augeas-#{version}-gnulib-pthread-in-use.patch"] | ||||||
| end | ||||||
| end | ||||||
|
|
||||||
| if platform.is_macos? | ||||||
| pkg.build_requires 'readline' | ||||||
| pkg.build_requires 'autoconf' | ||||||
| pkg.build_requires 'automake' | ||||||
| pkg.build_requires 'libtool' | ||||||
| end | ||||||
|
|
||||||
| extra_config_flags = platform.name =~ /solaris-11|aix/ ? ' --disable-dependency-tracking' : '' | ||||||
|
|
||||||
| pkg.mirror "#{settings[:buildsources_url]}/augeas-#{pkg.get_version}.tar.gz" | ||||||
|
|
||||||
| pkg.build_requires 'libxml2' | ||||||
|
|
||||||
| # Ensure we're building against our own libraries when present | ||||||
| pkg.environment 'PKG_CONFIG_PATH', "#{settings[:libdir]}/pkgconfig" | ||||||
|
|
||||||
| if platform.is_aix? | ||||||
| pkg.environment 'CC', '/opt/freeware/bin/gcc' | ||||||
| pkg.environment 'PATH', "/opt/freeware/bin:$(PATH):#{settings[:bindir]}" | ||||||
| pkg.build_requires "runtime-#{settings[:runtime_project]}" | ||||||
| pkg.build_requires 'readline' | ||||||
|
|
||||||
| pkg.environment 'LDFLAGS', settings[:ldflags] | ||||||
| pkg.environment 'CFLAGS', "-I#{settings[:includedir]}" | ||||||
| end | ||||||
|
|
||||||
| if platform.is_rpm? && !platform.is_aix? | ||||||
| if platform.is_rpm? | ||||||
| if platform.architecture =~ /aarch64|ppc64|ppc64le/ | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Genuine question: should this also be:
Suggested change
No idea if aarch64 is actually cross compiled or natively compiled
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. good point. right now we use native ARM 64bit runners.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also when we were actually making ppc64le, we'd do it in an appropriate container using qemu emulation, so we truly don't do any cross compilation.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @ekohl any chances that redhat would like to have powerpc packages, or could I remove ppc64 & ppc64le as well? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think we had a request for that so I'd be tempted to drop that. If you do it in a clean commit then it can be reverted in the future, right?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. powerpc removal: #180 |
||||||
| pkg.build_requires "runtime-#{settings[:runtime_project]}" | ||||||
| pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}" | ||||||
|
|
@@ -64,24 +42,6 @@ | |||||
| pkg.environment 'CFLAGS', settings[:cflags] | ||||||
| pkg.environment 'LDFLAGS', settings[:ldflags] | ||||||
| end | ||||||
|
|
||||||
| elsif platform.is_solaris? | ||||||
| pkg.environment 'PATH', | ||||||
| "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}" | ||||||
| pkg.environment 'CFLAGS', settings[:cflags] | ||||||
| pkg.environment 'LDFLAGS', settings[:ldflags] | ||||||
| pkg.build_requires 'libedit' | ||||||
| pkg.build_requires "runtime-#{settings[:runtime_project]}" | ||||||
| if platform.os_version == '10' | ||||||
| pkg.environment 'PKG_CONFIG_PATH', '/opt/csw/lib/pkgconfig' | ||||||
| pkg.environment 'PKG_CONFIG', '/opt/csw/bin/pkg-config' | ||||||
| elsif !platform.is_cross_compiled? && platform.architecture == 'sparc' | ||||||
| pkg.environment 'PKG_CONFIG_PATH', "#{settings[:libdir]}/pkgconfig" | ||||||
| pkg.environment 'PKG_CONFIG', '/usr/bin/pkg-config' | ||||||
| else | ||||||
| pkg.environment 'PKG_CONFIG_PATH', '/usr/lib/pkgconfig' | ||||||
| pkg.environment 'PKG_CONFIG', '/opt/pl-build-tools/bin/pkg-config' | ||||||
| end | ||||||
| elsif platform.is_macos? | ||||||
| pkg.environment 'PATH', '$(PATH):/opt/homebrew/bin:/usr/local/bin' | ||||||
| pkg.environment 'CFLAGS', settings[:cflags] | ||||||
|
|
@@ -108,7 +68,7 @@ | |||||
| end | ||||||
|
|
||||||
| pkg.configure do | ||||||
| ["./configure #{extra_config_flags} --prefix=#{settings[:prefix]} #{settings[:host]}"] | ||||||
| ["./configure --prefix=#{settings[:prefix]} #{settings[:host]}"] | ||||||
| end | ||||||
|
|
||||||
| pkg.build do | ||||||
|
|
||||||
Uh oh!
There was an error while loading. Please reload this page.