[openap-cvs] : wl11000/scripts mklibs,1.1,1.2

[David Kimdon <address@hidden>]

Update of /cvsroot/openap/wl11000/scripts
In directory subversions:/tmp/cvs-serv21814

Modified Files:
        mklibs 
Log Message:
scripts/mklibs : small hacks to make work with uClibc


Index: mklibs
===================================================================
RCS file: /cvsroot/openap/wl11000/scripts/mklibs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mklibs      13 Jul 2002 05:33:53 -0000      1.1
+++ mklibs      13 Jul 2002 05:37:37 -0000      1.2
@@ -5,6 +5,8 @@
 # Copyright 2001 by Falk Hueffner <address@hidden>
 #                 & Goswin Brederlow <address@hidden>
 #
+# Hacked by David Kimdon to support uClibc.
+#
 # mklibs.sh by Marcus Brinkmann <address@hidden>
 # used as template
 #
@@ -174,18 +176,13 @@
 def find_pic(lib):
     base_name = so_pattern.match(lib).group(1)
     for path in lib_path:
-        for file in glob.glob(path + "/" + base_name + "*_pic.a"):
+        for file in glob.glob(path + "/" + base_name + "*.a"):
             if os.access(file, os.F_OK):
                 return resolve_link(file)
     return ""
 
 # Find a PIC .map file for the library
 def find_pic_map(lib):
-    base_name = so_pattern.match(lib).group(1)
-    for path in lib_path:
-        for file in glob.glob(path + "/" + base_name + "*_pic.map"):
-            if os.access(file, os.F_OK):
-                return resolve_link(file)
     return ""
 
 #################### main ####################
@@ -250,7 +247,6 @@
     else:
         print "WARNING: unknown option: " + opt + "\targ: " + arg
 
-lib_path.extend(["/lib/", "/usr/lib/", "/usr/X11R6/lib/"])
 
 if ldlib == "LDLIB":
     ldlib = os.getenv("ldlib")
@@ -384,15 +380,15 @@
                 if not ldlib:
                     ldlib = "ld-" + re.match("libc-(.*).so", 
so_file_name).group(1) + ".so"
                 extra_flags = find_lib(ldlib)
-                extra_pre_obj = libc_extras_dir + "/soinit.o"
-                extra_post_obj = libc_extras_dir + "/sofini.o"
+                extra_pre_obj = "" #libc_extras_dir + "/soinit.o"
+                extra_post_obj = "" #libc_extras_dir + "/sofini.o"
             else:
                 extra_flags = ""
                 extra_pre_obj = ""
                 extra_post_obj = ""
             map_file = find_pic_map(library)
-            if map_file:
-                extra_flags = extra_flags + " -Wl,--version-script=" + map_file
+            #if map_file:
+            #    extra_flags = extra_flags + " -Wl,--version-script=" + 
map_file
             if library_symbols_used[library].elems():
                 joined_symbols = "-u" + 
string.join(library_symbols_used[library].elems(), " -u")
             else:
@@ -426,6 +422,14 @@
 for lib in regexpfilter(os.listdir(dest_path), "(.*-so)$").elems():
     os.remove(dest_path + "/" + lib)
 
+# FIXME: ld-uClibc-0.9.12.so isn't showing up for some reason unless I move 
this to here
+# Make the dynamic linker executable
+ld_file = find_lib(ldlib)
+ld_file_name = os.path.basename(ld_file)
+command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
+        ld_file, dest_path + "/" + ld_file_name)
+os.chmod(dest_path + "/" + ld_file_name, 0755)
+
 for lib in regexpfilter(os.listdir(dest_path), "(.*so[.\d]*)$").elems():
     print soname
     print dest_path + "/" + lib
@@ -435,8 +439,3 @@
         os.symlink(lib, dest_path + "/" + soname)
     except OSError:
         pass
-
-# Make the dynamic linker executable
-ld_file = find_lib(ldlib)
-ld_file_name = os.path.basename(ld_file)
-os.chmod(dest_path + "/" + ld_file_name, 0755)