Merge pull request #7 from ranma42/fix-config-paths

Update mono config generation to match config path fixes in mono/mono#1064

packages/mono-master.py

@@ -21,13 +21,18 @@ def __init__(self):
 					])
 
 			self.configure_flags.extend([
+				'--with-libgdiplus=%s/lib/libgdiplus.dylib' % Package.profile.prefix,
 				'--enable-loadedllvm'
 				])
 
 			self.sources.extend ([
 					# Fixes up pkg-config usage on the Mac
 					'patches/mcs-pkgconfig.patch'
 					])
+		else:
+			self.configure_flags.extend([
+				'--with-libgdiplus=%s/lib/libgdiplus.so' % Package.profile.prefix,
+				])
 
 		self.configure = expand_macros ('CFLAGS="%{env.CFLAGS} -O2" ./autogen.sh', Package.profile)
 

profiles/mono-mac-release/mono-mac-release.py

@@ -217,11 +217,6 @@ def fix_dllmap(self, config, matcher):
         os.rename(temp, config)
         os.system('chmod a+r %s' % config)
 
-    def fix_libMonoPosixHelper(self):
-        config = os.path.join(self.prefix, "etc", "mono", "config")
-        self.fix_dllmap(
-            config, lambda line: "libMonoPosixHelper.dylib" in line)
-
     def fix_gtksharp_configs(self):
         libs = [
             'atk-sharp',
@@ -240,7 +235,6 @@ def fix_gtksharp_configs(self):
 
     # THIS IS THE MAIN METHOD FOR MAKING A PACKAGE
     def package(self):
-        self.fix_libMonoPosixHelper()
         self.fix_gtksharp_configs()
         self.generate_dsym()
         blacklist = os.path.join(self.packaging_dir, 'mdk_blacklist.sh')