58 lines
1.7 KiB
Plaintext
58 lines
1.7 KiB
Plaintext
|
--- src/lib/libast/features/libpath.sh
|
||
|
|
+++ src/lib/libast/features/libpath.sh 2007-03-30 18:45:55.030440187 +0200
|
||
|
|
@@ -21,7 +21,7 @@
|
||
|
|
########################################################################
|
||
|
|
ok=0
|
||
|
|
for i in \
|
||
|
|
- -x /lib/ld.so /lib/ld-*.so /usr/lib/ld.so /lib/rld \
|
||
|
|
+ -x /lib64/ld.so /lib/ld.so /lib64/ld-*.so /lib/ld-*.so /usr/lib/ld.so /lib/rld \
|
||
|
|
-f /usr/shlib/libc.so /shlib/libc.so /usr/lib/libc.so \
|
||
|
|
-r /usr/shlib/libc.so /shlib/libc.so
|
||
|
|
do case $i in
|
||
|
|
--- src/lib/libast/features/map.c
|
||
|
|
+++ src/lib/libast/features/map.c 2007-03-30 18:21:16.084565107 +0200
|
||
|
|
@@ -60,10 +60,14 @@ main()
|
||
|
|
#define _map_malloc 1
|
||
|
|
printf("\n");
|
||
|
|
printf("#define _map_libc 1\n");
|
||
|
|
+#endif
|
||
|
|
+#if _map_libc || defined(__linux__)
|
||
|
|
printf("#undef basename\n");
|
||
|
|
printf("#define basename _ast_basename\n");
|
||
|
|
printf("#undef dirname\n");
|
||
|
|
printf("#define dirname _ast_dirname\n");
|
||
|
|
+#endif
|
||
|
|
+#if _map_libc
|
||
|
|
printf("#undef eaccess\n");
|
||
|
|
printf("#define eaccess _ast_eaccess\n");
|
||
|
|
#if !_lib_execvpe
|
||
|
|
--- src/lib/libdll/features/dll
|
||
|
|
+++ src/lib/libdll/features/dll 2007-03-30 18:40:58.855596004 +0200
|
||
|
|
@@ -15,7 +15,7 @@ tst dll_DYNAMIC link{
|
||
|
|
}end
|
||
|
|
tst run{
|
||
|
|
lib=
|
||
|
|
- for d in /shlib /usr/shlib /lib /usr/lib
|
||
|
|
+ for d in /lib64 /usr/lib64 /lib /usr/lib
|
||
|
|
do if test -d $d
|
||
|
|
then for s in "*.*" "*[!a]*"
|
||
|
|
do for b in libc
|
||
|
|
@@ -52,7 +52,7 @@ tst run{
|
||
|
|
"") lib=/lib/libc.so.1 ;;
|
||
|
|
esac
|
||
|
|
case $lib in
|
||
|
|
- /usr/lib/*)
|
||
|
|
+ /usr/lib64*|/usr/lib/*)
|
||
|
|
case `package` in
|
||
|
|
sgi.mips3)
|
||
|
|
abi=/lib32
|
||
|
|
@@ -65,7 +65,7 @@ tst run{
|
||
|
|
esac
|
||
|
|
case $abi in
|
||
|
|
?*) if test -d $abi
|
||
|
|
- then lib=`echo $lib | sed 's,/usr/lib/,,'`
|
||
|
|
+ then lib=`echo $lib | sed 's,/usr/lib\(64\)\?/,,'`
|
||
|
|
lib=$abi/$lib
|
||
|
|
fi
|
||
|
|
;;
|