From cd85d4060838f2107cd77894f713df266481172e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 15 Oct 2008 05:57:27 +0200 Subject: [PATCH] Fix paths in pkg-config files from mono and gtk-sharp. --HG-- extra : convert_revision : 075ecd8ba9dca2e2fc7e05c6da64ef269a74aa47 --- templates/gtk-sharp-runstuff-before-build.sh | 11 +++++++ templates/mono-runstuff-before-configure.sh | 30 ++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/templates/gtk-sharp-runstuff-before-build.sh b/templates/gtk-sharp-runstuff-before-build.sh index a1f14070b78..436ba431fd3 100644 --- a/templates/gtk-sharp-runstuff-before-build.sh +++ b/templates/gtk-sharp-runstuff-before-build.sh @@ -6,3 +6,14 @@ replace_interpreter perl parser/gapi2xml.pl replace_interpreter perl parser/gapi_pp.pl + +# +# Fix up pkg-config files. +gtksharp_pc_files="gtk/gtk-sharp-2.0.pc.in gtkdotnet/gtk-dotnet-2.0.pc.in + glib/glib-sharp-2.0.pc.in parser/gapi-2.0.pc.in glade/glade-sharp-2.0.pc.in" + +for f in ${gtksharp_pc_files}; do + $sed_cmd -e "s|\${pcfiledir}/../..|$XBPS_MASTERDIR|g" \ + $wrksrc/$f > $wrksrc/$f.sed && \ + $mv_cmd $wrksrc/$f.sed $wrksrc/$f +done diff --git a/templates/mono-runstuff-before-configure.sh b/templates/mono-runstuff-before-configure.sh index a55cd8abd84..8daceb71e64 100644 --- a/templates/mono-runstuff-before-configure.sh +++ b/templates/mono-runstuff-before-configure.sh @@ -1,10 +1,10 @@ # -# Replaces hardcoded shebang files in some scripts. -# # Perl files with hardcoded shebang path. +# mono_perl_files="mcs/errors/do-tests.pl mcs/tools/scan-tests.pl msvc/create-windef.pl mono/benchmark/test-driver mono/cil/make-opcodes-def.pl mono/metadata/make-bundle.pl mono/mini/genmdesc.pl mono/tests/stress-runner.pl" + # # Bash files with hardcoded shebang path. # @@ -29,3 +29,29 @@ done for f in ${mono_perl_files}; do replace_interpreter perl $f done + +unset mono_perl_files mono_bash_files + +# +# Fix up wrong pkg-config prefix vars. +# +mono_pc_files="data/cecil.pc.in data/dotnet.pc.in + data/dotnet35.pc.in data/mint.pc.in data/mono-cairo.pc.in + data/mono.pc.in data/smcs.pc.in scripts/mono-nunit.pc.in" + +for f in ${mono_pc_files}; do + $sed_cmd -e "s|\${pcfiledir}/../..|$XBPS_MASTERDIR|g" \ + $wrksrc/$f > $wrksrc/$f.sed && \ + $mv_cmd $wrksrc/$f.sed $wrksrc/$f +done + +unset mono_pc_files + +# +# Fix up hardcoded default path in mcs. +# +$sed_cmd -e "s|/usr/local|$XBPS_MASTERDIR|g" \ + $wrksrc/mcs/build/config-default.make > \ + $wrksrc/mcs/build/config-default.make.in && \ + $mv_cmd $wrksrc/mcs/build/config-default.make.in \ + $wrksrc/mcs/build/config-default.make