diff options
author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/uqm/files | |
parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/uqm/files')
-rw-r--r-- | packages/uqm/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/uqm/files/build-oe.patch | 58 | ||||
-rw-r--r-- | packages/uqm/files/build-opts.sh | 15 |
3 files changed, 73 insertions, 0 deletions
diff --git a/packages/uqm/files/.mtn2git_empty b/packages/uqm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uqm/files/.mtn2git_empty diff --git a/packages/uqm/files/build-oe.patch b/packages/uqm/files/build-oe.patch index e69de29bb2..765100bcce 100644 --- a/packages/uqm/files/build-oe.patch +++ b/packages/uqm/files/build-oe.patch @@ -0,0 +1,58 @@ +--- build/unix/config_proginfo 2005-01-21 23:55:20.600681568 +1300 ++++ build/unix/config_proginfo 2005-01-21 23:55:28.136535944 +1300 +@@ -19,9 +19,9 @@ + + # Describe the programs (possibly) used: + PROG_gcc_NAME="GNU C compiler" +-PROG_gcc_FILE="gcc" ++PROG_gcc_FILE="$CC" + PROG_gcc_ACTION="" +-PROG_gcc_VERSION='$(gcc --version)' ++PROG_gcc_VERSION='$($CC --version)' + + PROG_sed_NAME="Sed stream editor" + PROG_sed_FILE="sed" +@@ -60,7 +60,7 @@ + esac + case "$OSNAME" in + FreeBSD) LIB_SDL_LDFLAGS='$(sdl11-config --libs)' ;; +- *) LIB_SDL_LDFLAGS='$(sdl-config --libs)' ;; ++ *) LIB_SDL_LDFLAGS='$(sdl-config --libs) -lts -lpng -ljpeg -lz' ;; + esac + case "$OSNAME" in + FreeBSD) LIB_SDL_VERSION='$(sdl11-config --version)' ;; +@@ -123,8 +123,8 @@ + LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -logg -lm" + ;; + *) +- LIB_vorbisfile_CFLAGS="" +- LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis" ++ LIB_vorbisfile_CFLAGS="-I$STAGING_INCDIR" ++ LIB_vorbisfile_LDFLAGS="-L$STAGING_LIBDIR -lvorbisfile -lvorbis -logg" + ;; + esac + LIB_vorbisfile_VERSION="" +--- build/unix/build.config 2005-01-21 00:26:04.000000000 +1300 ++++ build/unix/build.config 2005-01-21 23:55:25.658912600 +1300 +@@ -7,7 +7,7 @@ + + + # Some requirements: +-have_program gcc || exit 1 ++#have_program gcc || exit 1 + COMPILE="$PROG_gcc_FILE" + + case "$OSNAME" in +--- build.vars.in 2005-01-21 21:15:59.058256960 +1300 ++++ build.vars.in 2005-01-21 21:16:13.493062536 +1300 +@@ -15,8 +15,8 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +-COMPILE=gcc +-MKDEPEND="gcc -MM" ++COMPILE=$CC ++MKDEPEND="$CC -MM" + MAKE="@MAKE@" + uqm_CFLAGS="@CFLAGS@" + uqm_LDFLAGS="@LDFLAGS@" diff --git a/packages/uqm/files/build-opts.sh b/packages/uqm/files/build-opts.sh index e69de29bb2..56484856ed 100644 --- a/packages/uqm/files/build-opts.sh +++ b/packages/uqm/files/build-opts.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# Shamelessly stolen from gentoo ebuild +cat <<-EOF > config.state +CHOICE_debug_VALUE='nodebug' +CHOICE_graphics_VALUE='pure' +CHOICE_sound_VALUE='mixsdl' +INPUT_install_prefix_VALUE='$1' +INPUT_install_bindir_VALUE='$2' +INPUT_install_libdir_VALUE='$3' +EOF + +# Take out the read so we can be non-interactive. +sed -i \ + -e '/read CHOICE/d' build/unix/menu_functions || \ + echo "sed menu_functions failed" |