Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31492
Modified Files:
valknut.info
Log Message:
solve "cycle in dylibs" problem, and build more robustly under X11
Index: valknut.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/valknut.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- valknut.info 25 Aug 2008 05:14:59 -0000 1.4
+++ valknut.info 25 Aug 2008 17:01:16 -0000 1.5
@@ -26,7 +26,8 @@
(%type_raw[-qttoolkit] = -aqua) qt3mac,
pkgconfig,
system-openssl-dev,
- (%type_raw[-qttoolkit] = -x11) x11-dev
+ (%type_raw[-qttoolkit] = -x11) x11-dev,
+ (%type_raw[-qttoolkit] = -x11) xmkmf (>= 1.0.2-3)
<<
Conflicts: dcgui-qt, dcgui-qt-ssl, valknut, valknut-ssl
BuildConflicts: <<
@@ -40,7 +41,7 @@
### fix the order of SSL flags to make sure we link to system-openssl
/usr/bin/perl -pi -e 's,\$\(all_libraries\)
\$\(DCLIB_LIBS\),\$\(SSL_LDFLAGS\) \$\(all_libraries\) \$\(DCLIB_LIBS\),g;'
valknut/Makefile.in
<<
-SetLDFLAGS: -L%p/lib/system-openssl/lib
+SetLDFLAGS: -L%p/lib/system-openssl/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
ConfigureParams: <<
(%type_raw[-qttoolkit] = -aqua) --with-qt-dir=%p/lib/qt3mac \
(%type_raw[-qttoolkit] = -aqua) --with-qt-includes=%p/lib/qt3mac/include \
@@ -54,6 +55,7 @@
GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
+ export PATH=%p/lib/xmkmf/bin:$PATH
./configure %c
/usr/bin/make -w
<<
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
