Merge pull request #171 from jwillemsen/jwi-fixroot

Fixed root for cross compilation setup
RemedyIT · Jun 11, 2024 · 73055e9 · 73055e9
2 parents 2506a87 + 6d30325
commit 73055e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/brix11/lib/brix11/brix/common/cmds/configure/ace_config.rb b/brix11/lib/brix11/brix/common/cmds/configure/ace_config.rb
@@ -51,9 +51,6 @@ def self.create_config(cfg)
           begin
             config_h_io = cfg.dryrun? ? STDOUT : File.new(config_h, 'w')
             config_h_io.puts("//----- #{CONFIG_H} -----") if cfg.dryrun?
-            if cfg.features.has_key?(:opendds) && cfg.features[:opendds].state
-              config_h_io << "#define OPENDDS_IGNORE_OPENDDSCONFIG_H_FILE\n"
-            end
             config_h_io << (cfg.options[:platform][:config_prelude] || '')
             config_h_io.puts(%Q{#include "ace/#{config_include(cfg.options)}"})
             config_h_io << (cfg.options[:platform][:config_post] || '')

diff --git a/brix11/lib/brix11/brix/common/cmds/configure/hostsetup.rb b/brix11/lib/brix11/brix/common/cmds/configure/hostsetup.rb
@@ -102,17 +102,14 @@ def setup(src, dst, mod)
             end
 
             def create_build_config(x11_host_root, cfg)
-              ace_config = File.join(x11_host_root, 'ACE', ACE_Config::CONFIG_H)
-              platform_macros = File.join(x11_host_root, 'ACE', ACE_Config::PLATFORM_MACROS)
-              default_features = File.join(x11_host_root, 'ACE', ACE_Config::DEFAULT_FEATURES)
+              ace_config = File.join(x11_host_root, 'ACE', 'ACE', ACE_Config::CONFIG_H)
+              platform_macros = File.join(x11_host_root, 'ACE', 'ACE', ACE_Config::PLATFORM_MACROS)
+              default_features = File.join(x11_host_root, 'ACE', 'ACE', ACE_Config::DEFAULT_FEATURES)
               openddsconfig_h = File.join(x11_host_root, 'DDS', ACE_Config::OPENDDSCONFIG_H)
 
               begin
                 config_h_io = cfg.dryrun? ? STDOUT : File.new(ace_config, 'w')
                 config_h_io.puts("//----- HOST #{ACE_Config::CONFIG_H} -----") if cfg.dryrun?
-                if cfg.features.has_key?(:opendds) && cfg.features[:opendds].state
-                  config_h_io << "#define OPENDDS_IGNORE_OPENDDSCONFIG_H_FILE\n"
-                end
                 config_h_io << "#define ACE_MONITOR_FRAMEWORK 0\n"
                 config_h_io.puts('#include "ace/config-linux.h"')
               ensure
@@ -159,7 +156,7 @@ def create_build_config(x11_host_root, cfg)
             end
 
             def create_mwc_config(x11_host_root, cfg)
-              mwc_config = File.join(x11_host_root, "#{MWC}.mwc")
+              mwc_config = File.join(x11_host_root, 'ACE', "#{MWC}.mwc")
               begin
                 mwc_config_io = cfg.dryrun? ? STDOUT : File.new(mwc_config, 'w')
                 mwc_config_io.puts("#----- HOST MWC config -----") if cfg.dryrun?
@@ -198,9 +195,9 @@ def self.create_host_environment(cfg)
               setup(dds_root, x11_host_opendds_root, 'OpenDDS') unless cfg.dryrun?
             end
             # create build configuration
-            create_build_config(x11_host_acetao_root, cfg)
+            create_build_config(x11_host_root, cfg)
             # create MWC config
-            create_mwc_config(x11_host_acetao_root, cfg)
+            create_mwc_config(x11_host_root, cfg)
           end
         end
       end