gpm: marked to build on stage 1 when cross compiling, and fixed to build without stdopts.h

3 files changed, 30 insertions, 4 deletions

diff --git a/base/gpm/gpm.conf b/base/gpm/gpm.conf
index f980125..942e9c3 100644
--- a/base/gpm/gpm.conf
+++ b/base/gpm/gpm.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gpm/gpm.conf
-# Copyright (C) 2006 - 2008 The OpenSDE Project
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -14,8 +14,6 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-prefix=$root/$prefix
-set_confopt
 nocvsinsrcdir=0
 
 gpm_pm() {
@@ -31,4 +29,5 @@ EOT
 hook_add postmake 3 "gpm_pm"
 
 # disable curses support (Gpm_Wgetch) to be able to use it from ncurses
+# http://invisible-island.net/ncurses/ncurses.faq.html#using_gpm_lib
 var_append confopt ' ' '--without-curses'
diff --git a/base/gpm/gpm.desc b/base/gpm/gpm.desc
index f0dcfda..8f638f8 100644
--- a/base/gpm/gpm.desc
+++ b/base/gpm/gpm.desc
@@ -37,6 +37,6 @@
 [L] GPL
 [S] Stable
 [V] 1.20.6
-[P] X -----5---9 127.300
+[P] X -?---5---9 127.300
 
 [D] 651259576 gpm-1.20.6.tar.bz2 http://www.ar.linux.it/pub/gpm/
diff --git a/base/gpm/stropts_h.patch b/base/gpm/stropts_h.patch
new file mode 100644
index 0000000..ea03fa1
--- a/dev/null
+++ b/base/gpm/stropts_h.patch
@@ -0,0 +1,27 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../gpm/stropts_h.patch
+# Copyright (C) 2010 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- ./src/daemon/open_console.c.orig	2010-02-03 13:51:26.000000000 -0500
++++ ./src/daemon/open_console.c	2010-02-03 13:52:00.000000000 -0500
+@@ -21,7 +21,7 @@
+ 
+ #include <fcntl.h>                  /* open and co.      */
+ #include <sys/stat.h>               /* stat()            */
+-#include <stropts.h>                /* ioctl             */
++#include <sys/ioctl.h>              /* ioctl             */
+ 
+ /* Linux specific (to be outsourced in gpm2 */
+ #include <linux/serial.h>           /* for serial console check */