Skip to content

Commit 4e7a39d

Browse files
nmburgannmburgan
authored
Merge pull request #179 from OpenVoxProject/solaris
Remove unused cross compilation logic
2 parents 9df0d3e + d6dd2b6 commit 4e7a39d

24 files changed

Lines changed: 37 additions & 416 deletions

‎configs/components/_base-ruby.rb‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@
1616
# ENVIRONMENT
1717
#############
1818

19-
if platform.is_cross_compiled_linux?
20-
pkg.environment 'PATH', "#{settings[:bindir]}:$(PATH)"
21-
pkg.environment 'CC', "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-gcc"
22-
pkg.environment 'CXX', "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-g++"
23-
pkg.environment 'LDFLAGS', "-Wl,-rpath=#{settings[:libdir]}"
24-
elsif platform.is_windows?
19+
if platform.is_windows?
2520
pkg.environment 'PATH',
2621
"$(shell cygpath -u #{settings[:gcc_bindir]}):$(shell cygpath -u #{settings[:tools_root]}/bin):$(shell cygpath -u #{settings[:tools_root]}/include):$(shell cygpath -u #{settings[:bindir]}):$(shell cygpath -u #{ruby_bindir}):$(shell cygpath -u #{settings[:includedir]}):$(PATH)"
2722
pkg.environment 'CYGWIN', settings[:cygwin]
@@ -45,8 +40,6 @@
4540

4641
pkg.build_requires "openssl-#{settings[:openssl_version]}"
4742

48-
pkg.build_requires "runtime-#{settings[:runtime_project]}" if platform.is_cross_compiled_linux?
49-
5043
#######
5144
# BUILD
5245
#######

‎configs/components/_base-rubygem.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
raise "You must set the `pkg.version` in your rubygem component before instance_eval'ing _base_rubygem.rb" unless version && !version.empty?
1212

1313
pkg.build_requires "runtime-#{settings[:runtime_project]}"
14-
pkg.build_requires 'pl-ruby-patch' if platform.is_cross_compiled?
1514

1615
if platform.is_windows?
1716
pkg.environment 'PATH',

‎configs/components/augeas.rb‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,12 @@
2828
if platform.is_rpm?
2929
if platform.architecture =~ /aarch64/
3030
pkg.build_requires "runtime-#{settings[:runtime_project]}"
31-
pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
31+
pkg.environment 'PATH', "$(PATH):#{settings[:bindir]}"
3232
pkg.environment 'CFLAGS', settings[:cflags]
3333
pkg.environment 'LDFLAGS', settings[:ldflags]
3434
end
3535
elsif platform.is_deb?
3636
pkg.requires 'libreadline6'
37-
38-
if platform.is_cross_compiled_linux?
39-
pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
40-
pkg.environment 'CFLAGS', settings[:cflags]
41-
pkg.environment 'LDFLAGS', settings[:ldflags]
42-
end
4337
elsif platform.is_macos?
4438
pkg.environment 'PATH', '$(PATH):/opt/homebrew/bin:/usr/local/bin'
4539
pkg.environment 'CFLAGS', settings[:cflags]

‎configs/components/curl.rb‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,13 @@
99
pkg.build_requires 'puppet-ca-bundle'
1010

1111
ldflags = settings[:ldflags]
12-
if platform.is_cross_compiled_linux?
13-
pkg.build_requires "runtime-#{settings[:runtime_project]}"
14-
pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
15-
pkg.environment 'PKG_CONFIG_PATH', '/opt/puppetlabs/puppet/lib/pkgconfig'
16-
pkg.environment 'PATH', '/opt/pl-build-tools/bin:$(PATH)'
17-
elsif platform.is_windows?
12+
if platform.is_windows?
1813
pkg.build_requires "runtime-#{settings[:runtime_project]}"
1914
pkg.environment 'PATH', "$(shell cygpath -u #{settings[:gcc_bindir]}):$(PATH)"
2015
pkg.environment 'NM', '/usr/bin/nm' if platform.name =~ /windowsfips-2016/
2116
pkg.environment 'CYGWIN', settings[:cygwin]
2217
else
23-
pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
18+
pkg.environment 'PATH', "$(PATH):#{settings[:bindir]}"
2419
end
2520

2621
configure_options = []

‎configs/components/dmidecode.rb‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
pkg.environment 'LDFLAGS', settings[:ldflags]
1111
pkg.environment 'CFLAGS', settings[:cflags]
1212

13-
if platform.is_cross_compiled?
14-
# The Makefile doesn't honor environment overrides, so we need to
15-
# edit it directly for cross-compiling
16-
pkg.configure do
17-
["sed -i \"s|gcc|/opt/pl-build-tools/bin/#{settings[:platform_triple]}-gcc|g\" Makefile"]
18-
end
19-
end
20-
2113
pkg.build do
2214
["#{platform[:make]} -j$(shell expr $(shell #{platform[:num_cores]}) + 1)"]
2315
end

‎configs/components/libffi.rb‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,15 @@
55
pkg.load_from_json('configs/components/libffi.json')
66
pkg.mirror "#{settings[:buildsources_url]}/#{pkg.get_name}-#{pkg.get_version}.tar.gz"
77

8-
if platform.is_cross_compiled_linux?
9-
pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
10-
pkg.environment 'CFLAGS', settings[:cflags]
11-
pkg.environment 'LDFLAGS', settings[:ldflags]
12-
elsif platform.is_macos?
13-
pkg.environment 'LDFLAGS', settings[:ldflags]
14-
pkg.environment 'CFLAGS', settings[:cflags]
8+
pkg.environment 'LDFLAGS', settings[:ldflags]
9+
pkg.environment 'CFLAGS', settings[:cflags]
10+
11+
if platform.is_macos?
1512
pkg.environment 'CC', settings[:cc]
1613
pkg.environment 'MACOSX_DEPLOYMENT_TARGET', settings[:deployment_target]
1714
elsif platform.is_windows?
1815
pkg.environment 'PATH', "$(shell cygpath -u #{settings[:gcc_bindir]}):$(PATH)"
19-
pkg.environment 'LDFLAGS', settings[:ldflags]
20-
pkg.environment 'CFLAGS', settings[:cflags]
21-
2216
pkg.apply_patch 'resources/patches/libffi/revert_clang_32bit.patch' if platform.architecture == 'x86'
23-
else
24-
pkg.environment 'LDFLAGS', settings[:ldflags]
25-
pkg.environment 'CFLAGS', settings[:cflags]
2617
end
2718

2819
pkg.build_requires "runtime-#{settings[:runtime_project]}"

‎configs/components/libxml2.rb‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,12 @@
77
pkg.load_from_json('configs/components/libxml2.json')
88
pkg.mirror "#{settings[:buildsources_url]}/libxml2-#{pkg.get_version}.tar.xz"
99

10-
if platform.is_cross_compiled_linux?
11-
pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
12-
pkg.environment 'CFLAGS', settings[:cflags]
13-
pkg.environment 'LDFLAGS', settings[:ldflags]
14-
elsif platform.is_macos?
15-
pkg.environment 'LDFLAGS', settings[:ldflags]
16-
pkg.environment 'CFLAGS', settings[:cflags]
10+
pkg.environment 'LDFLAGS', settings[:ldflags]
11+
pkg.environment 'CFLAGS', settings[:cflags]
12+
13+
if platform.is_macos?
1714
pkg.environment 'CC', settings[:cc]
1815
pkg.environment 'MACOSX_DEPLOYMENT_TARGET', settings[:deployment_target]
19-
else
20-
pkg.environment 'LDFLAGS', settings[:ldflags]
21-
pkg.environment 'CFLAGS', settings[:cflags]
2216
end
2317

2418
pkg.build_requires "runtime-#{settings[:runtime_project]}"

‎configs/components/libyaml.rb‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,14 @@
55
pkg.load_from_json('configs/components/libyaml.json')
66
pkg.mirror "#{settings[:buildsources_url]}/yaml-#{pkg.get_version}.tar.gz"
77

8-
if platform.is_cross_compiled_linux?
9-
pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
10-
pkg.environment 'CFLAGS', settings[:cflags]
11-
pkg.environment 'LDFLAGS', settings[:ldflags]
12-
elsif platform.is_macos?
13-
pkg.environment 'LDFLAGS', settings[:ldflags]
14-
pkg.environment 'CFLAGS', settings[:cflags]
8+
pkg.environment 'LDFLAGS', settings[:ldflags]
9+
pkg.environment 'CFLAGS', settings[:cflags]
10+
11+
if platform.is_macos?
1512
pkg.environment 'CC', settings[:cc]
1613
pkg.environment 'MACOSX_DEPLOYMENT_TARGET', settings[:deployment_target]
1714
elsif platform.is_windows?
1815
pkg.environment 'PATH', "$(shell cygpath -u #{settings[:gcc_bindir]}):$(PATH)"
19-
pkg.environment 'LDFLAGS', settings[:ldflags]
20-
pkg.environment 'CFLAGS', settings[:cflags]
21-
else
22-
pkg.environment 'LDFLAGS', settings[:ldflags]
23-
pkg.environment 'CFLAGS', settings[:cflags]
2416
end
2517

2618
pkg.build_requires "runtime-#{settings[:runtime_project]}"

‎configs/components/openssl-3.0.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
target = "darwin64-#{platform.architecture}"
3838

3939
elsif platform.is_linux?
40-
pkg.environment 'PATH', '/opt/pl-build-tools/bin:$(PATH):/usr/local/bin'
40+
pkg.environment 'PATH', '$(PATH):/usr/local/bin'
4141

4242
ldflags = "#{settings[:ldflags]} -Wl,-z,relro"
4343
case platform.architecture

‎configs/components/pl-ruby-patch.rb‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)