diff options
Diffstat (limited to 'lang/squeak/patches')
-rw-r--r-- | lang/squeak/patches/patch-aa | 38 | ||||
-rw-r--r-- | lang/squeak/patches/patch-ac | 18 |
2 files changed, 29 insertions, 27 deletions
diff --git a/lang/squeak/patches/patch-aa b/lang/squeak/patches/patch-aa index 55e6f470887..a36c9512cf5 100644 --- a/lang/squeak/patches/patch-aa +++ b/lang/squeak/patches/patch-aa @@ -1,24 +1,23 @@ -$NetBSD: patch-aa,v 1.1 2000/02/16 22:02:33 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2000/08/14 16:51:36 mjl Exp $ --Get the right flag for exporting symbols from program --Use the CFLAGS set by the package system --Don't override everything on alpha - ---- ./conf/configure.in.orig Mon Oct 18 12:25:06 1999 -+++ ./conf/configure.in Wed Feb 16 11:08:18 2000 -@@ -104,8 +104,8 @@ +--- conf/configure.in.orig Mon Aug 14 18:07:46 2000 ++++ conf/configure.in Mon Aug 14 18:10:40 2000 +@@ -105,10 +105,10 @@ + AC_TRY_RUN([int main(){return !((__GNUC__ >= 2) && (__GNUC_MINOR__ > 90));}], ac_cv_prog_egcs="yes", ac_cv_prog_egcs="no")) - CFLAGS="-g -O2" - WFLAGS="-Wall" -+ #CFLAGS="-g -O2" -+ #WFLAGS="-Wall" ++# CFLAGS="-g -O2" ++# WFLAGS="-Wall" LD="$CC" - LDFLAGS="-rdynamic" + LDFLAGS="-Wl,--export-dynamic" SHCC="$CC" -@@ -120,10 +120,11 @@ + if test "$ac_cv_prog_egcs" = "yes"; then +@@ -121,12 +121,13 @@ + case "$host" in i?86*) CFLAGS="$CFLAGS -fomit-frame-pointer" ;; - alpha*) CC="$srcdir/../util/decgcc" @@ -27,19 +26,22 @@ $NetBSD: patch-aa,v 1.1 2000/02/16 22:02:33 dmcmahill Exp $ - SHCC="../$CC" - SHLD="cc" - SHLDFLAGS="-taso -shared -expect_unresolved \"*\"" ;; -+ alpha*) #CC="$srcdir/../util/decgcc" -+ #LD="cc" -+ #LDFLAGS="-taso -call_shared" -+ #SHCC="../$CC" -+ #SHLD="cc" -+ #SHLDFLAGS="-taso -shared -expect_unresolved \"*\"" ++ alpha*) # CC="$srcdir/../util/decgcc" ++ # LD="cc" ++ # LDFLAGS="-taso -call_shared" ++ # SHCC="../$CC" ++ # SHLD="cc" ++ # SHLDFLAGS="-taso -shared -expect_unresolved \"*\"" + ;; esac -@@ -188,5 +189,5 @@ + AC_PROG_AWK +@@ -198,7 +199,7 @@ + AC_PATH_X test ! -f /usr/include/X11/Intrinsic.h -a "$x_includes" != NONE && \ INCS="-I${x_includes}" - test "$x_libraries" != NONE -a ! -z "$x_libraries" && LIBS="$LIBS -L${x_libraries}" + test "$x_libraries" != NONE -a ! -z "$x_libraries" && LIBS="$LIBS -L${x_libraries} -Wl,-R${x_libraries}" AC_CHECK_LIB(Xext, XShmAttach) if test -z "ac_cv_lib_Xext_XShmAttach"; then + AC_MSG_WARN([XShm not found: DISABLING SHARED MEMORY]) diff --git a/lang/squeak/patches/patch-ac b/lang/squeak/patches/patch-ac index b00aac79bc5..e5cc45cbed4 100644 --- a/lang/squeak/patches/patch-ac +++ b/lang/squeak/patches/patch-ac @@ -1,22 +1,22 @@ -$NetBSD: patch-ac,v 1.1 2000/02/16 22:02:34 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2000/08/14 16:51:36 mjl Exp $ -don't use __alpha__ as an operating system check.... -This may take some more work if there is an issue with unaligned access -on NetBSD, but at least this should compile (the unpatched one won't) - ---- ./src/sqXWindow.c.orig Mon Oct 18 13:32:08 1999 -+++ ./src/sqXWindow.c Wed Feb 16 11:25:57 2000 -@@ -2830,5 +2830,5 @@ +--- src/sqXWindow.c.orig Mon Aug 14 18:14:23 2000 ++++ src/sqXWindow.c Mon Aug 14 18:15:35 2000 +@@ -2960,7 +2960,7 @@ + error("Segmentation fault"); } -#ifdef __alpha__ +#if defined(__alpha__) && !defined(__NetBSD__) /* headers for setsysinfo (see below) */ # include <sys/sysinfo.h> -@@ -2842,5 +2842,5 @@ + # include <sys/proc.h> +@@ -2972,7 +2972,7 @@ + /* initialisation */ -#ifdef __alpha__ +#if defined(__alpha__) && !defined(__NetBSD__) /* disable printing of unaligned access exceptions */ { + int buf[2]= { SSIN_UACPROC, UAC_NOPRINT }; |