Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19197
Modified Files:
xmkmf.info
Removed Files:
xmkmf-10.9.info
Log Message:
Fix for fresh 10.8 + Xcode 5 installations.
Unify with 10.9 packaging, since it's pretty much the same as above.
--- xmkmf-10.9.info DELETED ---
Index: xmkmf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/xmkmf.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- xmkmf.info 2 Aug 2013 14:59:13 -0000 1.11
+++ xmkmf.info 30 Sep 2013 17:26:05 -0000 1.12
@@ -1,12 +1,12 @@
Package: xmkmf
Version: 1.0.6
-Revision: 1100
+Revision: 1201
Description: X11 legacy build tools
License: BSD
Maintainer: Dave Morrison <d...@finkproject.org>
-BuildDepends: pkgconfig, fink (>= 0.30.0)
-#Depends: llvm-gcc # llvm-gcc is BDO:true
-Distribution: 10.7, 10.8
+BuildDepends: pkgconfig, fink (>= 0.30.0), llvm-gcc | llvm-gcc42
+# TODO: move the llvm-gcc | llvm-gcc42 dependency to Depends once a fink is
released
+# in which llvm-gcc doesn't have the BuildDependsOnly tag set.
Source: http://xorg.freedesktop.org/releases/individual/util/imake-%v.tar.bz2
Source2:
http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2
Source-MD5: d5058b1317a85bedc1dc40c7e85c8d26
@@ -14,7 +14,7 @@
PatchFile: %n.patch
PatchFile-MD5: 72fe425745c00dfdb221e2c90680a496
PatchFile2: %n-compiler.patch
-PatchFile2-MD5: 355fbcf06fd7d85aa18a777ccec9c1ac
+PatchFile2-MD5: 487085163f23afbe07c7a5542454b663
PatchScript: <<
#! /bin/sh -ev
perl -pi -e 's|/usr/local|/usr/X11|' ../xorg-cf-files-1.0.5/site.def
@@ -29,7 +29,7 @@
ConfigureParams: --mandir=%p/share/man
CompileScript: <<
#!/bin/sh -ev
- ./configure %c
+ ./configure %c RAWCPP=`which llvm-cpp-4.2`
make
cd ../xorg-cf-files-1.0.5
./configure %c
@@ -67,8 +67,16 @@
imake (or the necessary config files) available at build time.
<<
DescPackaging: <<
- The revision number of the 10.5 version is kept higher than that of the 10.4
- version so that users who are upgrading from 10.4 to 10.5 will have this
- package replaced by the correct, new version.
+ imake has hardcoded information about build tools and will fail if a
particular
+ one is unavailable, so as of 1.0.6-1201 we use names without the full paths
and
+ allow either an Xcode with llvm-gcc (<5) or the Fink llvm-gcc42 package (>=5)
+ as a runtime dependency.
+
+ Note: this will produce a validator failure until a fink is released which
removes
+ the BuildDependsOnly tag from the llvm-gcc virtual package.
+
+ For llvm-gcc42, RAWCPP must be explicitly set to a fully-pathed cpp executable
+ to prevent a non-fatal compile failure of mdepend.cpp, so we'll just set that
+ for everybody.
<<
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
