summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-01 15:32:45 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-01 15:32:45 +0100
commit2803ef3968040837af6196081e923d244b87f7c8 (patch)
tree0d751628911619d10938d4e880d52d2c9ef538ed
parent3fb48a22aefde16bea62f7b8b5da3be1078a15c8 (diff)
parent406ccf8df407e0292ee85d259a363c63e2be40a7 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/gpm/Makefile4
-rw-r--r--target/config/Config.in3
2 files changed, 2 insertions, 5 deletions
diff --git a/package/gpm/Makefile b/package/gpm/Makefile
index 8ea741164..7f9e1852d 100644
--- a/package/gpm/Makefile
+++ b/package/gpm/Makefile
@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gpm
PKG_VERSION:= 1.20.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= e9a4ba2711753c89b37950aada7aed4a
PKG_DESCR:= console mouse support
PKG_SECTION:= misc
-PKG_BUILDDEP:= autotool
+PKG_BUILDDEP:= autotool bison-host
PKG_URL:= http://launchpad.net/gpm
PKG_SITES:= http://www.nico.schottelius.org/software/gpm/archives/
PKG_NOPARALLEL:= 1
diff --git a/target/config/Config.in b/target/config/Config.in
index a3f0edf54..5868a4363 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -119,12 +119,10 @@ config ADK_n64
config ADK_TARGET_ABI
string
- default "o32" if ADK_o32
default "n32" if ADK_n32
default "n64" if ADK_n64
default "32" if ADK_32
default "x32" if ADK_x32
- default "64" if ADK_64
default "eabi" if ADK_EABI
default "eabihf" if ADK_EABIHF
@@ -737,7 +735,6 @@ config ADK_TARGET_SUFFIX
default "musl" if ADK_TARGET_LIB_MUSL && !ADK_EABI
default "n64" if ADK_n64
default "n32" if ADK_n32
- default "o32" if ADK_o32
default "32" if ADK_32
default "x32" if ADK_x32
default "gnu"