Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22709
Modified Files:
doxygen.info doxygen.patch doxygen-doc.info
Log Message:
fix for doxygen build failure that found system-iconv
Patching Makefile.libdoxycfg made it newer than libdoxycfg.pro and so it
frequently was not regenerated with the correct flags for us -> failure.
Also, hardcode the platform we're building for rather than expecting the
autodetect code to always work. This has the benefit of taking care of any
-arch games
Index: doxygen.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/doxygen.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- doxygen.patch 16 Feb 2013 17:44:29 -0000 1.9
+++ doxygen.patch 3 May 2013 19:01:02 -0000 1.10
@@ -105,24 +105,3 @@
win32:INCLUDEPATH += .
#win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
win32-g++:INCLUDEPATH = ../qtools ../libmd5
-diff -uNr doxygen-1.8.3.1/tmake/lib/macosx-uni-c++/tmake.conf
doxygen-1.8.3.1.fink/tmake/lib/macosx-uni-c++/tmake.conf
---- doxygen-1.8.3.1/tmake/lib/macosx-uni-c++/tmake.conf 2012-08-09
14:29:37.000000000 -0400
-+++ doxygen-1.8.3.1.fink/tmake/lib/macosx-uni-c++/tmake.conf 2013-01-31
10:54:05.000000000 -0500
-@@ -8,7 +8,7 @@
- CONFIG = qt warn_on release
-
- TMAKE_CC = cc
--TMAKE_CFLAGS = -pipe -arch i386 -arch ppc
-+TMAKE_CFLAGS = -pipe -arch @FINK_ARCH@
- TMAKE_CFLAGS_WARN_ON = -Wall -W -Wno-deprecated-declarations
-Wno-invalid-source-encoding
- TMAKE_CFLAGS_WARN_OFF =
- TMAKE_CFLAGS_RELEASE = -O2
-@@ -36,7 +36,7 @@
-
- TMAKE_LINK = c++
- TMAKE_LINK_SHLIB = c++
--TMAKE_LFLAGS = -Wl,-search_paths_first -arch i386 -arch ppc
-+TMAKE_LFLAGS = -Wl,-search_paths_first -arch @FINK_ARCH@
- TMAKE_LFLAGS_RELEASE =
- TMAKE_LFLAGS_DEBUG =
- TMAKE_LFLAGS_SHLIB = -shared
Index: doxygen-doc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/doxygen-doc.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- doxygen-doc.info 31 Jan 2013 22:21:50 -0000 1.5
+++ doxygen-doc.info 3 May 2013 19:01:02 -0000 1.6
@@ -1,6 +1,6 @@
Info3: <<
-
Package: doxygen-doc
+### Keep in sync with doxygen package
Version: 1.8.3.1
Revision: 1
Source: ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%v.src.tar.gz
@@ -17,22 +17,22 @@
UseMaxBuildJobs: true
NoSetMAKEFLAGS: true
PatchFile: doxygen.patch
-PatchFile-MD5: 6fa2690fb487dd1e4e8fe513f88c739d
+PatchFile-MD5: 8f1c41b3a4390e000cf2209f435a969d
PatchScript: <<
- sed -e 's|@PREFIX@|%p|g' \
- -e 's|@FINK_ARCH@|%m|g' <%{PatchFile} | patch -p1
- sed -i.bak -e 's|-Wno-invalid-source-encoding||g' \
+ sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
+ ## remove flag that is a no-op with gcc
+ ## don't add Makefiles or pro files to this list or make won't know when
+ ## to regenerate if necessary
+ perl -pi -e 's|-Wno-invalid-source-encoding||g' \
addon/doxmlparser/examples/metrics/Makefile.metrics \
addon/doxmlparser/src/Makefile.doxmlparser \
addon/doxmlparser/test/Makefile.xmlparse \
- libmd5/Makefile.libmd5 \
- src/Makefile.libdoxycfg \
tmake/lib/macosx-c++/tmake.conf \
tmake/lib/macosx-intel-c++/tmake.conf \
tmake/lib/macosx-uni-c++/tmake.conf
<<
CompileScript: <<
- ./configure --prefix %p --release --install /usr/bin/install --dot
%p/bin/dot --bison /usr/bin/bison --flex /usr/bin/flex
+ ./configure --prefix %p --release --platform macosx-c++ --install
/usr/bin/install --dot %p/bin/dot --bison /usr/bin/bison --flex /usr/bin/flex
ln -s %p/bin/doxygen ./bin/doxygen
make docs
<<
Index: doxygen.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/doxygen.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- doxygen.info 16 Feb 2013 17:44:29 -0000 1.13
+++ doxygen.info 3 May 2013 19:01:02 -0000 1.14
@@ -1,6 +1,6 @@
Info3: <<
-
Package: doxygen
+### Keep in sync with doxygen-doc package
Version: 1.8.3.1
Revision: 1
Source: ftp://ftp.stack.nl/pub/users/dimitri/%n-%v.src.tar.gz
@@ -14,23 +14,23 @@
libiconv-dev
<<
PatchFile: %n.patch
-PatchFile-MD5: 39faecce786584a091ac681ac2eeacfb
+PatchFile-MD5: 8f1c41b3a4390e000cf2209f435a969d
PatchScript: <<
- sed -e 's|@PREFIX@|%p|g' \
- -e 's|@FINK_ARCH@|%m|g' <%{PatchFile} | patch -p1
- sed -i.bak -e 's|-Wno-invalid-source-encoding||g' \
+ sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
+ ## remove flag that is a no-op with gcc
+ ## don't add Makefiles or pro files to this list or make won't know when
+ ## to regenerate if necessary
+ perl -pi -e 's|-Wno-invalid-source-encoding||g' \
addon/doxmlparser/examples/metrics/Makefile.metrics \
addon/doxmlparser/src/Makefile.doxmlparser \
addon/doxmlparser/test/Makefile.xmlparse \
- libmd5/Makefile.libmd5 \
- src/Makefile.libdoxycfg \
tmake/lib/macosx-c++/tmake.conf \
tmake/lib/macosx-intel-c++/tmake.conf \
tmake/lib/macosx-uni-c++/tmake.conf
<<
GCC: 4.0
CompileScript: <<
- ./configure --prefix %p --release --install /usr/bin/install --dot
%p/bin/dot --bison /usr/bin/bison --flex /usr/bin/flex
+ ./configure --prefix %p --release --platform macosx-c++ --install
/usr/bin/install --dot %p/bin/dot --bison /usr/bin/bison --flex /usr/bin/flex
make
<<
InstallScript: <<
@@ -72,6 +72,9 @@
because it's more portable than fink needs to support and
leads to build chaos.
+ Be explicit about the platform we're building for. This eliminates
+ the -arch games.
+
Patch out -Wno-invalid-source-encoding on < 10.7 because the compilers
can't understand it.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
