Further fixes for compilation on Mac OSX.

Author: YvanFournier

bin/cs_compile.py

@@ -265,6 +265,15 @@ def get_flags(self, flag):
 
     #---------------------------------------------------------------------------
 
+    def get_ar_lib_dir(self):
+        """
+        Determine directory containing library in archive mode.
+        """
+
+        return self.pkg.get_dir('libdir')
+
+    #---------------------------------------------------------------------------
+
     def so_dirs_path(self, flags):
         """
         Assemble path for shared libraries in nonstandard directories.
@@ -466,7 +475,7 @@ def link_obj(self, exec_name, obj_files=None, opt_libs=None,
             temp_dir = tempfile.mkdtemp(suffix=".cs_link")
             os.chdir(temp_dir)
 
-            lib0 = os.path.join(pkg.get_dir('libdir'),
+            lib0 = os.path.join(self.get_ar_lib_dir(),
                                 'lib' + p_libs[0][2:] + '.a')
             p_libs = p_libs[1:]
             cmd = ['ar', 'x', lib0]

build-aux/cs_compile_build.py

@@ -119,6 +119,20 @@ def __init__(self,
         cs_compile.__init__(self, package)
         self.srcdir = srcdir
 
+        top_builddir = os.getcwd()
+        while not os.path.isfile(os.path.join(top_builddir, "cs_config.h")):
+            ds = os.path.split(top_builddir)
+            if ds[1]:
+                top_builddir = ds[0]
+            else:
+                break
+
+        if not os.path.isdir(os.path.join(top_builddir, "src")):
+            raise Exception("top build directory not detected from: " \
+                            + os.getcwd())
+
+        self.top_builddir = top_builddir
+
     #---------------------------------------------------------------------------
 
     def get_compiler(self, compiler):
@@ -143,17 +157,7 @@ def get_pkg_path_flags(self, flag):
 
         flags = []
 
-        top_builddir = os.getcwd()
-        while not os.path.isfile(os.path.join(top_builddir, "cs_config.h")):
-            ds = os.path.split(top_builddir)
-            if ds[1]:
-                top_builddir = ds[0]
-            else:
-                break
-
-        if not os.path.isdir(os.path.join(top_builddir, "src")):
-            raise Exception("top build directory not detected from: " \
-                            + os.getcwd())
+        top_builddir = self.top_builddir
 
         # Add CPPFLAGS and LDFLAGS information for the current package
         if flag == 'cppflags':
@@ -184,6 +188,15 @@ def get_pkg_path_flags(self, flag):
 
         return flags
 
+    #---------------------------------------------------------------------------
+
+    def get_ar_lib_dir(self):
+        """
+        Determine directory containing library in archive mode.
+        """
+
+        return os.path.join(self.top_builddir, "src", "apps", ".libs")
+
 #===============================================================================
 # Class used to manage install
 #===============================================================================
@@ -256,16 +269,13 @@ def flags_relocation(self, flag, cmd_line):
     #---------------------------------------------------------------------------
 
     def get_flags(self, flag):
-
-        if flag == 'libs':
-            return cs_compile.get_flags(self, flag)
-
-        cmd_line = []
-
         """
         Determine compilation flags for a given flag type.
         """
 
+        if flag == 'libs':
+            return cs_compile.get_flags(self, flag)
+
         cmd_line = self.get_pkg_path_flags(flag)
 
         # Build the command line, and split possible multiple arguments in lists.
@@ -290,6 +300,21 @@ def get_flags(self, flag):
 
         return cmd_line
 
+    #---------------------------------------------------------------------------
+
+    def get_lib_dir(self):
+        """
+        Determine directory containing library.
+        """
+
+        cmd_line = self.get_pkg_path_flags(flag)
+
+        # Build the command line, and split possible multiple arguments in lists.
+        for lib in pkg.config.deplibs:
+            if (pkg.config.libs[lib].have == "yes" \
+                and (not pkg.config.libs[lib].dynamic_load)):
+                cmd_line += separate_args(pkg.config.libs[lib].flags[flag])
+
 #===============================================================================
 # Functions
 #===============================================================================