Author: wade Date: 2008-02-19 15:41:44 -0500 (Tue, 19 Feb 2008) New Revision: 96187
Modified: trunk/release/macosx/buildpackage trunk/release/packaging/conf/macos-10-ppc trunk/release/packaging/conf/macos-10-x86 trunk/release/packaging/dep_builder trunk/release/packaging/do-install-zip-pkgs Log: packaging/conf/macos-10-x86: packaging/conf/macos-10-ppc: macosx/buildpackage: -Correctly use headerpad_max_install_names so that libtool doesn't ignore it. do-insall-zip-pkgs: -don't fall back on using relative paths... error out instead Modified: trunk/release/macosx/buildpackage =================================================================== --- trunk/release/macosx/buildpackage 2008-02-19 20:33:45 UTC (rev 96186) +++ trunk/release/macosx/buildpackage 2008-02-19 20:41:44 UTC (rev 96187) @@ -124,7 +124,7 @@ framework_prefix = "/Library/Frameworks/Mono.framework" prefix = "%s/Versions/%s" % (framework_prefix, version) # TODO: don't use executable_path anymore (fix pango issues... ?) (maybe we could use a really long path instead of build_deps, and that would allow enough room? lame...) - (code, output) = conf.buildenv.execute_command("%s/do-install-zip-pkgs --relative_paths %s%s %s %s " % (arch_remote_packages_loc, arch_remote_PKGROOT, prefix, prefix, arch_remote_packages_loc) ) + (code, output) = conf.buildenv.execute_command("%s/do-install-zip-pkgs %s%s %s %s " % (arch_remote_packages_loc, arch_remote_PKGROOT, prefix, prefix, arch_remote_packages_loc) ) if code: print "Error extracting and installing packages" sys.exit(1) Modified: trunk/release/packaging/conf/macos-10-ppc =================================================================== --- trunk/release/packaging/conf/macos-10-ppc 2008-02-19 20:33:45 UTC (rev 96186) +++ trunk/release/packaging/conf/macos-10-ppc 2008-02-19 20:41:44 UTC (rev 96187) @@ -7,7 +7,8 @@ # Can't build gtk+ on 10.3 # Seems we need to set this. Otherwise it gets set to 10.1 -env="MACOSX_DEPLOYMENT_TARGET=10.4,LDFLAGS= -headerpad_max_install_names " +# use -Xlinker so libtool doesn't drop the headerpad flag +env="MACOSX_DEPLOYMENT_TARGET=10.4,LDFLAGS= -Xlinker -headerpad_max_install_names " # 10.3 settings #username=nds_cm Modified: trunk/release/packaging/conf/macos-10-x86 =================================================================== --- trunk/release/packaging/conf/macos-10-x86 2008-02-19 20:33:45 UTC (rev 96186) +++ trunk/release/packaging/conf/macos-10-x86 2008-02-19 20:41:44 UTC (rev 96187) @@ -3,7 +3,8 @@ USE_ZIP_PKG=1 # Helps with relocating binaries -env="LDFLAGS= -headerpad_max_install_names " +# use -Xlinker so libtool doesn't drop the headerpad flag +env="MACOSX_DEPLOYMENT_TARGET=10.4,LDFLAGS= -Xlinker -headerpad_max_install_names " web_index=7 Modified: trunk/release/packaging/dep_builder =================================================================== --- trunk/release/packaging/dep_builder 2008-02-19 20:33:45 UTC (rev 96186) +++ trunk/release/packaging/dep_builder 2008-02-19 20:41:44 UTC (rev 96187) @@ -40,6 +40,7 @@ sys.exit(1) # Copy files back +log_obj.log("Copying files back...\n") conf.buildenv.copy_from(build_location + '/build/built-packages/*', 'external_zip_pkg') conf.buildenv.unlock_env() Modified: trunk/release/packaging/do-install-zip-pkgs =================================================================== --- trunk/release/packaging/do-install-zip-pkgs 2008-02-19 20:33:45 UTC (rev 96186) +++ trunk/release/packaging/do-install-zip-pkgs 2008-02-19 20:41:44 UTC (rev 96187) @@ -249,11 +249,12 @@ if not relative_paths: (code, output) = utils.launch_process(command1) if code: - print "*** WARNING *** problems executing: %s" % command1 + print "*** ERROR *** problems executing: %s" % command1 print output - print "Falling back to @executable_path with install_name_tool ... " + # Don't fall back to @executable_path any more... + sys.exit(1) - if code or relative_paths: + else: # This string is shorter so it works with libmono-profiler-cov # But doesn't seem to work when I install to /tmp/build_deps... (libgdiplus configure test for libtiff fails) _______________________________________________ Mono-patches maillist - Mono-patches@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-patches