diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-08-08 13:17:09 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-08-08 13:17:09 +0000 |
| commit | 4a95b1479e1c44da2a37d0207724842e30564a05 (patch) | |
| tree | cfbf2c5f1a17227fd67d214fda05ab67fc5aa744 | |
| parent | 69990468b9e9828532b42e15896c671d246fe764 (diff) | |
| parent | 384ef9c190f39f7332faa74849c45315fe922a04 (diff) | |
merge of '453683170be608ea537c8e9133e9808544d8ac3c'
and 'dd27045343c0a4288e8141f6cd9ce76afdd583b2'
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | packages/numptyphysics/numptyphysics_svn.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d8c3686b64..1c5e1c2d39 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -71,7 +71,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1066" -SRCREV_pn-linux-openmoko ?= "d4b28ec4e2818207cc0e48b90dbce581e0b779e7" +SRCREV_pn-linux-openmoko ?= "855f715f8568a50391d1526ab2954925c08dab79" SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" diff --git a/packages/numptyphysics/numptyphysics_svn.bb b/packages/numptyphysics/numptyphysics_svn.bb index 976028befe..d6b0e0f47b 100644 --- a/packages/numptyphysics/numptyphysics_svn.bb +++ b/packages/numptyphysics/numptyphysics_svn.bb @@ -16,7 +16,7 @@ EXTRA_S = "${WORKDIR}/local/packages/numptyphysics" # what an ugly buildsystem... handcrafted Makefiles... back to the stoneage export CCOPTS = "${CFLAGS} -I Box2D/Include" -export LDOPTS = "${LDFLAGS} -lSDL -lSDL_image" +export LDOPTS = "${LDFLAGS} -lSDL -lSDL_image -lX11" do_configure() { for i in Config.h Makefile Game.cpp; do |