20524490 guile should deliver 64-bit /usr/bin/guile
authorRich Burridge <rich.burridge@oracle.com>
Wed, 11 Feb 2015 20:09:28 -0800
changeset 3772 fd37c7ac6708
parent 3771 f82d2dc12afc
child 3774 57b70617c074
20524490 guile should deliver 64-bit /usr/bin/guile
components/guile/Makefile
components/guile/guile.p5m
components/guile/test/results-all.master
--- a/components/guile/Makefile	Wed Feb 11 20:08:18 2015 -0800
+++ b/components/guile/Makefile	Wed Feb 11 20:09:28 2015 -0800
@@ -55,7 +55,8 @@
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "s|\(^$(GCC_ROOT)/bin/gcc\).*|\\$$(GCC_ROOT)/bin/gcc|" ' \
 	'-e "s|\(^/bin/bash ../../libtool\).*|\1|" ' \
-	'-e "s|\(^libtool: link:\).*|\1|" '
+	'-e "s|\(^libtool: link:\).*|\1|" ' \
+	'-e "/^WARNING:/d" '
 
 ASLR_MODE = $(ASLR_ENABLE)
 
--- a/components/guile/guile.p5m	Wed Feb 11 20:08:18 2015 -0800
+++ b/components/guile/guile.p5m	Wed Feb 11 20:09:28 2015 -0800
@@ -36,11 +36,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/315
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/$(MACH64)/guile
-file path=usr/bin/$(MACH64)/guile-config
-file path=usr/bin/$(MACH64)/guile-snarf
-file path=usr/bin/$(MACH64)/guile-tools
-file path=usr/bin/guile
+file usr/bin/$(MACH64)/guile path=usr/bin/guile
 file path=usr/bin/guile-config
 file path=usr/bin/guile-snarf
 file path=usr/bin/guile-tools
--- a/components/guile/test/results-all.master	Wed Feb 11 20:08:18 2015 -0800
+++ b/components/guile/test/results-all.master	Wed Feb 11 20:09:28 2015 -0800
@@ -368,8 +368,6 @@
 unsupported test cases: 11
 errors:                 0
 
-WARNING: (test-srfi-69): imported module (srfi srfi-69) overrides core binding `make-hash-table'
-WARNING: (test-srfi-69): imported module (srfi srfi-69) overrides core binding `hash-table?'
 FAIL: check-guile
 ==================================
 1 of 1 tests failed