diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-02-28 11:58:30 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-02-28 11:58:30 +0000 |
| commit | a3eb6f1a3c72e6d6c5fe8d92f6f99787e8c17217 (patch) | |
| tree | 4d16bef6656aed263e5edf015529792360a13187 /packages/uqm | |
| parent | 5243c2f3c13973340c4175f22697f0a90f42b33c (diff) | |
uqm: Fix 0.5.0 build assumptions with a patch, fix staging references
Diffstat (limited to 'packages/uqm')
| -rw-r--r-- | packages/uqm/uqm-0.5.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/uqm/uqm-0.5.0/build-oe.patch | 40 | ||||
| -rw-r--r-- | packages/uqm/uqm_0.3.bb | 2 | ||||
| -rw-r--r-- | packages/uqm/uqm_0.5.0.bb | 5 |
4 files changed, 44 insertions, 3 deletions
diff --git a/packages/uqm/uqm-0.5.0/.mtn2git_empty b/packages/uqm/uqm-0.5.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uqm/uqm-0.5.0/.mtn2git_empty diff --git a/packages/uqm/uqm-0.5.0/build-oe.patch b/packages/uqm/uqm-0.5.0/build-oe.patch new file mode 100644 index 0000000000..045082a920 --- /dev/null +++ b/packages/uqm/uqm-0.5.0/build-oe.patch @@ -0,0 +1,40 @@ +Index: build/unix/config_proginfo_build +=================================================================== +--- build/unix/config_proginfo_build.orig 2008-02-28 10:00:47.000000000 +0000 ++++ build/unix/config_proginfo_build 2008-02-28 10:01:38.000000000 +0000 +@@ -37,9 +37,9 @@ + + ### gcc ### + 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)' + + + ### sed ### +Index: build/unix/config_proginfo_host +=================================================================== +--- build/unix/config_proginfo_host.orig 2008-02-28 10:00:47.000000000 +0000 ++++ build/unix/config_proginfo_host 2008-02-28 10:03:09.000000000 +0000 +@@ -69,7 +69,7 @@ + ;; + *) + LIB_SDL_CFLAGS='$(sdl-config --cflags)' +- LIB_SDL_LDFLAGS='$(sdl-config --libs)' ++ LIB_SDL_LDFLAGS='$(sdl-config --libs) -lts -lpng -ljpeg -lz' + LIB_SDL_VERSION='$(sdl-config --version)' + ;; + esac +@@ -170,8 +170,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="" diff --git a/packages/uqm/uqm_0.3.bb b/packages/uqm/uqm_0.3.bb index 036e1a9bc1..b5b80ddc58 100644 --- a/packages/uqm/uqm_0.3.bb +++ b/packages/uqm/uqm_0.3.bb @@ -16,7 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tgz \ do_configure() { install ${WORKDIR}/build-opts.sh ${S}/ - ./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR} + ./build-opts.sh ${STAGING_DIR_HOST}${layout_prefix} ${STAGING_BINDIR} ${STAGING_LIBDIR} } do_compile() { diff --git a/packages/uqm/uqm_0.5.0.bb b/packages/uqm/uqm_0.5.0.bb index 0367137e03..089922a472 100644 --- a/packages/uqm/uqm_0.5.0.bb +++ b/packages/uqm/uqm_0.5.0.bb @@ -6,17 +6,18 @@ SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -PR = "r0" +PR = "r2" S = "${WORKDIR}/uqm-${PV}" SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tar.gz \ file://build-opts.sh \ + file://build-oe.patch;patch=1;pnum=0 \ " do_configure() { install ${WORKDIR}/build-opts.sh ${S}/ - ./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR} + ./build-opts.sh ${STAGING_DIR_HOST}${layout_prefix} ${STAGING_BINDIR} ${STAGING_LIBDIR} } do_compile() { |