Merge branch 'master' of git+ssh://openadk.org/git/openadk

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

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"