diff options
Diffstat (limited to 'recipes/xaos/files/fix-aalib-configure.patch')
| -rw-r--r-- | recipes/xaos/files/fix-aalib-configure.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/recipes/xaos/files/fix-aalib-configure.patch b/recipes/xaos/files/fix-aalib-configure.patch new file mode 100644 index 0000000000..120d85b6fe --- /dev/null +++ b/recipes/xaos/files/fix-aalib-configure.patch @@ -0,0 +1,81 @@ +Index: XaoS-3.2.3/configure.in +=================================================================== +--- XaoS-3.2.3.orig/configure.in ++++ XaoS-3.2.3/configure.in +@@ -130,25 +130,7 @@ if test -z "`${CC-cc} -mno-ieee-fp -c co + rm -f conftest* + ])]) + +-AC_DEFUN(AC_PROG_AALIB_VER_OK, +-[AC_CACHE_CHECK(whether aalib version >= 1.4, ac_aalib_ver_ok, +-[echo '#include <aalib.h> +-#include <aalib.h> +-void f(){ +-#if AA_LIB_VERSIONCODE < 104000 +-#error aa_lib is probably buggy +-/* I am using SuSE 7.3 and 8.0. Both contains version 1.3, +- * however they report 102000 version code. +- */ +-#endif +-}' > conftest.c +-if test -z "`${CC-cc} -c conftest.c 2>&1`"; then +- ac_aalib_ver_ok=yes +- else +- ac_aalib_ver_ok=no +- fi +- rm -f conftest* +-])]) ++ac_aalib_ver_ok=yes + + AC_DEFUN(PROG_CC_SWITCH1, + [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_$2, +@@ -478,7 +460,6 @@ AC_DEFUN(AC_AALIB, [ + AC_CHECK_LIB(aa, aa_init) + if test "x$ac_cv_lib_aa_aa_init" = xyes; then + AC_MSG_RESULT(Found aalib on $1/aalib.h) +- AC_PROG_AALIB_VER_OK + if test $ac_aalib_ver_ok = yes; then + #LIBS="$LIBS $2" + x11_linked=yes +@@ -616,22 +597,22 @@ if test "$aa_driver_test" = yes; then + dnl Replace `main' with a function in -lm: + AC_CHECK_LIB(slang, SLsmg_init_smg) + +- AC_NCURSES(/usr/include, ncurses.h, , -I/usr/include/ncurses , "ncurses on /usr/include") +- AC_NCURSES(/usr/include/ncurses, ncurses.h, , -I/usr/include/ncurses, "ncurses on /usr/include/ncurses") +- AC_NCURSES(/usr/local/include, ncurses.h, ,-L/usr/local/lib, -I/usr/local/include, "ncurses on /usr/local") +- AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses , "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, ,-L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, "ncurses on /usr/local") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib/ncurses, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") + +- AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") + +- AC_NCURSES(/usr/include/ncurses, curses.h, , -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses") +- AC_CURSES(/usr/include, curses.h, , , "curses on /usr/include") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") ++ AC_CURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, curses.h, , , "curses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include") + + dnl + dnl We couldn't find ncurses, try SysV curses + dnl + if $search_ncurses + then +- AC_EGREP_HEADER(init_color, /usr/include/curses.h, ++ AC_EGREP_HEADER(init_color, /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/curses.h, + AC_USE_SYSV_CURSES) + fi + +@@ -653,8 +634,8 @@ if test "$aa_driver_test" = yes; then + LIBS="$LIBS $X_EXTRA_LIBS $X_LIBS" + CFLAGS="$CFLAGS $X_CFLAGS" + fi +- AC_AALIB(/usr/include, , ) +- AC_AALIB(/usr/local/include, -L/usr/local/lib, -I/usr/local/include) ++ AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, , ) ++ AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include) + for name in ../aalib-*.* + do + AC_AALIB($name,"-L$name","-I$name") |