cvsuser 04/06/10 07:56:38
Modified: config/gen/makefiles root.in
config/init data.pl
config/init/hints mswin32.pl
Log:
Parrot has been broken on OS X for over a month now. The problem is that
the libnci test requires the libnci dynamic library to be built, and the
top level Makefile only has rules to generate libnci.so and libnci.dll.
On OS X this library is named libnci.dylib, so the build fails because
there is no rule to make this file.
Courtesy of Nicholas Clark <[EMAIL PROTECTED]>
Revision Changes Path
1.219 +3 -7 parrot/config/gen/makefiles/root.in
Index: root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -w -r1.218 -r1.219
--- root.in 8 Jun 2004 11:41:26 -0000 1.218
+++ root.in 10 Jun 2004 14:56:31 -0000 1.219
@@ -1,4 +1,4 @@
-# $Id: root.in,v 1.218 2004/06/08 11:41:26 jrieks Exp $
+# $Id: root.in,v 1.219 2004/06/10 14:56:31 dan Exp $
###############################################################################
#
@@ -1167,12 +1167,8 @@
###### OS depend targets ##########
# libnci.so used by t/pmc/nci.t
-$(DYNEXT_DIR)/libnci.so: $(SRC)/nci_test.c
- $(LD) $(LD_SHARED) $(LDFLAGS) \
- $(LD_OUT)$@ $(SRC)/nci_test.c
-
-$(DYNEXT_DIR)/libnci.dll: $(SRC)/nci_test.c
- $(LD) $(LD_SHARED) -def:libnci.def $(LDFLAGS) \
+$(LIBNCI_SO): $(SRC)/nci_test.c
+ $(LD) $(LD_SHARED) ${ncilib_link_extra} $(LDFLAGS) \
$(LD_OUT)$@ $(SRC)/nci_test.c
# vim ctags
1.27 +3 -1 parrot/config/init/data.pl
Index: data.pl
===================================================================
RCS file: /cvs/public/parrot/config/init/data.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -r1.26 -r1.27
--- data.pl 26 Apr 2004 07:28:05 -0000 1.26
+++ data.pl 10 Jun 2004 14:56:35 -0000 1.27
@@ -1,6 +1,6 @@
#! perl -w
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: data.pl,v 1.26 2004/04/26 07:28:05 leo Exp $
+# $Id: data.pl,v 1.27 2004/06/10 14:56:35 dan Exp $
=head1 NAME
@@ -121,6 +121,8 @@
icu_make => '# Building of ICU disabled',
buildicu => 0,
+ ncilib_link_extra => '', # Extra flags needed for libnci.so
+
);
# add profiling if needed
# FIXME gcc syntax
1.21 +2 -1 parrot/config/init/hints/mswin32.pl
Index: mswin32.pl
===================================================================
RCS file: /cvs/public/parrot/config/init/hints/mswin32.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- mswin32.pl 3 May 2004 08:21:38 -0000 1.20
+++ mswin32.pl 10 Jun 2004 14:56:38 -0000 1.21
@@ -18,7 +18,8 @@
rm_f => '$(PERL) -MExtUtils::Command -e rm_f',
rm_rf => '$(PERL) -MExtUtils::Command -e rm_rf',
PQ => '"',
- make_c=> '$(PERL) -e "chdir shift @ARGV; system \'$(MAKE)\', @ARGV;
exit $$? >> 8;"'
+ make_c=> '$(PERL) -e "chdir shift @ARGV; system \'$(MAKE)\', @ARGV;
exit $$? >> 8;"',
+ ncilib_link_extra => '-def:libnci.def',
);
if( $is_msvc ) {
