p11-kit @0.25.5 does not *test* on PPC Tiger, Mac OS X 10.4.11, because of redefinition of typedef 'CK_ULONG'

[ballapete (Peter "Pete" Dyballa)]

make[3]: `libp11-kit-testable.la' is up to date.
/bin/sh ./libtool  --tag=CC   --mode=compile /opt/local/bin/gcc-apple-4.2 -std=gnu99 -DHAVE_CONFIG_H -I.  -I. -I./common -I. -I./common -DBINDIR=\"/opt/local/bin\" -DBUILDDIR=\"/opt/local/var/macports/build/_opt_local_var_macports_sources_nue.de.rsync.macports.org_macports_release_tarballs_ports_security_p11-kit/p11-kit/work/p11-kit-0.25.5\" -DDATA_DIR=\"/opt/local/share\" -DPRIVATEDIR=\"/opt/local/libexec/p11-kit\" -DSRCDIR=\"/opt/local/var/macports/build/_opt_local_var_macports_sources_nue.de.rsync.macports.org_macports_release_tarballs_ports_security_p11-kit/p11-kit/work/p11-kit-0.25.5\" -DSYSCONFDIR=\"/opt/local/etc\" -DP11_KIT_FUTURE_UNSTABLE_API -isystem/opt/local/include/LegacySupport -I/opt/local/include -DCRYPTOKI_GNU=1 -DP11_KIT_FUTURE_UNSTABLE_API=1 -pipe -Os -arch ppc -g 		-Wall -Wstrict-prototypes -Wmissing-declarations 		-Wmissing-prototypes -Wnested-externs -Wpointer-arith 		-Wdeclaration-after-statement -Wformat=2 -Winit-self 		-Waggregate-return -Wno-missing-format-attribute 		-fno-strict-aliasing -fno-common -Wmissing-include-dirs -Wundef -MT p11-kit/libp11_kit_pkcs11_gnu_la-uri.gnu.lo -MD -MP -MF p11-kit/.deps/libp11_kit_pkcs11_gnu_la-uri.gnu.Tpo -c -o p11-kit/libp11_kit_pkcs11_gnu_la-uri.gnu.lo `test -f 'p11-kit/uri.gnu.c' || echo './'`p11-kit/uri.gnu.c
libtool: compile:  /opt/local/bin/gcc-apple-4.2 -std=gnu99 -DHAVE_CONFIG_H -I. -I. -I./common -I. -I./common -DBINDIR=\"/opt/local/bin\" -DBUILDDIR=\"/opt/local/var/macports/build/_opt_local_var_macports_sources_nue.de.rsync.macports.org_macports_release_tarballs_ports_security_p11-kit/p11-kit/work/p11-kit-0.25.5\" -DDATA_DIR=\"/opt/local/share\" -DPRIVATEDIR=\"/opt/local/libexec/p11-kit\" -DSRCDIR=\"/opt/local/var/macports/build/_opt_local_var_macports_sources_nue.de.rsync.macports.org_macports_release_tarballs_ports_security_p11-kit/p11-kit/work/p11-kit-0.25.5\" -DSYSCONFDIR=\"/opt/local/etc\" -DP11_KIT_FUTURE_UNSTABLE_API -isystem/opt/local/include/LegacySupport -I/opt/local/include -DCRYPTOKI_GNU=1 -DP11_KIT_FUTURE_UNSTABLE_API=1 -pipe -Os -arch ppc -g -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wdeclaration-after-statement -Wformat=2 -Winit-self -Waggregate-return -Wno-missing-format-attribute -fno-strict-aliasing -fno-common -Wmissing-include-dirs -Wundef -MT p11-kit/libp11_kit_pkcs11_gnu_la-uri.gnu.lo -MD -MP -MF p11-kit/.deps/libp11_kit_pkcs11_gnu_la-uri.gnu.Tpo -c p11-kit/uri.gnu.c  -fno-common -DPIC -o p11-kit/.libs/libp11_kit_pkcs11_gnu_la-uri.gnu.o
p11-kit/uri.gnu.c:93: error: redefinition of typedef 'CK_ULONG'
./p11-kit/p11-kit.h:47: error: previous declaration of 'CK_ULONG' was here
make[3]: *** [p11-kit/libp11_kit_pkcs11_gnu_la-uri.gnu.lo] Error 1
make[2]: *** [check-am] Error 2
make[1]: *** [check-recursive] Error 1
make: *** [check] Error 2
Command failed:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_nue.de.rsync.macports.org_macports_release_tarballs_ports_security_p11-kit/p11-kit/work/p11-kit-0.25.5" && /usr/bin/make check 
Exit code: 2

[ballapete (Peter "Pete" Dyballa)]

Main.log from PPC Tiger, Mac OS X 10.4.11

[ballapete (Peter "Pete" Dyballa)]

Simple build or upgrade succeeds.

[ballapete (Peter "Pete" Dyballa)]

I think I have a fix for the failing test target. Two newly added files typedef things again, and one of them #includes another C header file that does the same. Since all redefinitions happen with variables there is no way to use guards, the statements need to be out-commented themselves.

With my patch set, conservatively named for PPC Tiger, where I found the problem, both build and test succeed. I am going to test also on PPC Leopard.

[ballapete (Peter "Pete" Dyballa)]

Patch set to make the targets build and test succeed on PPC Tiger, Mac OS X 10.4.11

[ballapete (Peter "Pete" Dyballa)]

============================================================================
Testsuite summary for p11-kit 0.25.5
============================================================================
# TOTAL: 1188
# PASS:  1070
# SKIP:  1
# XFAIL: 0
# FAIL:  6
# XPASS: 0
# ERROR: 111
============================================================================
See ./test-suite.log
Please report to https://github.com/p11-glue/p11-kit/issues
============================================================================

[ballapete (Peter "Pete" Dyballa)]

The same set of patches works on PPC Leopard, Mac OS X 10.5.8. The test summary there is:

# TOTAL: 1185
# PASS:  1066
# SKIP:  0
# XFAIL: 0
# FAIL:  6
# XPASS: 0
# ERROR: 113