Changeset 9109

Timestamp:

10/26/11 15:27:18 (19 months ago)

Author:

walt

Message:

Fixing scandir and dlfcn issues for SL

Location:

branches/Orange-Branch

Files:

• configure (modified) (2 diffs)
• configure.in (modified) (2 diffs)
• src/client/usrint/stdio.c (modified) (1 diff)

branches/Orange-Branch/configure

@@ -15007 +15007 @@
 fi;
 
+echo "$as_me:$LINENO: checking if dlfns needs explicit library request" >&5
+echo $ECHO_N "checking if dlfns needs explicit library request... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+
+#define _GNU_SOURCE 1
+#include <dlfcn.h>
+main() {void *p = dlsym(RTLD_DEFAULT,"sym");}
+
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+    LIBS="$LIBS -ldl"
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+
 BUILD_UCACHE=
 # Check whether --enable-ucache or --disable-ucache was given.
@@ -15108 +15156 @@
 /* end confdefs.h.  */
 
-#define __USE_LARGEFILE64
+#define _LARGEFILE64_SOURCE 1
+#define _GNU_SOURCE 1
 #include <dirent.h>
 int scandir (const char *dir, struct dirent ***list,

branches/Orange-Branch/configure.in

@@ -847 +847 @@
 fi])
 
+dnl Method to check if dl calls need an explicit link flag
+AC_MSG_CHECKING(if dlfns needs explicit library request)
+AC_LINK_IFELSE(
+[
+#define _GNU_SOURCE 1
+#include <dlfcn.h>
+main() {void *p = dlsym(RTLD_DEFAULT,"sym");}
+],[
+    AC_MSG_RESULT(no)
+],[
+    AC_MSG_RESULT(yes)
+    LIBS="$LIBS -ldl"
+])
+
 dnl Method to enable user interface data cache
 BUILD_UCACHE=
@@ -884 +898 @@
 AC_MSG_CHECKING(for scandir compare arg using void pointers)
 AC_TRY_COMPILE([
-#define __USE_LARGEFILE64
+#define _LARGEFILE64_SOURCE 1
+#define _GNU_SOURCE 1
 #include <dirent.h>
 int scandir (const char *dir, struct dirent ***list,

branches/Orange-Branch/src/client/usrint/stdio.c

@@ -2588 +2588 @@
     }
     /* now sort entries */
-    qsort(*namelist, i, sizeof(struct dirent *), compar);
+    qsort(*namelist, i, sizeof(struct dirent *), (__compar_fn_t)compar);
     rc = closedir(dp);
     if (rc == -1)