diff options
Diffstat (limited to 'homebrew/subversionat18/patches.sh')
-rwxr-xr-x | homebrew/subversionat18/patches.sh | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/homebrew/subversionat18/patches.sh b/homebrew/subversionat18/patches.sh new file mode 100755 index 000000000..66a2434f2 --- /dev/null +++ b/homebrew/subversionat18/patches.sh @@ -0,0 +1,49 @@ +echo 'Creating brew-patch.diff' +cat << EOF >> brew-patch.diff +diff --git a/configure b/configure +index 445251b..6ff4332 100755 +--- a/configure ++++ b/configure +@@ -25366,6 +25366,8 @@ fi + SWIG_CPPFLAGS="$CPPFLAGS" + + SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-no-cpp-precomp //'` ++ SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-F\/[^ ]* //'` ++ SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-isystem\/[^ ]* //'` + + + +diff --git a/subversion/bindings/swig/perl/native/Makefile.PL.in b/subversion/bindings/swig/perl/native/Makefile.PL.in +index a60430b..bd9b017 100644 +--- a/subversion/bindings/swig/perl/native/Makefile.PL.in ++++ b/subversion/bindings/swig/perl/native/Makefile.PL.in +@@ -76,10 +76,13 @@ my $apr_ldflags = '@SVN_APR_LIBS@' + + chomp $apr_shlib_path_var; + ++my $config_ccflags = $Config{ccflags}; ++$config_ccflags =~ s/-arch\s+\S+//g; ++ + my %config = ( + ABSTRACT => 'Perl bindings for Subversion', + DEFINE => $cppflags, +- CCFLAGS => join(' ', $cflags, $Config{ccflags}), ++ CCFLAGS => join(' ', $cflags, $config_ccflags), + INC => join(' ', $includes, $cppflags, + " -I$swig_srcdir/perl/libsvn_swig_perl", + " -I$svnlib_srcdir/include", + +diff --git a/build/get-py-info.py b/build/get-py-info.py +index 29a6c0a..dd1a5a8 100644 +--- a/build/get-py-info.py ++++ b/build/get-py-info.py +@@ -83,7 +83,7 @@ def link_options(): + options = sysconfig.get_config_var('LDSHARED').split() + fwdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR') + +- if fwdir and fwdir != "no-framework": ++ if fwdir and fwdir != "no-framework" and sys.platform != 'darwin': + + # Setup the framework prefix + fwprefix = sysconfig.get_config_var('PYTHONFRAMEWORKPREFIX') +EOF |