OS X 10.5 patch

parrot-1.9.0-fix-darwin-compile-and-link.patch (text/plain), 1.25 KB, created by calculuspenguin on 2010-01-25 06:39:39 UTC

--- a/config/gen/makefiles/root.in
+++ b/config/gen/makefiles/root.in
@@ -517,7 +517,7 @@ INSTALLABLENQP      := $(CUR_DIR)/installable_parrot_nqp$(EXE)
 
 # Libraries
 LIBPARROT_STATIC    := @blib_dir@/@libparrot_static@
-#IF(darwin):export DYLD_LIBRARY_PATH := @blib_dir@:$(DYLD_LIBRARY_PATH)
+#IF(darwin):export DYLD_LIBRARY_PATH := @build_dir@/@blib_dir@:$(DYLD_LIBRARY_PATH)
 #IF(win32):LIBPARROT_SHARED  := @libparrot_shared@
 #ELSE:LIBPARROT_SHARED  := @blib_dir@/@libparrot_shared@
 
--- a/config/init/hints/darwin.pm
+++ b/config/init/hints/darwin.pm
@@ -50,6 +50,9 @@ sub runstep {
     if ($ENV{'MACOSX_DEPLOYMENT_TARGET'} eq '10.6') {
         $flagsref->{ccflags} .= ' -pipe -fno-common ';
     }
+    elsif ($ENV{'MACOSX_DEPLOYMENT_TARGET'} eq '10.5') {
+        $flagsref->{ccflags} .= ' -pipe -fno-common ';
+    }
     else {
         $flagsref->{ccflags} .= ' -pipe -fno-common -Wno-long-double ';
     }
@@ -89,7 +92,7 @@ sub runstep {
         libparrot_shared_alias => "libparrot$share_ext",
         rpath                  => "-L",
         libparrot_soname       => "-install_name "
-            . $lib_dir
+            . $conf->data->get('libdir')
             . $conf->data->get('slash')
             . "libparrot"
             . $conf->data->get('share_ext')