jim 97/07/21 05:27:19
Modified: src CHANGES Configure util_snprintf.c
src/helpers GuessOS
Log:
Closeout PR#721: Allow for automatic use of n32 bit libraries under
IRIX 6
Revision Changes Path
1.358 +3 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.357
retrieving revision 1.358
diff -C3 -r1.357 -r1.358
*** CHANGES 1997/07/21 03:37:47 1.357
--- CHANGES 1997/07/21 12:27:15 1.358
***************
*** 1,5 ****
--- 1,8 ----
Changes with Apache 1.3
+ *) PORT: Allow for use of n32bit libraries under IRIX 6.x
+ [derived from patch from Jeff Hayes <[EMAIL PROTECTED]>]
+
*) PORT: Some architectures use size_t for various lengths in network
functions such as accept(), and getsockname(). The definition
NET_SIZE_T is used to control this. [Dean Gaudet]
1.116 +12 -0 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.115
retrieving revision 1.116
diff -C3 -r1.115 -r1.116
*** Configure 1997/07/21 03:42:11 1.115
--- Configure 1997/07/21 12:27:16 1.116
***************
*** 267,272 ****
--- 267,284 ----
CFLAGS="$CFLAGS -DIRIX"
fi
;;
+ *-sgi-irix32)
+ CFLAGS="$CFLAGS -n32"
+ LDFLAGS="$LDFLAGS -n32"
+ DEF_WANTHSREGEX=yes
+ DBM_LIB=""
+ CFLAGS="$CFLAGS -DIRIX"
+ if [ "$RULE_IRIXNIS" = "yes" ]; then
+ OS='SGI IRIX-32 w/NIS'
+ else
+ OS='SGI IRIX-32'
+ fi
+ ;;
*-sgi-irix)
DEF_WANTHSREGEX=yes
DBM_LIB=""
1.8 +1 -1 apache/src/util_snprintf.c
Index: util_snprintf.c
===================================================================
RCS file: /export/home/cvs/apache/src/util_snprintf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** util_snprintf.c 1997/07/16 00:41:22 1.7
--- util_snprintf.c 1997/07/21 12:27:16 1.8
***************
*** 184,190 ****
{
int sign, decpt;
register char *p1, *p2;
! register i;
p1 = ap_ecvt(number, ndigit, &decpt, &sign);
p2 = buf;
--- 184,190 ----
{
int sign, decpt;
register char *p1, *p2;
! register int i;
p1 = ap_ecvt(number, ndigit, &decpt, &sign);
p2 = buf;
1.25 +5 -1 apache/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.24
retrieving revision 1.25
diff -C3 -r1.24 -r1.25
*** GuessOS 1997/07/01 01:15:30 1.24
--- GuessOS 1997/07/21 12:27:19 1.25
***************
*** 85,91 ****
;;
IRIX:*)
! echo "${MACHINE}-sgi-irix"; exit 0
;;
IRIX64:*)
--- 85,95 ----
;;
IRIX:*)
! if [ -f /usr/lib32/mips4/libm.so ]; then
! echo "${MACHINE}-sgi-irix32"; exit 0
! else
! echo "${MACHINE}-sgi-irix"; exit 0
! fi
;;
IRIX64:*)
