pkg/38224: textproc/libxslt-1.1.22 IRIX fix breaks on IRIX!

[srcshelton%gmail.com@localhost]

>Number:         38224
>Category:       pkg
>Synopsis:       textproc/libxslt-1.1.22 IRIX fix breaks on IRIX!
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Mar 11 17:35:00 +0000 2008
>Originator:     Stuart Shelton
>Release:        pkgsrc latest from CVS
>Organization:
>Environment:
IRIX64 octane 6.5 07202013 IP30; IRIX 6.5.30; MIPSpro Compilers: Version 7.4.4m
>Description:

The Makefile for textproc/libxslt contains:

.if ${OPSYS} == "IRIX"
CPPFLAGS+=     -Dsocklen_t=int
.endif

... however, this clashes with <sys/socket.h>, resulting in:

source='crypto.c' object='crypto.lo' libtool=yes \
        DEPDIR=.deps depmode=sgi /usr/bsd/bin/bash ../depcomp \
        /usr/bsd/bin/bash ../libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H 
-I. -I. -I.. -I.. -I../libxslt -I../libexslt -I.. -I../libxslt -I../libexslt 
-I/usr/bsd/include/libxml2 -I/usr/bsd/include -c99 -O2 -n32 -mips4 -r14000 -apo 
-float_const -use_readonly_const -TARG:isa=mips4:platform=ip30:processor=r14000 
-TENV:zeroinit_in_bss=ON -OPT:fast_io=ON:Olimit=8192:reorg_common=ON:swp=ON 
-LNO:auto_dist=ON:fusion_peeling_limit=8:gather_scatter=2 -woff 
1174,1183,1185,1552,3970,3968 -n32 -I/usr/bsd/include -I/usr/include  
-I/usr/bsd/include -D__inline__=inline -Dsocklen_t=int -I/usr/include 
-I/usr/bsd/include -c99 -O2 -n32 -mips4 -r14000 -apo -float_const 
-use_readonly_const -TARG:isa=mips4:platform=ip30:processor=r14000 
-TENV:zeroinit_in_bss=ON -OPT:fast_io=ON:Olimit=8192:reorg_common=ON:swp=ON 
-LNO:auto_dist=ON:fusion_peeling_limit=8:gather_scatter=2 -woff 
1174,1183,1185,1552,3970,3968 -n32 -I/usr/bsd/include -I/usr/include -c -o 
crypto.lo crypto.c
 cc -DHAVE_CONFIG_H -I. -I.. -I../libxslt -I../libexslt 
-I/usr/bsd/var/tmp/textproc/libxslt/work/.buildlink/include/libxml2 
-I/usr/bsd/var/tmp/textproc/libxslt/work/.buildlink/include -c99 -O2 -n32 
-mips4 -r14000 -apo -float_const -use_readonly_const 
-TARG:isa=mips4:platform=ip30:processor=r14000 -TENV:zeroinit_in_bss=ON 
-OPT:fast_io=ON:Olimit=8192:reorg_common=ON:swp=ON -woff 
1174,1183,1185,1552,3970,3968 -n32 -D__inline__=inline -Dsocklen_t=int -c99 -O2 
-n32 -mips4 -r14000 -apo -float_const -use_readonly_const 
-TARG:isa=mips4:platform=ip30:processor=r14000 -TENV:zeroinit_in_bss=ON 
-OPT:fast_io=ON:Olimit=8192:reorg_common=ON:swp=ON -woff 
1174,1183,1185,1552,3970,3968 -n32 -c crypto.c -Wp,-MDupdate,.deps/crypto.TPlo  
-DPIC -o .libs/crypto.o
cc-1084 cc: ERROR File = /usr/include/sys/socket.h, Line = 66
  The indicated declaration has an invalid combination of type specifiers.

  typedef int socklen_t;
              ^

1 error detected in the compilation of "crypto.c".
gmake[2]: *** [crypto.lo] Error 1
gmake[2]: Leaving directory 
`/usr/bsd/var/tmp/textproc/libxslt/work/libxslt-1.1.22/libexslt'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory 
`/usr/bsd/var/tmp/textproc/libxslt/work/libxslt-1.1.22'
gmake: *** [all] Error 2
*** Error code 2

Stop.
bmake: stopped in /usr/bsd/src/textproc/libxslt
*** Error code 1

Stop.
bmake: stopped in /usr/bsd/src/textproc/libxslt

>How-To-Repeat:

>Fix:

With those lines in the Makefile commented-out, libxslt builds successfully.

Perhaps this fix was only needed on earlier (5.x?) IRIX releases, which may 
have lacked socket headers?