Respect iodbc headers in odbc module. Closes bug #165853.

(Portage version: 2.1.2-r7)

3 files changed, 103 insertions, 11 deletions

diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog
index bd922566f02d..9bd0379dc616 100644
--- a/dev-lang/xsb/ChangeLog
+++ b/dev-lang/xsb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/xsb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.6 2007/02/03 00:58:27 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.7 2007/02/08 08:16:23 keri Exp $
+
+  08 Feb 2007; keri <keri@gentoo.org> files/xsb-3.0.1-configure.patch,
+  files/xsb-3.0.1-portage.patch:
+  Respect iodbc headers in odbc module. Closes bug #165853 reported by Berk
+  Birand.
 
   03 Feb 2007; keri <keri@gentoo.org> +files/xsb-3.0.1-debug.patch,
   xsb-3.0.1.ebuild:
diff --git a/dev-lang/xsb/files/xsb-3.0.1-configure.patch b/dev-lang/xsb/files/xsb-3.0.1-configure.patch
index 902761faec15..69195f6647de 100644
--- a/dev-lang/xsb/files/xsb-3.0.1-configure.patch
+++ b/dev-lang/xsb/files/xsb-3.0.1-configure.patch
@@ -1,5 +1,5 @@
 --- XSB.orig/build/configure.in	2006-06-25 13:08:48.000000000 +1200
-+++ XSB/build/configure.in	2007-01-29 19:38:38.000000000 +1300
++++ XSB/build/configure.in	2007-02-08 21:01:15.000000000 +1300
 @@ -258,9 +258,9 @@
  dnl prefix given by the user. The prefix variable will later get
  dnl the <xsb-version> subdirectory added in.
@@ -147,7 +147,24 @@
      if test "${java_support}" != "yes"; then
          echo "Interprolog not supported due to failure to find Java"
          with_interprolog=""
-@@ -1547,20 +1550,20 @@
+@@ -1175,14 +1178,14 @@
+ if test "${enable_profile}" = "yes"; then
+     AC_DEFINE(DEBUG)
+     AC_DEFINE(PROFILE)
+-    do_debugging=yes
++#    do_debugging=yes
+ fi
+ 
+ if test "${enable_debug}" = "yes"; then
+     AC_DEFINE(NON_OPT_COMPILE)
+     AC_DEFINE(DEBUG)
+ dnl    AC_DEFINE(CP_DEBUG)
+-    do_debugging=yes
++#    do_debugging=yes
+ fi
+ 
+ if test "${enable_debug_verbose}" = "yes"; then
+@@ -1547,20 +1550,22 @@
  #fi
  
  # dnl ODBC library
@@ -164,9 +181,11 @@
 -                    LDFLAGS="-lodbc ${LDFLAGS}"
 -                    LINKFLAGS="-lodbc ${LINKFLAGS}"
 +    *)          if test "${with_iodbc}" = "yes"; then
++                    ODBC_CFLAGS="$(iodbc-config --cflags)"
 +                    LDFLAGS="$(iodbc-config --libs) ${LDFLAGS}"
 +#                    LINKFLAGS="-liodbc ${LINKFLAGS}"
 +                elif test "${with_odbc}" = "yes"; then
++                    ODBC_CFLAGS="$(odbc_config --cflags)"
 +                    LDFLAGS="$(odbc_config --libs) ${LDFLAGS}"
 +#                    LINKFLAGS="-lodbc ${LINKFLAGS}"
                  fi
@@ -176,7 +195,15 @@
  
  # this is needed for -mno-cygwin dll compilation
  DLLTYPE=nodll
-@@ -1726,11 +1729,11 @@
+@@ -1696,6 +1701,7 @@
+ 
+ AC_SUBST(ODBCSRC)
+ AC_SUBST(ODBCOBJ)
++AC_SUBST(ODBC_CFLAGS)
+ AC_SUBST(INTERPROLOGSRC)
+ AC_SUBST(INTERPROLOGOBJ)
+ AC_SUBST(mno_cyg_inclib)
+@@ -1726,11 +1732,11 @@
  AC_SUBST(xsb_asm_extension)
  AC_SUBST(xsb_dcl_extension)
  
@@ -193,7 +220,7 @@
          ${arch_config_prefix}/makedef.sh:makedef.sh.in
          ${arch_config_file}:${configuration_templ}
          makexsb:makexsb.in
-@@ -1854,10 +1857,10 @@
+@@ -1854,10 +1860,10 @@
  
  # This is needed so that *after* XSB is installed in a common directory,
  # users could compile packages that produce arch-specific code.
@@ -208,7 +235,7 @@
  
  
  dnl Add site dynamic libraries to XSB library path
-@@ -1904,9 +1907,9 @@
+@@ -1904,9 +1910,9 @@
  # configuring for Windows over Samba, NFS, etc.
  chmod 644 ${arch_config_file} \
        ${arch_config_prefix}/xsb_config.h \
diff --git a/dev-lang/xsb/files/xsb-3.0.1-portage.patch b/dev-lang/xsb/files/xsb-3.0.1-portage.patch
index 69704d1101a3..e96a87b89ae1 100644
--- a/dev-lang/xsb/files/xsb-3.0.1-portage.patch
+++ b/dev-lang/xsb/files/xsb-3.0.1-portage.patch
@@ -1,5 +1,51 @@
+--- XSB.orig/build/emuMakefile.in	2006-06-25 13:09:42.000000000 +1200
++++ XSB/build/emuMakefile.in	2007-02-08 20:57:51.000000000 +1300
+@@ -42,6 +42,7 @@
+ LDFLAGS=@LDFLAGS@
+ ODBCSRC=@ODBCSRC@
+ ODBCOBJ=@ODBCOBJ@
++ODBC_CFLAGS=@ODBC_CFLAGS@
+ INTERPROLOGSRC=@INTERPROLOGSRC@
+ INTERPROLOGOBJ=@INTERPROLOGOBJ@
+ DLLTYPE=@DLLTYPE@
+@@ -239,26 +240,31 @@
+ 	@cp dynload.o $(arch_config_objlibdir) 2> /dev/null || echo ""
+ 
+ emuloop.o: emuloop.c
+-	@echo -e "\t[$(CC)] emuloop.c using $(emuloopCFLAGS)"
++	@echo -e "\t[$(CC)] emuloop.c"
+ 	@$(CC) -I$(arch_config_prefix)  -c $(emuloopCFLAGS) emuloop.c
+ 	@cp emuloop.o $(arch_config_objlibdir) 2> /dev/null || echo ""
+ 
+ # Higher optimization level has problem with some versions of gcc
+ tr_utils.o: tr_utils.c
+-	@echo -e "\t[$(CC)] tr_utils.c using $(trutilsCFLAGS)"
++	@echo -e "\t[$(CC)] tr_utils.c"
+ 	@$(CC) -I$(arch_config_prefix)  -c $(trutilsCFLAGS) tr_utils.c
+ 	@cp tr_utils.o $(arch_config_objlibdir) 2> /dev/null || echo ""
+ 
+ builtin.o: builtin.c
+-	@echo -e "\t[$(CC)] builtin.c using $(builtinsCFLAGS)"
++	@echo -e "\t[$(CC)] builtin.c"
+ 	@$(CC) -I$(arch_config_prefix)  -c $(builtinsCFLAGS) builtin.c
+ 	@cp builtin.o $(arch_config_objlibdir) 2> /dev/null || echo ""
+ 
+ loader_xsb.o: loader_xsb.c
+-	@echo -e "\t[$(CC)] loader_xsb.c using $(loaderCFLAGS)"
++	@echo -e "\t[$(CC)] loader_xsb.c"
+ 	@$(CC) -I$(arch_config_prefix)  -c $(loaderCFLAGS) loader_xsb.c
+ 	@cp loader_xsb.o $(arch_config_objlibdir) 2> /dev/null || echo ""
+ 
++odbc_xsb.o: odbc_xsb.c
++	@echo -e "\t[$(CC)] odbc_xsb.c"
++	@$(CC) -I$(arch_config_prefix)  -c $(ODBC_CFLAGS) $(CFLAGS) odbc_xsb.c
++	@cp odbc_xsb.o $(arch_config_objlibdir) 2> /dev/null || echo ""
++
+ .c.o:
+ 	@echo -e "\t[$(CC)] $*.c"
+ 	@$(CC) -I$(arch_config_prefix)  -c $(CFLAGS) $*.c
 --- XSB.orig/build/topMakefile.in	2006-06-25 13:09:42.000000000 +1200
-+++ XSB/build/topMakefile.in	2007-02-03 10:14:38.000000000 +1300
++++ XSB/build/topMakefile.in	2007-02-03 14:02:29.000000000 +1300
 @@ -72,7 +72,7 @@
  # Everything is placed in subdirectories of this directory.
  # The values for many of the variables below are expressed
@@ -95,7 +141,19 @@
  	@echo -n "Directory: ${install_bindir}..."
  	  @(test -d "${install_bindir}" || \
  		mkdir -p "${install_bindir}" ) && \
-@@ -357,10 +345,6 @@
+@@ -331,11 +319,6 @@
+ 		mkdir -p "${install_pkgxmcdir}" ) && \
+ 		  echo "ok" || \
+ 		(echo "FAILED"; echo "+++Can't create ${install_pkgxmcdir}" >> .missingdirs.tmp)
+-	@echo -n "Directory: ${install_examples}..."
+-	  @(test -d "${install_examples}" || \
+-		mkdir -p "${install_examples}" ) && \
+-		  echo "ok" || \
+-		(echo "FAILED"; echo "+++Can't create ${install_examples}" >> .missingdirs.tmp)
+ 	@echo -n "Directory: ${install_prolog_includes}..."
+ 	  @(test -d "${install_prolog_includes}" || \
+ 		mkdir -p "${install_prolog_includes}" ) && \
+@@ -357,10 +340,6 @@
  		cp -f ${src_scriptdir}/xsb${config_tag} \
  				${install_scriptdir}/xsb${config_tag}; \
  		chmod 755 ${install_scriptdir}/* ${install_bindir}/* ; \
@@ -106,7 +164,7 @@
  		echo "Copying config..." ; \
  		cp -f ${src_config_libdir}/xsb_configuration.* \
  			  ${install_config_libdir} ; \
-@@ -396,11 +380,6 @@
+@@ -396,11 +375,6 @@
  		cp -f ${src_cmplibdir}/*$(xsb_obj_extension) ${install_cmplibdir} ; \
  		chmod 644 ${install_cmplibdir}/*$(xsb_obj_extension) ; \
  		./copysubdirs.sh ${src_cmplibdir} ${install_cmplibdir} ; \
@@ -118,12 +176,14 @@
  		echo "Copying etc..."; \
  		cp -fr ${src_etcdir}/* ${install_etcdir}; \
  		echo "Copying examples..."; \
-@@ -416,7 +395,7 @@
+@@ -416,8 +390,8 @@
  	@./pkg_config.sh $(install_scriptdir)/xsb$(config_tag) ; \
  	  chmod 644  $(install_config_libdir)/xsb_configuration$(xsb_obj_extension)
  
 -remake_dot_O_files:
+-	@cd $(srcdir); make XSB=$(src_scriptdir)/xsb$(config_tag)
 +remake_dot_O_files: gpp
- 	@cd $(srcdir); make XSB=$(src_scriptdir)/xsb$(config_tag)
++	@cd $(srcdir); $(MAKE) XSB=$(src_scriptdir)/xsb$(config_tag)
  
  remake_dot_O_files_force:
+ 	@cd $(srcdir); make force XSB=$(src_scriptdir)/xsb$(config_tag)