[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[openap-cvs] : openap-main/scripts mklibs,1.2,1.3
From: |
David Kimdon <address@hidden> |
Subject: |
[openap-cvs] : openap-main/scripts mklibs,1.2,1.3 |
Date: |
Wed, 31 Jul 2002 14:56:21 -0400 |
Update of /cvsroot/openap/openap-main/scripts
In directory subversions:/tmp/cvs-serv26823
Modified Files:
mklibs
Log Message:
apply our changes
Index: mklibs
===================================================================
RCS file: /cvsroot/openap/openap-main/scripts/mklibs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mklibs 31 Jul 2002 18:44:02 -0000 1.2
+++ mklibs 31 Jul 2002 18:56:18 -0000 1.3
@@ -194,7 +194,7 @@
##
## Options:
## -L DIRECTORY Add DIRECTORY to library search path.
-## -D, --no-default-lib Do not use default lib directories of
/lib:/usr/lib
+## -D, --no-default-lib Do not use default lib directories
/lib:/usr/lib
## -n, --dry-run Don't actually run any commands; just print
them.
## -v, --verbose Print additional progress information.
## -V, --version Print the version number and exit.
@@ -217,6 +217,8 @@
lib_path = []
dest_path = "DEST"
ldlib = "LDLIB"
+include_default_lib_path = "yes"
+default_lib_path = ["/lib/", "/usr/lib/", "/usr/X11R6/lib/"]
libc_extras_dir = "/usr/lib/libc_pic"
target = ""
so_pattern = re.compile("(.*)\.so(\.\d+)*")
@@ -230,6 +232,8 @@
lib_path.extend(string.split(arg, ":"))
elif opt in ("-d", "--dest-dir"):
dest_path = arg
+ elif opt in ("-D", "--no-default-lib"):
+ include_default_lib_path = "no"
elif opt == "--ldlib":
ldlib = arg
elif opt == "--libc-extras-dir":
@@ -241,6 +245,8 @@
print "Make a set of minimal libraries for FILE(s) in DEST."
print
print " -d, --dest-dir DIRECTORY create libraries in DIRECTORY"
+ print " -D, --no-default-libs omit default libpath"
+ print " [", string.join(default_lib_path,
":"), "]"
print " -L DIRECTORY[:DIRECTORY]... add DIRECTORY(s) to the library
search path"
print " --ldlib LDLIB use LDLIB for the dynamic linker"
print " --libc-extras-dir DIRECTORY look for libc extra files in
DIRECTORY"
@@ -251,7 +257,8 @@
else:
print "WARNING: unknown option: " + opt + "\targ: " + arg
-lib_path.extend(["/lib/", "/usr/lib/", "/usr/X11R6/lib/"])
+if include_default_lib_path == "yes":
+ lib_path.extend(default_lib_path)
if ldlib == "LDLIB":
ldlib = os.getenv("ldlib")
@@ -385,15 +392,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:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [openap-cvs] : openap-main/scripts mklibs,1.2,1.3,
David Kimdon <address@hidden> <=