summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf>2000-09-24 19:29:55 +0000
committerhubertf <hubertf>2000-09-24 19:29:55 +0000
commit9524f59e4e69e4a402274130e0ba4e9337dd2038 (patch)
tree6e2ae1e258fdb5e1fe71692fa2b045df4392aa3d
parenta7f6dcd8a561921fc58b3922ceae98dd85126ebb (diff)
downloadpkgsrc-9524f59e4e69e4a402274130e0ba4e9337dd2038.tar.gz
ELF shlib fix
-rw-r--r--emulators/pcemu/files/patch-sum4
-rw-r--r--emulators/pcemu/patches/patch-aa16
2 files changed, 14 insertions, 6 deletions
diff --git a/emulators/pcemu/files/patch-sum b/emulators/pcemu/files/patch-sum
index b5be8ba7330..f4cb226f7f1 100644
--- a/emulators/pcemu/files/patch-sum
+++ b/emulators/pcemu/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:47 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/24 19:29:55 hubertf Exp $
-MD5 (patch-aa) = 2debc5a11dce4284c395fed26f36acde
+MD5 (patch-aa) = 6ba33c55337694bd63aa268f49a652eb
MD5 (patch-ab) = 9fceadb94b097327cd5e869380c4c0ba
MD5 (patch-ac) = fd8a57dff9c6565e386cebeaf9f47606
MD5 (patch-ad) = e59d6bbe35c98afc9d677ebaeef63671
diff --git a/emulators/pcemu/patches/patch-aa b/emulators/pcemu/patches/patch-aa
index 18b34c87e1c..8a8af3f22ff 100644
--- a/emulators/pcemu/patches/patch-aa
+++ b/emulators/pcemu/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.2 1999/12/29 01:45:39 wiz Exp $
---- Makefile.orig Wed Jun 22 07:29:06 1994
-+++ Makefile Tue Mar 30 20:01:40 1999
-@@ -49,10 +49,15 @@
+$NetBSD: patch-aa,v 1.3 2000/09/24 19:29:56 hubertf Exp $
+
+--- Makefile.orig Wed Jun 22 10:29:06 1994
++++ Makefile
+@@ -49,16 +49,21 @@
# been known to crash the emulator when running on certain machines (80x86
# based PCs under Linux, and HPs running HPUX).
@@ -20,6 +21,13 @@ $NetBSD: patch-aa,v 1.2 1999/12/29 01:45:39 wiz Exp $
# You may need to add -N to the LFLAGS if you get sporadic segmentation
# faults. So far I have only needed to do this when compiling under Linux
+ # as Xlib seems to be mysteriously writing to its text segment
+
+-LFLAGS = -L$(XROOT)/lib
++LFLAGS = -Wl,-R${XROOT}/lib -L$(XROOT)/lib
+ LIBRARIES = -lXext -lX11
+ OFILES = main.o cpu.o bios.o vga.o vgahard.o debugger.o xstuff.o \
+ hardware.o mfs.o
@@ -86,3 +91,28 @@
clean: