16880260 Enable autogen autoopts self-tests

Rich Burridge

2013-05-31 97df8161425e1542dc5c69a25124d4fc5a11bd3e

16880260 Enable autogen autoopts self-tests

 components/autogen/Makefile

@@ -46,6 +46,19 @@
# strip the environment or install target fails
ENV +=    -i

# Replace all occurrences of "echo" with "/usr/gnu/bin/echo" in the two
# scripts used by autogen that munge the man and mdoc output. This prevents
# bogus conversions (like "\f" -> Control-L) happening.
# Adjust "tr" to "/usr/gnu/bin/tr" in the autoopts vendor.test.
# These changes now allow the autoopts tests to successfully complete.
COMPONENT_POST_UNPACK_ACTION = \
    $(GSED) -i -e 's|echo|/usr/gnu/bin/echo|' \
        $(SOURCE_DIR)/autoopts/tpl/mdoc2man.sh ; \
    $(GSED) -i -e 's|echo|/usr/gnu/bin/echo|' \
        $(SOURCE_DIR)/autoopts/tpl/texi2mdoc.sh ; \
    $(GSED) -i -e 's| tr | /usr/gnu/bin/tr |' \
        $(SOURCE_DIR)/autoopts/test/vendor.test

# Enable ASLR for this component
ASLR_MODE = $(ASLR_ENABLE)

@@ -54,13 +67,7 @@

install:    $(INSTALL_32_and_64)

test:        build
    -(cd $(BUILD_DIR_32)/agen5/test; gmake check)
    -(cd $(BUILD_DIR_32)/getdefs/test; gmake check)
    -(cd $(BUILD_DIR_32)/xml2ag/test; gmake check)
    -(cd $(BUILD_DIR_64)/agen5/test; gmake check)
    -(cd $(BUILD_DIR_64)/getdefs/test; gmake check)
    -(cd $(BUILD_DIR_64)/xml2ag/test; gmake check)
test:        $(TEST_32_and_64)

BUILD_PKG_DEPENDENCIES =    $(BUILD_TOOLS)


 components/autogen/patches/ag-text.c.patch

File was deleted

 components/autogen/patches/guile-iface.h.patch

New file
@@ -0,0 +1,35 @@
The guile gh_scm2ulong() and scm_to_ulong() routines should really
return an unsigned long otherwise the generation of the getdefs
opts.[h,c] files from the opts.def file fails for 32-bit SPARC.

This problem has been reported upstream, and the fix is in autogen-5.17.5pre2

--- autogen-5.16.2/agen5/guile-iface.h.orig    2013-05-31 09:59:18.924928189 -0700
+++ autogen-5.16.2/agen5/guile-iface.h    2013-05-31 10:00:51.274085992 -0700
@@ -32,7 +32,7 @@
 # define AG_SCM_SYM_P(_s)             SCM_SYMBOLP(_s)
 # define AG_SCM_TO_INT(_i)            gh_scm2int(_i)
 # define AG_SCM_TO_LONG(_v)           gh_scm2long(_v)
-# define AG_SCM_TO_ULONG(_v)          gh_scm2ulong(_v)
+# define AG_SCM_TO_ULONG(_v)          ((unsigned long)gh_scm2ulong(_v))
 # define AG_SCM_VEC_P(_v)             SCM_VECTORP(_v)
 
 #elif GUILE_VERSION < 200000
@@ -58,7 +58,7 @@
 # define AG_SCM_SYM_P(_s)             scm_is_symbol(_s)
 # define AG_SCM_TO_INT(_i)            scm_to_int(_i)
 # define AG_SCM_TO_LONG(_v)           scm_to_long(_v)
-# define AG_SCM_TO_ULONG(_v)          scm_to_ulong(_v)
+# define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
 # define AG_SCM_VEC_P(_v)             scm_is_vector(_v)
 
 #elif GUILE_VERSION < 201000
@@ -84,7 +84,7 @@
 # define AG_SCM_SYM_P(_s)             scm_is_symbol(_s)
 # define AG_SCM_TO_INT(_i)            scm_to_int(_i)
 # define AG_SCM_TO_LONG(_v)           scm_to_long(_v)
-# define AG_SCM_TO_ULONG(_v)          scm_to_ulong(_v)
+# define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
 # define AG_SCM_VEC_P(_v)             scm_is_vector(_v)
 
 #else