Author: rurban
Date: Wed Jan 7 08:58:38 2009
New Revision: 35132
Modified:
branches/pdd30install_stage4/MANIFEST
branches/pdd30install_stage4/config/gen/makefiles/root.in
branches/pdd30install_stage4/config/init/defaults.pm
branches/pdd30install_stage4/ext/SQLite3/Makefile.in
Log:
RT#39742 installed parrot conflicts with dev parrot:
- move -L/usr/lib in ldflags behind -lparrot
- link directly to dll in build_dir, get rid of cygchkdll
- fix wrong implib in ext/SQLite3/Makefile.in
M ext/SQLite3/Makefile.in
M MANIFEST
M config/init/defaults.pm
M config/gen/makefiles/root.in
Modified: branches/pdd30install_stage4/MANIFEST
==============================================================================
--- branches/pdd30install_stage4/MANIFEST (original)
+++ branches/pdd30install_stage4/MANIFEST Wed Jan 7 08:58:38 2009
@@ -3747,7 +3747,6 @@
t/tools/pmc2cutils/README []
tools/build/addopstags.pl []
tools/build/c2str.pl []
-tools/build/cygchkdll.sh []
tools/build/fixup_gen_file.pl []
tools/build/headerizer.pl []
tools/build/jit2c.pl []
Modified: branches/pdd30install_stage4/config/gen/makefiles/root.in
==============================================================================
--- branches/pdd30install_stage4/config/gen/makefiles/root.in (original)
+++ branches/pdd30install_stage4/config/gen/makefiles/root.in Wed Jan 7
08:58:38 2009
@@ -764,7 +764,6 @@
$(PARROT) -o $@ runtime/parrot/library/parrotlib.pir
runtime/parrot/include/config.fpmc : myconfig config_lib.pasm $(MINIPARROT)
- @cygchkdll@
@echo Invoking Parrot to generate runtime/parrot/include/config.fpmc
--cross your fingers
$(MINIPARROT) config_lib.pasm > $@
Modified: branches/pdd30install_stage4/config/init/defaults.pm
==============================================================================
--- branches/pdd30install_stage4/config/init/defaults.pm (original)
+++ branches/pdd30install_stage4/config/init/defaults.pm Wed Jan 7
08:58:38 2009
@@ -200,9 +200,6 @@
make_set_make => $Config{make_set_make},
make_and => '&&',
- # for cygwin
- cygchkdll => '',
-
# make_c: Command to emulate GNU make's C<-C directory> option: chdir
# to C<directory> before executing $(MAKE)
make_c => '$(PERL) -e \'chdir shift @ARGV; system q{$(MAKE)}, @ARGV;
exit $$? >> 8;\'',
Modified: branches/pdd30install_stage4/ext/SQLite3/Makefile.in
==============================================================================
--- branches/pdd30install_stage4/ext/SQLite3/Makefile.in (original)
+++ branches/pdd30install_stage4/ext/SQLite3/Makefile.in Wed Jan 7
08:58:38 2009
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2008, The Perl Foundation.
+# Copyright (C) 2001-2009, The Perl Foundation.
TARGET_NAME = sqlite3s
@@ -37,7 +37,7 @@
LINKFLAGS = @linkflags@ @link_debug@ @ld_debug@
LD = @ld@
LDFLAGS = @ldflags@ @ld_debug@
-#CONDITIONED_LINE(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
+#IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
O = @o@
EXE = @exe@
SHARE_EXT = @share_ext@
@@ -45,10 +45,7 @@
A = @a@
LD_SHARE_FLAGS = @ld_share_flags@
LD_LOAD_FLAGS = @ld_load_flags@
-GEN_MAKEFILES = Makefile
DYNEXT_DIR = runtime/parrot/dynext
-LIBNCI_TEST_SO = $(DYNEXT_DIR)/libnci_test$(LOAD_EXT)
-LIBGLUTCB_SO = $(DYNEXT_DIR)/libglutcb$(LOAD_EXT)
@make_set_make@
MAKE = @make_c@
@@ -74,15 +71,17 @@
test:
$(RM_F) test.db t/test.db
PERL6LIB=../../languages/perl6 $(PERL6) t/test.p6
-
$(SHARED_LIB) : $(C_FILES)
$(MKPATH) @blib_dir@
$(CC) $(CC_INC) $(LD_SHARE_FLAGS) $(LDFLAGS) @ld_...@$@ \
-#CONDITIONED_LINE(cygchkdll):
-Wl,--out-implib=blib/lib/libparrot.dll.a \
+#IF(cygwin): -Wl,--out-implib=lib$(TARGET_NAME).dll.a \
+#IF(win32 and cc==gcc): -Wl,--out-implib=lib$(TARGET_NAME).lib \
$(C_FILES) $(C_LIBS) $(ICU_SHARED)
-#CONDITIONED_LINE(win32): if exist [email protected] mt.exe -nologo
-manifest [email protected] -outputresource:$@;2
+#IF(win32): if exist [email protected] mt.exe -nologo -manifest [email protected]
-outputresource:$@;2
clean :
$(RM_F) $(SHARED_LIB) @blib_dir@ $(O_FILES) Makefile
+#IF(cygwin): $(RM_F) lib$(TARGET_NAME).dll.a
+#IF(win32 and cc==gcc): $(RM_F) lib$(TARGET_NAME).lib
