]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/uqm/files/build-oe.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / uqm / files / build-oe.patch
1 --- build/unix/config_proginfo  2005-01-21 23:55:20.600681568 +1300
2 +++ build/unix/config_proginfo  2005-01-21 23:55:28.136535944 +1300
3 @@ -19,9 +19,9 @@
4  
5  # Describe the programs (possibly) used:
6  PROG_gcc_NAME="GNU C compiler"
7 -PROG_gcc_FILE="gcc"
8 +PROG_gcc_FILE="$CC"
9  PROG_gcc_ACTION=""
10 -PROG_gcc_VERSION='$(gcc --version)'
11 +PROG_gcc_VERSION='$($CC --version)'
12  
13  PROG_sed_NAME="Sed stream editor"
14  PROG_sed_FILE="sed"
15 @@ -60,7 +60,7 @@
16  esac
17  case "$OSNAME" in
18         FreeBSD)  LIB_SDL_LDFLAGS='$(sdl11-config --libs)' ;;
19 -       *)        LIB_SDL_LDFLAGS='$(sdl-config --libs)' ;;
20 +       *)        LIB_SDL_LDFLAGS='$(sdl-config --libs) -lts -lpng -ljpeg -lz' ;;
21  esac
22  case "$OSNAME" in
23         FreeBSD)  LIB_SDL_VERSION='$(sdl11-config --version)' ;;
24 @@ -123,8 +123,8 @@
25                 LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -logg -lm"
26                 ;;
27         *)
28 -               LIB_vorbisfile_CFLAGS=""
29 -               LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis"
30 +               LIB_vorbisfile_CFLAGS="-I$STAGING_INCDIR"
31 +               LIB_vorbisfile_LDFLAGS="-L$STAGING_LIBDIR -lvorbisfile -lvorbis -logg"
32                 ;;
33  esac
34  LIB_vorbisfile_VERSION=""
35 --- build/unix/build.config     2005-01-21 00:26:04.000000000 +1300
36 +++ build/unix/build.config     2005-01-21 23:55:25.658912600 +1300
37 @@ -7,7 +7,7 @@
38  
39  
40  # Some requirements:
41 -have_program gcc || exit 1
42 +#have_program gcc || exit 1
43  COMPILE="$PROG_gcc_FILE"
44  
45  case "$OSNAME" in
46 --- build.vars.in       2005-01-21 21:15:59.058256960 +1300
47 +++ build.vars.in       2005-01-21 21:16:13.493062536 +1300
48 @@ -15,8 +15,8 @@
49  # along with this program; if not, write to the Free Software
50  #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
51  
52 -COMPILE=gcc
53 -MKDEPEND="gcc -MM"
54 +COMPILE=$CC
55 +MKDEPEND="$CC -MM"
56  MAKE="@MAKE@"
57  uqm_CFLAGS="@CFLAGS@"
58  uqm_LDFLAGS="@LDFLAGS@"