[uClibc-cvs] uClibc/ldso/util Makefile, 1.38, 1.39 ldconfig.c, 1.13, 1.14 ldd.c, 1.34, 1.35
Erik Andersen
andersen at uclibc.org
Tue Nov 4 13:07:44 UTC 2003
Update of /var/cvs/uClibc/ldso/util
In directory winder:/tmp/cvs-serv7696/ldso/util
Modified Files:
Makefile ldconfig.c ldd.c
Log Message:
Rework the config system. Better utilize the Kconfig language
which should simplify enabling arbitrary architectures.
-Erik
Index: ldd.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/util/ldd.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ldd.c 13 Oct 2003 08:23:35 -0000 1.34
+++ ldd.c 4 Nov 2003 13:07:40 -0000 1.35
@@ -215,7 +215,7 @@
}
/* This function's behavior must exactly match that
- * in uClibc/ldso/d-link/readelflib1.c */
+ * in uClibc/ldso/ldso/readelflib1.c */
static void search_for_named_library(char *name, char *result, const char *path_list)
{
int i, count = 1;
@@ -322,11 +322,10 @@
}
/* Lastly, search the standard list of paths for the library.
- This list must exactly match the list in uClibc/ldso/d-link/readelflib1.c */
- path = UCLIBC_TARGET_PREFIX "/usr/lib:"
- UCLIBC_TARGET_PREFIX "/lib:"
- UCLIBC_DEVEL_PREFIX "/lib:"
- UCLIBC_BUILD_DIR "/lib:"
+ This list must exactly match the list in uClibc/ldso/ldso/readelflib1.c */
+ path = UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:"
+ UCLIBC_RUNTIME_PREFIX "usr/lib:"
+ UCLIBC_RUNTIME_PREFIX "lib:"
"/usr/lib:"
"/lib";
search_for_named_library(lib->name, buf, path);
Index: ldconfig.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/util/ldconfig.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ldconfig.c 13 Oct 2003 10:01:10 -0000 1.13
+++ ldconfig.c 4 Nov 2003 13:07:40 -0000 1.14
@@ -885,9 +885,9 @@
free(extpath);
}
- scan_dir(UCLIBC_TARGET_PREFIX "/usr/X11R6/lib");
- scan_dir(UCLIBC_TARGET_PREFIX "/usr/lib");
- scan_dir(UCLIBC_TARGET_PREFIX "/lib");
+ scan_dir(UCLIBC_RUNTIME_PREFIX "/usr/X11R6/lib");
+ scan_dir(UCLIBC_RUNTIME_PREFIX "/usr/lib");
+ scan_dir(UCLIBC_RUNTIME_PREFIX "/lib");
}
#ifdef USE_CACHE
Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/ldso/util/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile 31 Oct 2003 23:26:00 -0000 1.38
+++ Makefile 4 Nov 2003 13:07:40 -0000 1.39
@@ -53,43 +53,30 @@
$(HOSTCC) $(HOSTCFLAGS) -I. -I../include -c $< -o $@
strip -x -R .note -R .comment $*.o
-#ldconfig.o: ldconfig.c
-# $(HOSTCC) $(HOSTCFLAGS) -I. -I../include \
-# -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" -c $< -o $@
-# strip -x -R .note -R .comment $*.o
-
-#ldconfig: ldconfig.o readsoname.o
-# $(HOSTCC) $(HOSTCFLAGS) $^ -o $@
-# strip -x -R .note -R .comment $@
-
ldconfig: ldconfig.c readsoname.c
- $(HOSTCC) $(HOSTCFLAGS) $(XXFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
- -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
- -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \
+ $(HOSTCC) $(HOSTCFLAGS) $(XXFLAGS) \
+ -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" -I. -I../include \
$^ -o $@
strip -x -R .note -R .comment $@
ldconfig.target: ldconfig.c readsoname.c
- $(TARGET_CC) $(CFLAGS) $(XXFLAGS) -Wl,-s -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
- -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
- -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \
+ $(TARGET_CC) $(CFLAGS) $(XXFLAGS) -Wl,-s \
+ -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" -I. -I../include \
$^ -o $@ $(LDADD_LIBFLOAT)
$(STRIPTOOL) -x -R .note -R .comment $@
ldd: ldd.c
- $(HOSTCC) $(HOSTCFLAGS) $(XXFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
- -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
- -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \
+ $(HOSTCC) $(HOSTCFLAGS) $(XXFLAGS) \
+ -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" -I. -I../include \
$^ -o $@
strip -x -R .note -R .comment $@
ldd.target: ldd.c
- $(TARGET_CC) $(CFLAGS) $(XXFLAGS) -Wl,-s -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
- -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
- -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \
+ $(TARGET_CC) $(CFLAGS) $(XXFLAGS) -Wl,-s \
+ -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" \
$^ -o $@ $(LDADD_LIBFLOAT)
$(STRIPTOOL) -x -R .note -R .comment $@
More information about the uClibc-cvs
mailing list