« Return to Thread: fix tcltk for removal of /usr/include/X11 symlink

fix tcltk for removal of /usr/include/X11 symlink

by Jack Howarth-3 :: Rate this Message:

| View in Thread

Daniel,
   Adopting the usage of flag_sort in the tcltk package with the attached
diff for the current 10.7 info file solves the issues with the X11 headers
not being found once the /usr/include/X11 is removed. Can we get this into
10.7? Tested with -m in the absence of /usr/include/X11.
       Jack

--- /sw/fink/10.7/stable/main/finkinfo/languages/tcltk-x86_64.info 2012-01-24 14:13:45.000000000 -0500
+++ tcltk-x86_64.info 2012-04-23 21:31:08.000000000 -0400
@@ -1,7 +1,7 @@
 Package: tcltk
 Epoch: 1
 Version: 8.5.10
-Revision: 5
+Revision: 6
 Architecture: x86_64
 BuildDepends: <<
  fink-package-precedence,
@@ -9,7 +9,8 @@
  freetype219 (>= 2.3.12-1),
  pkgconfig (>= 0.23),
  x11-dev,
- xft2-dev (>= 2.1.14-1)
+ xft2-dev (>= 2.1.14-1),
+ flag-sort
 <<
 Depends: <<
  %N-shlibs (= %e:%v-%r),
@@ -27,6 +28,8 @@
 PatchFile-MD5: 4b3a12c323313a8508150dc1bb3584da
 NoSourceDirectory: true
 SetCPPFLAGS: -MD
+SetCC: flag-sort -r gcc
+SetCXX: flag-sort -r g++
 ConfigureParams: --enable-shared --disable-corefoundation --exec-prefix=%p --mandir=%p/share/man --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib tcl_cv_type_64bit="long long" PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
 InfoTest: TestScript: cd tcl%v/unix;make -k test || exit 2
 CompileScript: <<
@@ -42,7 +45,7 @@
  export DYLD_FALLBACK_LIBRARY_PATH=%b/tcl%v/unix
  ac_cv_path_tclsh=%b/tcl%v/unix/tclsh ./configure %c --build=%m-apple-darwin`uname -r|cut -f1 -d.` --host=%m-apple-darwin`uname -r|cut -f1 -d.`
 # make genstubs
- make X11_INCLUDES=""
+ make
  popd
  fink-package-precedence --depfile-ext='\.d' --prohibit-bdep=%n-dev .
 <<

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-devel mailing list
Fink-devel@...
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel

 « Return to Thread: fix tcltk for removal of /usr/include/X11 symlink