| 1 |
hasufell 14/06/09 15:40:46 |
| 2 |
|
| 3 |
Added: liquidwar6-0.4.3681-check-headers.patch |
| 4 |
Log: |
| 5 |
fix build which was broken by multilib madness |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: liquidwar6-0.4.3681-check-headers.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Wed Jun 4 16:01:18 UTC 2014 |
| 19 |
Subject: fix header checks |
| 20 |
|
| 21 |
our multilib wrapped headers are broken shit |
| 22 |
|
| 23 |
--- a/configure.ac |
| 24 |
+++ b/configure.ac |
| 25 |
@@ -55,7 +55,7 @@ |
| 26 |
AC_SUBST(LW6_VERSION_MINOR) |
| 27 |
|
| 28 |
dnl Headers, some are optional |
| 29 |
-AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) |
| 30 |
+AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) |
| 31 |
|
| 32 |
dnl GNULIB stuff, http://www.gnu.org/software/gnulib/ |
| 33 |
gl_00GNULIB |
| 34 |
@@ -477,40 +477,42 @@ |
| 35 |
fi |
| 36 |
SDL_EXTRA="${SDL_EXTRA_CFLAGS} ${SDL_EXTRA_LIBS}" |
| 37 |
|
| 38 |
+CFLAGS="$CFLAGS $SDL_EXTRA_CFLAGS" |
| 39 |
+ |
| 40 |
AC_CHECK_HEADER(SDL/SDL.h, HAVE_SDL_H=1, AC_MSG_WARN([ |
| 41 |
*** Liquid War 6 needs SDL (http://www.libsdl.org/) |
| 42 |
-]),[${SDL_EXTRA}]) |
| 43 |
+]),[]) |
| 44 |
AC_CHECK_LIB(SDL, SDL_Init, HAVE_LIBSDL=1, AC_MSG_WARN([ |
| 45 |
*** Liquid War 6 needs SDL (http://www.libsdl.org/) |
| 46 |
-]),[${SDL_EXTRA}]) |
| 47 |
+]),[]) |
| 48 |
|
| 49 |
AC_CHECK_HEADER(GL/gl.h, HAVE_GL_GL_H=1,AC_MSG_WARN([ |
| 50 |
*** Liquid War 6 needs Mesa (http://www.mesa3d.org/) |
| 51 |
-]),[${SDL_EXTRA}]) |
| 52 |
+]),[]) |
| 53 |
AC_CHECK_LIB(GL, glBegin, HAVE_LIBGL=1, AC_MSG_WARN([ |
| 54 |
*** Liquid War 6 needs Mesa (http://www.mesa3d.org/) |
| 55 |
-]),[${SDL_EXTRA}]) |
| 56 |
+]),[]) |
| 57 |
|
| 58 |
AC_CHECK_HEADER(GL/glu.h, HAVE_GL_GLU_H=1,AC_MSG_WARN([ |
| 59 |
*** Liquid War 6 needs GLU (http://www.mesa3d.org/) |
| 60 |
-]),[${SDL_EXTRA}]) |
| 61 |
+]),[]) |
| 62 |
AC_CHECK_LIB(GLU, gluBeginCurve, HAVE_LIBGLU=1, AC_MSG_WARN([ |
| 63 |
*** Liquid War 6 needs GLU (http://www.mesa3d.org/) |
| 64 |
-]),[${SDL_EXTRA}]) |
| 65 |
+]),[]) |
| 66 |
|
| 67 |
AC_CHECK_HEADER(SDL/SDL_image.h, HAVE_SDL_IMAGE_H=1, AC_MSG_WARN([ |
| 68 |
*** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/) |
| 69 |
-]),[${SDL_EXTRA}]) |
| 70 |
+]),[]) |
| 71 |
AC_CHECK_LIB(SDL_image, IMG_Load, HAVE_LIBSDL_IMAGE=1, AC_MSG_WARN([ |
| 72 |
*** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/) |
| 73 |
-]),[${SDL_EXTRA}]) |
| 74 |
+]),[]) |
| 75 |
|
| 76 |
AC_CHECK_HEADER(SDL/SDL_ttf.h, HAVE_SDL_TTF_H=1, AC_MSG_WARN([ |
| 77 |
*** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/) |
| 78 |
-]),[${SDL_EXTRA}]) |
| 79 |
+]),[]) |
| 80 |
AC_CHECK_LIB(SDL_ttf, TTF_Init, HAVE_LIBSDL_TTF=1, AC_MSG_WARN([ |
| 81 |
*** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/) |
| 82 |
-]),[${SDL_EXTRA}]) |
| 83 |
+]),[]) |
| 84 |
|
| 85 |
AC_ARG_ENABLE([mod-gl1], AS_HELP_STRING([--enable-mod-gl1],[compile mod-gl1 default=yes]), [enable_mod_gl1=$enableval], [enable_mod_gl1=yes]) |
Archives