Browse Source

updated dosemu (1.1.99.1) and fixed it (incl. ugly GCC_WRAPPER_* mangling)

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2165 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
commit
8f0c5cefff
4 changed files with 8 additions and 95 deletions
  1. +5
    -16
      package/rene/dosemu/dosemu.conf
  2. +3
    -3
      package/rene/dosemu/dosemu.desc
  3. +0
    -41
      package/rene/dosemu/errno.patch
  4. +0
    -35
      package/rene/dosemu/slang.patch

+ 5
- 16
package/rene/dosemu/dosemu.conf

@ -20,20 +20,9 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
dosemu_main ()
{
eval WAIT=no $MAKE $makeopt
eval WAIT=no $MAKE $makeopt dosbin
# the installation process ...
cp -vf bin/{dos,dosdebug,xdos} $root/$prefix/bin
mkdir -p $root/etc/dosemu
cp -vf etc/dosemu.{conf,users.*} $root/etc/dosemu
mkdir -p $root/var/lib/dosemu
cp -vf etc/global.conf $root/var/lib/dosemu
}
custmain="dosemu_main"
# dosemu does not like to much messing with gcc options - quick work around
# for now ...
GCC_WRAPPER_INSERT=""
GCC_WRAPPER_APPEND=""
GCC_WRAPPER_REMOVE="-m*"

+ 3
- 3
package/rene/dosemu/dosemu.desc

@ -21,7 +21,7 @@
[COPY]
[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
[I] A dos emulator
[I] A DOS emulator
[T] DOSEMU stands for DOS Emulation, and is a linux application that
[T] enables the Linux OS to run many DOS programs - including some DPMI
@ -37,8 +37,8 @@
[L] LGPL
[S] Stable
[V] 1.0.2
[V] 1.1.99.1
[P] X -----5---9 695.000
[D] 1894365136 dosemu-1.0.2.tgz http://dl.sourceforge.net/sourceforge/dosemu/
[D] 0 dosemu-1.1.99.1.tgz http://dl.sourceforge.net/sourceforge/dosemu/

+ 0
- 41
package/rene/dosemu/errno.patch

@ -1,41 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/dosemu/errno.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it 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. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -u misc.org/lpt.c misc/lpt.c
--- ./src/base/dev/misc.org/lpt.c Sun Mar 11 14:27:24 2001
+++ ./src/base/dev/misc/lpt.c Wed Mar 19 16:28:43 2003
@@ -17,6 +17,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <sys/wait.h>
+#include <errno.h>
#include "emu.h"
#include "dosio.h"
@@ -137,7 +138,6 @@
printer_flush(int prnum)
{
int returnstat;
- extern int errno;
p_printf("LPT: flushing printer %d, %s\n", prnum, lpt[prnum].dev);

+ 0
- 35
package/rene/dosemu/slang.patch

@ -1,35 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/dosemu/slang.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it 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. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
needed for the errno problem in supplied slang lib
--- ./compiletime-settings.org Sat May 5 13:43:06 2001
+++ ./compiletime-settings Wed Mar 19 16:43:30 2003
@@ -5,7 +5,7 @@
x on
net on
dodebug off
- slangforce on
+ slangforce off
oldslang off
runasroot off
linkstatic off

Loading…
Cancel
Save