[csw-devel] SF.net SVN: gar:[20235] csw/mgar/pkg/ocaml/trunk

[cgrzemba at users.sourceforge.net]

Revision: 20235
          http://gar.svn.sourceforge.net/gar/?rev=20235&view=rev
Author:   cgrzemba
Date:     2013-01-29 10:16:04 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
ocaml/trunk: add build with tcl

Modified Paths:
--------------
    csw/mgar/pkg/ocaml/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch

Modified: csw/mgar/pkg/ocaml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ocaml/trunk/Makefile	2013-01-29 06:30:17 UTC (rev 20234)
+++ csw/mgar/pkg/ocaml/trunk/Makefile	2013-01-29 10:16:04 UTC (rev 20235)
@@ -13,6 +13,8 @@
 
 LICENSE = LICENSE
 
+REINPLACE_USRLOCAL += configure
+
 PATCHFILES += 0-patch
 PATCHFILES += 10-patch
 PATCHFILES += 12-patch
@@ -33,6 +35,7 @@
 PATCHFILES += 7-patch
 PATCHFILES += 8-patch
 PATCHFILES += 9-patch
+PATCHFILES += 0023-fix-build-for-tk-X11.patch
 #
 # this is only a error ignor patch taken from here:
 # http://caml.inria.fr/mantis/view.php?id=4663
@@ -73,8 +76,9 @@
 CONFIGURE_ARGS += -prefix $(prefix)
 CONFIGURE_ARGS += -verbose
 CONFIGURE_ARGS += -cc "$(notdir $(CC)) $(CFLAGS)"
-# CONFIGURE_ARGS += -x11include $(prefix)/X11/include
-# CONFIGURE_ARGS += -x11lib $(prefix)/X11/lib
+CONFIGURE_ARGS += -x11include /usr/include
+CONFIGURE_ARGS += -x11lib /usr/X11/lib
+# CONFIGURE_ARGS += -tklibs -lXext
 INSTALL_ARGS += PWD=${PWD}/$(WORKSRC)
 
 TEST_TARGET =

Added: csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch	2013-01-29 10:16:04 UTC (rev 20235)
@@ -0,0 +1,90 @@
+From 3b0c53c72a5c0097fcd8fc06dd13d635da0a26e8 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Fri, 25 Jan 2013 14:54:32 +0100
+Subject: [PATCH 23/23] fix build for tk X11
+
+---
+ configure | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/configure b/configure
+index b0390c2..ab96a84 100755
+--- a/configure
++++ b/configure
+@@ -88,7 +88,7 @@ while : ; do
+     -x11include*|--x11include*)
+         x11_include_dir=$2; shift;;
+     -x11lib*|--x11lib*)
+-        x11_lib_dir=$2; shift;;
++        x11_lib_dir=$2; echo "use X11 path: $x11_lib_dir"; shift;;
+     -with-pthread*|--with-pthread*)
+         ;; # Ignored for backward compatibility
+     -no-pthread*|--no-pthread*)
+@@ -1309,18 +1309,19 @@ do
+      test -f $dir/libX11.dylib || \
+      test -f $dir/libX11.sa; then
+     if test $dir = /usr/lib; then
+-      x11_link="-lX11"
++      x11_link="-lX11 -lXext"
+     else
+       x11_libs="-L$dir"
+       case "$host" in
+         *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
+-        *) x11_link="-L$dir -lX11";;
++        *) x11_link="-L$dir -lX11 -lXext";;
+       esac
+     fi
+     break
+   fi
+ done
+ 
++echo "set X11 Link $x11_link"
+ 
+ if test "$x11_include" = "not found" || test "$x11_link" = "not found"
+ then
+@@ -1463,16 +1464,16 @@ if test $has_tk = true; then
+   elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
+   then
+     tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
+-  elif sh ./hasgot -L/sw/lib $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs \
++  elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs \
+                    Tcl_DoOneEvent
+-  then tk_libs="-L/sw/lib -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
+-  elif sh ./hasgot -L/usr/pkg/lib $tk_libs $tk_x11_libs \
++  then tk_libs="-ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
++  elif sh ./hasgot $tk_libs $tk_x11_libs \
+         -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs \
+                    Tcl_DoOneEvent
+   then
+     case "$host" in
+       *-*-*bsd*) tk_libs="-R/usr/pkg/lib -L/usr/pkg/lib $tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";;
+-      *) tk_libs="-L/usr/pkg/lib $tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";;
++      *) tk_libs="$tk_libs $tk_x11_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin -lpthread $tkauxlibs";;
+     esac
+   else
+     echo "Tcl library not found."
+@@ -1483,17 +1484,17 @@ fi
+ if test $has_tk = true; then
+   if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
+     echo "Tcl/Tk libraries found."
+-  elif sh ./hasgot -L/sw/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
++  elif sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
+     case "$host" in
+       *-*-*bsd*) tk_libs="-R/sw/lib -L/sw/lib $tk_libs";;
+-      *) tk_libs="-L/sw/lib $tk_libs";;
++      *) tk_libs="$tk_libs";;
+     esac
+     echo "Tcl/Tk libraries found."
+-  elif sh ./hasgot -L/usr/pkg/lib $tk_libs $tk_x11_libs $tkauxlibs \
++  elif sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs \
+                    Tk_SetGrid; then
+     case "$host" in
+       *-*-*bsd*) tk_libs="-R/usr/pkg/lib -L/usr/pkg/lib $tk_libs";;
+-      *) tk_libs="-L/usr/pkg/lib $tk_libs";;
++      *) tk_libs="$tk_libs";;
+     esac
+     echo "Tcl/Tk libraries found."
+   else
+-- 
+1.8.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.