diff options
Diffstat (limited to 'lang/clisp/patches/patch-ai')
| -rw-r--r-- | lang/clisp/patches/patch-ai | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lang/clisp/patches/patch-ai b/lang/clisp/patches/patch-ai index ea26eb0fb6e..b8bb636284c 100644 --- a/lang/clisp/patches/patch-ai +++ b/lang/clisp/patches/patch-ai @@ -1,34 +1,31 @@ -$NetBSD: patch-ai,v 1.1 2003/07/13 14:35:33 dillo Exp $ +$NetBSD: patch-ai,v 1.2 2004/03/29 02:46:18 perry Exp $ ---- makemake.in.orig Sun Sep 8 02:34:17 2002 -+++ makemake.in -@@ -337,6 +337,7 @@ case $# in +--- makemake.in.orig 2004-03-16 17:04:05.000000000 -0500 ++++ makemake.in 2004-03-28 21:14:18.000000000 -0500 +@@ -348,6 +348,7 @@ GROFF='@GROFF@' # either 'groff' or '' GMALLOC='@GMALLOC@' # either 'gmalloc' or '' LIBS='@LIBS@' # list of system libraries + LDFLAGS='@LDFLAGS@' # additional options for linking LIBTERMCAP='@LIBTERMCAP@' # either '-ltermcap' or '-lncurses' - LIBDL='@LIBDL@' # either '-ldl' or '' LIBICONV='@LIBICONV@' # either '-liconv' or '' -@@ -1654,9 +1655,9 @@ echol "prefix = ${PREFIX}" + LIBSIGSEGV='@LTLIBSIGSEGV@' # '-lsigsegv -L/usr/local/lib' or '' +@@ -1534,7 +1535,7 @@ echol "exec_prefix = ${EXEC_PREFIX}" echol "bindir = \$(exec_prefix)${NEXT_}bin" echol "shared = \$(prefix)${NEXT_}share" --echol "mandir = \$(prefix)${NEXT_}share${NEXT_}man" --echol "htmldir = \$(prefix)${NEXT_}share${NEXT_}html" --echol "dvidir = \$(prefix)${NEXT_}share${NEXT_}dvi" +-echol "mandir = \$(shared)${NEXT_}man" +echol "mandir = \$(prefix)${NEXT_}man" -+echol "htmldir = \$(prefix)${NEXT_}share${NEXT_}doc${NEXT_}html" -+echol "dvidir = \$(prefix)${NEXT_}share${NEXT_}doc" - echol "docdir = \$(prefix)${NEXT_}share${NEXT_}doc" + echol "docdir = \$(shared)${NEXT_}doc" case "$fsstnd" in suse) -@@ -1721,11 +1722,13 @@ else +@@ -1611,12 +1612,14 @@ echol "CPP = ${XCPP}" echol "CLFLAGS = ${XCLFLAGS}" echol "LIBS = ${LIBS}" + echol "LDFLAGS = ${LDFLAGS}" XCC="\$(CC)" + XCPPFLAGS="\$(CPPFLAGS)" XCFLAGS="\$(CFLAGS)" XCPP="\$(CPP)" XCLFLAGS="\$(CLFLAGS)" @@ -37,9 +34,12 @@ $NetBSD: patch-ai,v 1.1 2003/07/13 14:35:33 dillo Exp $ fi echol "X_LIBS = ${X_LIBS}" X_LIBS="\$(X_LIBS)" -@@ -2620,7 +2623,7 @@ if [ $HOS != os2 -a $HOS != win32 ] ; th +@@ -2479,9 +2482,9 @@ + if [ $XCC_GCC = true -a -n "$SOLARIS_LINKING" ] ; then + # Dynamically linking on Solaris 2.[23] is a pain. LIBGCC_DIR='`'"${XCC} -print-libgcc-file-name"' | sed -e '"'"'s,[^/]*$$,,'"'"'`' - echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE} || /usr/ccs/bin/ld -V -dy -Bdynamic -Y P,/usr/ccs/lib:/usr/lib -Qy -o lisp${LEXE} ${LIBGCC_DIR}crt1.o ${LIBGCC_DIR}crti.o /usr/ccs/lib/values-Xa.o ${LIBGCC_DIR}crtbegin.o \$(OBJECTS) modules${TOBJ} -L${LIBGCC_DIR} -L/usr/ccs/bin ${LIBS} -lgcc -lc ${LIBGCC_DIR}crtend.o ${LIBGCC_DIR}crtn.o -lgcc" +- echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE} || /usr/ccs/bin/ld -V -dy -Bdynamic -Y P,/usr/ccs/lib:/usr/lib -Qy -o lisp${LEXE} ${LIBGCC_DIR}crt1.o ${LIBGCC_DIR}crti.o /usr/ccs/lib/values-Xa.o ${LIBGCC_DIR}crtbegin.o \$(OBJECTS) modules${TOBJ} -L${LIBGCC_DIR} -L/usr/ccs/bin ${LIBS} -lgcc -lc ${LIBGCC_DIR}crtend.o ${LIBGCC_DIR}crtn.o -lgcc" ++ echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} ${LDFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE} || /usr/ccs/bin/ld -V -dy -Bdynamic -Y P,/usr/ccs/lib:/usr/lib -Qy -o lisp${LEXE} ${LIBGCC_DIR}crt1.o ${LIBGCC_DIR}crti.o /usr/ccs/lib/values-Xa.o ${LIBGCC_DIR}crtbegin.o \$(OBJECTS) modules${TOBJ} -L${LIBGCC_DIR} -L/usr/ccs/bin ${LIBS} -lgcc -lc ${LIBGCC_DIR}crtend.o ${LIBGCC_DIR}crtn.o -lgcc" else - echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE}" + echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} ${LDFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE}" |