summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-08-07 08:33:10 +0000
committerKeri Harris <keri@gentoo.org>2006-08-07 08:33:10 +0000
commitf1535dd7b4dbf23893b4a4bf8894af1ffda35da0 (patch)
tree6d2e627b86dacd23cad2fca879e12bd4c99b14b2 /dev-lang/qu-prolog
parentFixed compilation problem with gcc-4, bug #120867 (diff)
downloadgentoo-2-f1535dd7b4dbf23893b4a4bf8894af1ffda35da0.tar.gz
gentoo-2-f1535dd7b4dbf23893b4a4bf8894af1ffda35da0.tar.bz2
gentoo-2-f1535dd7b4dbf23893b4a4bf8894af1ffda35da0.zip
Add qem wrapper scripts for installed examples.
(Portage version: 2.1.1_pre4-r3)
Diffstat (limited to 'dev-lang/qu-prolog')
-rw-r--r--dev-lang/qu-prolog/ChangeLog7
-rw-r--r--dev-lang/qu-prolog/files/qu-prolog-7.2-configure.patch30
-rw-r--r--dev-lang/qu-prolog/files/qu-prolog-7.2-portage.patch23
-rw-r--r--dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild4
4 files changed, 46 insertions, 18 deletions
diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index fff1ab79c3e3..3e510c35749e 100644
--- a/dev-lang/qu-prolog/ChangeLog
+++ b/dev-lang/qu-prolog/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/qu-prolog
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.12 2006/08/06 09:35:16 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.13 2006/08/07 08:33:10 keri Exp $
+
+ 07 Aug 2006; Keri Harris <keri@gentoo.org>
+ files/qu-prolog-7.2-configure.patch, files/qu-prolog-7.2-portage.patch,
+ qu-prolog-7.2-r1.ebuild:
+ Add qem wrapper scripts for installed examples.
*qu-prolog-7.4 (06 Aug 2006)
diff --git a/dev-lang/qu-prolog/files/qu-prolog-7.2-configure.patch b/dev-lang/qu-prolog/files/qu-prolog-7.2-configure.patch
index 222a0940e773..e2df546b5fcf 100644
--- a/dev-lang/qu-prolog/files/qu-prolog-7.2-configure.patch
+++ b/dev-lang/qu-prolog/files/qu-prolog-7.2-configure.patch
@@ -1,15 +1,17 @@
--- qp7.2.orig/configure.in 2006-04-06 14:14:33.000000000 +1200
-+++ qp7.2/configure.in 2006-05-27 19:41:18.000000000 +1200
-@@ -25,7 +25,7 @@
++++ qp7.2/configure.in 2006-08-07 20:12:48.000000000 +1200
+@@ -25,7 +25,9 @@
#
DEBUGGING=" -DNDEBUG "
AC_ARG_ENABLE(debug, [ --enable-debug Turn on debugging],
-[ DEBUGGING=])
-+[ DEBUGGING="-DDEBUG_BLOCK -DDEBUG_IO -DDEBUG_MT -DDEBUG_RETRY -DDEBUG_SCHED -DDEBUG_TIMEOUT"])
++[if test "$enable_debug" != no; then
++ DEBUGGING="-DDEBUG_BLOCK -DDEBUG_IO -DDEBUG_MT -DDEBUG_RETRY -DDEBUG_SCHED -DDEBUG_TIMEOUT"
++fi])
AC_SUBST(DEBUGGING)
# Single versus multiple thread configuraation.
-@@ -34,8 +34,6 @@
+@@ -34,8 +36,6 @@
if test "$enable_multiple_threads" != no; then
# Multiple threads is the default.
AC_DEFINE(MULTIPLE_THREADS)
@@ -18,7 +20,7 @@
fi
AC_LANG_CPLUSPLUS
-@@ -115,17 +113,13 @@
+@@ -115,17 +115,13 @@
AC_SUBST(QPPP_TRADITIONAL)
fi
@@ -39,7 +41,7 @@
TK_ICM=
ICM_LIB=
AC_SUBST(TK_ICM)
-@@ -140,11 +134,17 @@
+@@ -140,11 +136,17 @@
ICM_LIB="-licm -lpthread"
AC_SUBST(ICM_LIB)
fi
@@ -58,7 +60,7 @@
ELVIN_LIB=
ELVIN_CFLAGS=
AC_SUBST(ELVIN_LIB)
-@@ -160,6 +160,7 @@
+@@ -160,6 +162,7 @@
AC_SUBST(ELVIN_LIB)
AC_SUBST(ELVIN_CFLAGS)
fi
@@ -66,7 +68,7 @@
GCCINCLUDES=
AC_ARG_WITH(gcclib,
-@@ -232,12 +233,12 @@
+@@ -232,12 +235,12 @@
then
TKDIR=NONE
else
@@ -81,7 +83,7 @@
TKDIR=`dirname $tkfile`
TKL=`basename $tkfile .a | sed -e "s/lib//"`
fi
-@@ -269,12 +270,12 @@
+@@ -269,12 +272,12 @@
then
TKDIR=NONE
else
@@ -96,7 +98,7 @@
TCLDIR=`dirname $tclfile`
TCLL=`basename $tclfile .a | sed -e "s/lib//"`
fi
-@@ -304,7 +305,7 @@
+@@ -304,7 +307,7 @@
then
TKDIR=NONE
else
@@ -105,7 +107,7 @@
TKHDIR=`dirname $tkf`
fi
rm $tktmp
-@@ -360,12 +361,12 @@
+@@ -360,12 +363,12 @@
then
TKDIR=NONE
else
@@ -120,7 +122,7 @@
TKDIR=`dirname $tkfile`
TKL=`basename $tkfile .so | sed -e "s/lib//"`
fi
-@@ -397,12 +398,12 @@
+@@ -397,12 +400,12 @@
then
TKDIR=NONE
else
@@ -135,7 +137,7 @@
TCLDIR=`dirname $tclfile`
TCLL=`basename $tclfile .so | sed -e "s/lib//"`
fi
-@@ -432,7 +433,7 @@
+@@ -432,7 +435,7 @@
then
TKDIR=NONE
else
@@ -144,7 +146,7 @@
TKHDIR=`dirname $tkf`
fi
rm $tktmp
-@@ -529,7 +530,7 @@
+@@ -529,7 +532,7 @@
#----------------------------------------------------------------------------
dnl Check for CPP version
AC_MSG_CHECKING([for GCC version])
diff --git a/dev-lang/qu-prolog/files/qu-prolog-7.2-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-7.2-portage.patch
index c059849c1e8e..aecec83e9b08 100644
--- a/dev-lang/qu-prolog/files/qu-prolog-7.2-portage.patch
+++ b/dev-lang/qu-prolog/files/qu-prolog-7.2-portage.patch
@@ -103,7 +103,7 @@
#
-PROGRAM = @QPHOME@/bin/qc1.qup
-
-+PROGRAM = @QPHOME@/bin/qc1
++PROGRAM = @QPHOME@/bin/qc1.qup
+SAVEFILE = qc1.qx
SOURCES = qc1.ql
@@ -204,3 +204,24 @@
- $(COMPILE.qc) -c -o $@ $<
+ @QPHOME@/src/qa -i $< -o $@
+--- qp7.2.orig/src/Makefile.in 2006-04-06 14:14:37.000000000 +1200
++++ qp7.2/src/Makefile.in 2006-05-27 09:00:47.000000000 +1200
+@@ -40,7 +40,7 @@
+
+ #export DEBUGGING=
+
+-export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
++#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
+ export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
+
+ .PHONY: all
+@@ -80,6 +80,9 @@
+
+ # Targets
+
++.cc.o:
++ $(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized -c $<
++
+ .PHONY: commands
+ commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
+ @$(MAKE) $(ALL_COMMANDS)
diff --git a/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild
index d47316d4ec34..67735cac08fa 100644
--- a/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild,v 1.5 2006/08/06 04:14:48 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild,v 1.6 2006/08/07 08:33:10 keri Exp $
inherit autotools eutils versionator
@@ -55,7 +55,7 @@ src_compile() {
src_install() {
exeinto /usr/bin
doexe src/qa src/qdeal src/qem src/ql
- doexe bin/qc bin/qecat bin/qp bin/qppp
+ doexe bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp bin/qppp
if use qt3 || use qt4; then
doexe src/xqp/xqp