summaryrefslogtreecommitdiff
path: root/package/fltk/fltk-1.1.7-scandir-fix.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-05-21 16:11:25 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-05-21 16:14:17 +0200
commit584921cb87b66f6c2dd8d080593137ed64a529d0 (patch)
treedc178785fa0484cf3527e6883acc65a13d21e604 /package/fltk/fltk-1.1.7-scandir-fix.patch
parentf3122259e2cbbc0be0fc02820a146b4e4f48bef6 (diff)
fltk: fix build
The build of fltk was failing due to an issue in the usage of scandir(). This issue is fixed by a new patch, fltk-1.1.7-scandir-fix.patch. Moreover, this problem was not necessarly visible, as the build process of FLTK didn't bail out with an error when it was failing. This if fixed by fltk-1.1.7-bail-out-on-error.patch. Finally, there was a problem with the tests of FLTK, so we disabled them. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/fltk/fltk-1.1.7-scandir-fix.patch')
-rw-r--r--package/fltk/fltk-1.1.7-scandir-fix.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/package/fltk/fltk-1.1.7-scandir-fix.patch b/package/fltk/fltk-1.1.7-scandir-fix.patch
new file mode 100644
index 000000000..ba2b56093
--- /dev/null
+++ b/package/fltk/fltk-1.1.7-scandir-fix.patch
@@ -0,0 +1,20 @@
+Use the correct scandir() call.
+
+See http://www.fltk.org/str.php?L2205. This patch is a simplified
+version of http://www.fltk.org/strfiles/2205/scandir_posix.patch.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: fltk-1.1.7/src/filename_list.cxx
+===================================================================
+--- fltk-1.1.7.orig/src/filename_list.cxx 2010-05-21 15:58:09.000000000 +0200
++++ fltk-1.1.7/src/filename_list.cxx 2010-05-21 16:00:21.000000000 +0200
+@@ -54,7 +54,7 @@
+ Fl_File_Sort_F *sort) {
+ #ifndef HAVE_SCANDIR
+ int n = scandir(d, list, 0, sort);
+-#elif defined(__hpux) || defined(__CYGWIN__)
++#elif defined(__hpux) || defined(__CYGWIN__) || defined(__USE_POSIX)
+ // HP-UX, Cygwin define the comparison function like this:
+ int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
+ #elif defined(__osf__)