diff options
Diffstat (limited to 'editors/abiword/patches/patch-ad')
| -rw-r--r-- | editors/abiword/patches/patch-ad | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad index abe5558a4bb..570ce4525c6 100644 --- a/editors/abiword/patches/patch-ad +++ b/editors/abiword/patches/patch-ad @@ -1,47 +1,23 @@ -$NetBSD: patch-ad,v 1.3 1999/09/17 00:06:21 jlam Exp $ +$NetBSD: patch-ad,v 1.4 2000/02/29 18:31:30 jlam Exp $ ---- src/config/platforms/netbsd.mk.orig Fri Jul 9 15:13:57 1999 -+++ src/config/platforms/netbsd.mk Thu Sep 16 11:50:53 1999 -@@ -30,8 +30,37 @@ +--- src/config/platforms/netbsd.mk.orig Sun Dec 12 10:07:09 1999 ++++ src/config/platforms/netbsd.mk Tue Feb 29 12:05:03 2000 +@@ -30,8 +30,13 @@ ## compiler/loader options are used. It will probably also be used ## in constructing the name object file destination directory. -OS_ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ | sed "s/\//-/") -+# Get value of OS_ARCH from environment variable MACHINE. -+# -+OS_ARCH = ${MACHINE} ++OS_ARCH := $(shell uname -m) + -+# Set OS_ENDIAN to appropriate value. For NetBSD, most architectures are -+# big-endian, so test for the architectures which are little-endian and -+# reset OS_ENDIAN. Why doesn't GNU make have an OR statement!? -+# -+OS_ENDIAN = BigEndian32 -+ -+ifeq ($(OS_ARCH),alpha) -+OS_ENDIAN = LittleEndian32 -+endif -+ifeq ($(OS_ARCH),arm32) -+OS_ENDIAN = LittleEndian32 -+endif -+ifeq ($(OS_ARCH),i386) -+OS_ENDIAN = LittleEndian32 -+endif -+ifeq ($(OS_ARCH),pc532) -+OS_ENDIAN = LittleEndian32 -+endif -+ifeq ($(OS_ARCH),pica) ++ifneq (,$(shell $(CC) -E - -dM </usr/include/machine/endian.h | grep BYTE_ORDER.*LITTLE_ENDIAN)) OS_ENDIAN = LittleEndian32 -+endif -+ifeq ($(OS_ARCH),pmax) -+OS_ENDIAN = LittleEndian32 -+endif -+ifeq ($(OS_ARCH),vax) -+OS_ENDIAN = LittleEndian32 ++else ++OS_ENDIAN = BigEndian32 +endif # Define tools CC = gcc -@@ -65,24 +94,27 @@ +@@ -65,17 +70,20 @@ endif # Includes @@ -61,18 +37,19 @@ $NetBSD: patch-ad,v 1.3 1999/09/17 00:06:21 jlam Exp $ +# Linker flags +OS_DLLFLAGS += + - # Shared library flags - MKSHLIB = $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so) - + GLIB_CONFIG = glib-config + GTK_CONFIG = gtk-config + GNOME_CONFIG = gnome-config +@@ -86,7 +94,7 @@ # Which links can this platform create. Define one or # both of these options. UNIX_CAN_BUILD_DYNAMIC=1 -UNIX_CAN_BUILD_STATIC=1 -+UNIX_CAN_BUILD_STATIC=0 # 1.4.x can't seem to build statically ++UNIX_CAN_BUILD_STATIC=0 - # Compiler options for static and dynamic linkage - DL_LIBS = -@@ -90,5 +122,12 @@ + ################################################################## + ## Here you can choice if you want to use the gnome stuff. +@@ -101,5 +109,12 @@ ABI_NATIVE = unix ABI_FE = Unix |