* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
@ 2014-05-15 12:46 Michael Weber
0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2014-05-15 12:46 UTC (permalink / raw
To: gentoo-commits
commit: ea3d500ffb1a49fd6e097aa537e98222d09a38f2
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Thu May 15 12:32:45 2014 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu May 15 12:32:45 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=ea3d500f
Iniital import
Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090
---
dev-util/eclipse-cpl/ChangeLog | 9 +++
dev-util/eclipse-cpl/Manifest | 11 +++
dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 88 ++++++++++++++++++++++
.../files/eclipse-cpl-6.1.187-automagic-doc.patch | 23 ++++++
.../eclipse-cpl-6.1.187-disable-ecrc-solver.patch | 12 +++
...eclipse-cpl-6.1.187-disable-icparc-solver.patch | 10 +++
.../files/eclipse-cpl-6.1.187-includedir.patch | 11 +++
.../files/eclipse-cpl-6.1.187-shm-respect-ar.patch | 38 ++++++++++
dev-util/eclipse-cpl/metadata.xml | 8 ++
9 files changed, 210 insertions(+)
diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
new file mode 100644
index 0000000..f6e4860
--- /dev/null
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -0,0 +1,9 @@
+*eclipse-cpl-6.1.187 (15 May 2014)
+
+ 15 May 2014; Michael Weber <xmw@gentoo.org> +eclipse-cpl-6.1.187.ebuild,
+ +files/eclipse-cpl-6.1.187-automagic-doc.patch,
+ +files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch,
+ +files/eclipse-cpl-6.1.187-disable-icparc-solver.patch,
+ +files/eclipse-cpl-6.1.187-includedir.patch,
+ +files/eclipse-cpl-6.1.187-shm-respect-ar.patch, +metadata.xml:
+ Iniital import
diff --git a/dev-util/eclipse-cpl/Manifest b/dev-util/eclipse-cpl/Manifest
new file mode 100644
index 0000000..feafafd
--- /dev/null
+++ b/dev-util/eclipse-cpl/Manifest
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST eclipse-cpl-6.1.187.tar.gz 8624698 SHA256 cfddbdc4a45b6e8f8fbb1c0e36881264d2b68169d6fbaf55c09e9ddb66612a72 SHA512 ff14a81f7ae9b9ba0805016e856f01fdd9fa67edf0fe4a3048f375b82d1795f9ad52fd078da94da4ebf13aa269f5035dbbe15c119453949597942183e899152a WHIRLPOOL 5ae43380b0458814d94a9e7a5919d61ae1ad9cf12dbdf65f3c7c8b77f60498e3d5162d0f3a530992f6d4e1157b62b88420a54eda65d40562176ff6c5eff054c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlN0s+0ACgkQknrdDGLu8JC9HAD/QcUKnkzfUXYz7y2/FJTy82AF
+0U1TIIuGZpqmMM/3SxkA/3sw+qH+KUDf9mjCVyIgCYKaCH5so77sp7DwTH4N3RSh
+=mH9N
+-----END PGP SIGNATURE-----
diff --git a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
new file mode 100644
index 0000000..f6743d6
--- /dev/null
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic toolchain-funcs versionator
+
+DESCRIPTION="OSS system for the cost-effective development and deployment of constraint programming applications"
+HOMEPAGE="http://eclipseclp.org/"
+
+MY_PV=$(replace_version_separator 2 _ ${PV})
+SRC_URI="http://eclipseclp.org/Distribution/${MY_PV}/src/${PN/-cpl}_src.tgz -> ${P}.tar.gz"
+
+LICENSE="${pn} LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc tcl threads"
+
+RDEPEND=""
+DEPEND="doc? (
+ app-text/ghostscript-gpl
+ dev-tex/hevea
+ dev-texlive/texlive-latex
+ ) "
+
+S="${WORKDIR}/Eclipse_${MY_PV}"
+
+src_prepare() {
+ append-cflags -DUSE_INTERP_RESULT -fPIC
+ tc-export AR
+
+ epatch \
+ "${FILESDIR}"/${P}-automagic-doc.patch \
+ "${FILESDIR}"/${P}-includedir.patch \
+ "${FILESDIR}"/${P}-shm-respect-ar.patch
+
+ eautoreconf
+
+ #replace arch guessing script
+ rm ARCH || die
+ case "${ARCH}" in
+ amd64) export ARCH=x86_64_linux ;;
+ x86) export ARCH=i386_linux ;;
+ *) die "unsupported arch ${ARCH}" ;;
+ esac
+ mkdir build
+ echo -e '#!/bin/sh\necho $ARCH' > build/ARCH
+ chmod +x build/ARCH
+}
+
+src_configure() {
+ econf \
+ --with-gmp
+ --without-cplex \
+ --without-cpviz \
+ --without-flexlm \
+ --without-gfd \
+ --without-graphviz \
+ --without-gurobi \
+ --without-mysql \
+ --without-osi \
+ --without-xpress \
+ $(use_with threads pthreads) \
+ $(use_with doc) \
+ $(use_with tcl)
+}
+
+src_compile() {
+ emake -f Makefile.${ARCH} PREFIX="${S}/build"
+}
+
+src_install() {
+ local my_file
+ for my_file in "build/bin/${ARCH}/"* ; do
+ sed -e "s:${S}/build:${EROOT}opt/${PN}:g" \
+ -i "${my_file}" || die
+ done
+
+ rmdir build/tcltk{/x86_64_linux,}
+ use doc || rm -rf build/doc
+ dodir /opt
+ mv build "${ED}"opt/${PN}
+
+ for my_file in "${EROOT}opt/${PN}/bin/${ARCH}/"* ; do
+ make_wrapper "$(basename "${my_file}")" "${my_file}"
+ done
+}
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch
new file mode 100644
index 0000000..8549af6
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch
@@ -0,0 +1,23 @@
+--- Eclipse_6.1_187/configure.ac
++++ Eclipse_6.1_187/configure.ac
+@@ -1962,13 +1962,20 @@
+ AC_CHECK_PROG(PROG_PS2PDF,ps2pdf,yes,no)
+ AC_CHECK_PROG(PROG_HEVEA, hevea, yes,no)
+
++AC_ARG_WITH([doc], [[ --without-doc
++ Build ECLiPSe without documentation
++ ]],
++ [doc_requested="$withval"], [doc_requested=yes])
++
+ MAKE_DOCUMENTS=
++if test "$doc_requested" != "no"; then
+ if test "$PROG_LATEX" = yes -a "$PROG_PS2PDF" = yes -a "$PROG_HEVEA" = yes; then
+ MAKE_DOCUMENTS="make_documents"
+ AC_MSG_NOTICE([Can build ECLiPSe documentation])
+ else
+ AC_MSG_WARN([No tools to build ECLiPSe documentation])
+ fi
++fi
+
+
+ #----------------------------------------------------------------------
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch
new file mode 100644
index 0000000..41fdd4d
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch
@@ -0,0 +1,12 @@
+--- Eclipse_6.1_187/Makefile.in
++++ Eclipse_6.1_187/Makefile.in
+@@ -27,9 +27,7 @@
+ # (e.g. because they try to make .eco/.eci files and need to run eclipse,
+ # or requires the making of such a subsystem)
+ install_all: install_cross \
+- make_ecrc_solvers \
+ make_pt_libraries \
+- make_zincinterface \
+ make_compiler \
+ make_contrib \
+ make_mercury
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch
new file mode 100644
index 0000000..5e2c5bf
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch
@@ -0,0 +1,10 @@
+--- Eclipse_6.1_187/Makefile.in
++++ Eclipse_6.1_187/Makefile.in
+@@ -18,7 +18,6 @@
+ make_flexlm \
+ make_eplex \
+ make_gecodeinterface \
+- make_icparc_solvers \
+ make_javainterface \
+ make_visualisation \
+ make_oci \
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch
new file mode 100644
index 0000000..3fa08bd
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch
@@ -0,0 +1,11 @@
+--- Eclipse_6.1_187/icparc_solvers/Makefile.in
++++ Eclipse_6.1_187/icparc_solvers/Makefile.in
+@@ -47,7 +47,7 @@
+ GMP_LD = @GMP_LD@
+ FLOAT_ROUND_FLAGS = @FLOAT_ROUND_FLAGS@
+
+-CPPFLAGS = -I. -I$(ECLIPSEDIR)/include/$(ARCH) -I$(ECLIPSEDIR)/Kernel/src -I- $(OS_INCLUDES)
++CPPFLAGS = -I. -I$(ECLIPSEDIR)/include/$(ARCH) -I$(top_srcdir)/Kernel/src -iquote $(OS_INCLUDES)
+ STDCXXLIB = @STDCXXLIB@
+ ECLIBS = -L$(ECLIPSEDIR)/lib/$(ARCH) -leclipse @LIBS@
+
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch
new file mode 100644
index 0000000..16bacaf
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch
@@ -0,0 +1,38 @@
+--- Eclipse_6.1_187/Shm/src/Makefile.in
++++ Eclipse_6.1_187/Shm/src/Makefile.in
+@@ -33,7 +33,7 @@
+ RANLIB = @RANLIB@
+ LOCK = @LOCK@
+
+-AR = ar ruv
++AR = @AR@ ruv
+ RM = /bin/rm -f
+ CP = /bin/cp
+
+@@ -66,7 +66,7 @@
+
+
+ libshm.a: $(SHM_OBJ)
+- ar rcv libshm.a $(SHM_OBJ)
++ $(AR) libshm.a $(SHM_OBJ)
+ $(RANLIB) libshm.a
+
+ alloc.o: config.h memman.h
+--- Eclipse_6.1_187/Shm/src/configure.in
++++ Eclipse_6.1_187/Shm/src/configure.in
+@@ -35,6 +35,7 @@
+ #
+
+ AC_PROG_CC
++AC_PROG_AR
+ CFLAGS="-O"
+ LOCK=""
+
+@@ -199,6 +200,7 @@
+ AC_SUBST(LIB)
+ AC_SUBST(RANLIB)
+ AC_SUBST(ARCH)
++AC_SUBST(AR)
+ AC_SUBST(LOCK)
+ AC_SUBST(S_TO_O)
+
diff --git a/dev-util/eclipse-cpl/metadata.xml b/dev-util/eclipse-cpl/metadata.xml
new file mode 100644
index 0000000..5b80fb9
--- /dev/null
+++ b/dev-util/eclipse-cpl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
@ 2014-05-16 0:06 Michael Weber
0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2014-05-16 0:06 UTC (permalink / raw
To: gentoo-commits
commit: 89d0ddab14cd59329afcc56bb941dec6df2e846a
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Fri May 16 00:06:07 2014 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri May 16 00:06:07 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=89d0ddab
work in progress
Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090
---
dev-util/eclipse-cpl/ChangeLog | 8 ++
dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 144 +++++++++++++++------
dev-util/eclipse-cpl/files/README.gentoo | 1 +
.../eclipse-cpl-6.1.187-disable-ecrc-solver.patch | 12 --
...eclipse-cpl-6.1.187-disable-icparc-solver.patch | 10 --
.../files/eclipse-cpl-6.1.187-mysql.patch | 11 ++
.../files/eclipse-cpl-6.1.187-tcl8.6.patch | 35 +++++
dev-util/eclipse-cpl/metadata.xml | 3 +
8 files changed, 165 insertions(+), 59 deletions(-)
diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index 8b16acd..9fc9fa6 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,3 +1,11 @@
+ 16 May 2014; Michael Weber <xmw@gentoo.org> +files/README.gentoo,
+ +files/eclipse-cpl-6.1.187-mysql.patch,
+ +files/eclipse-cpl-6.1.187-tcl8.6.patch,
+ -files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch,
+ -files/eclipse-cpl-6.1.187-disable-icparc-solver.patch,
+ eclipse-cpl-6.1.187.ebuild, metadata.xml:
+ work in progress
+
15 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
second approach generating wrappers
diff --git a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
index 5e4e618..f5ab7a4 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
+inherit autotools eutils flag-o-matic readme.gentoo toolchain-funcs versionator
DESCRIPTION="OSS system for the cost-effective development and deployment of constraint programming applications"
HOMEPAGE="http://eclipseclp.org/"
@@ -15,71 +15,141 @@ SRC_URI="http://eclipseclp.org/Distribution/${MY_PV}/src/${PN/-cpl}_src.tgz -> $
LICENSE="${pn} LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="doc tcl threads"
+IUSE="doc gecode gmp java mysql tcl threads"
-RDEPEND=""
-DEPEND="doc? (
- app-text/ghostscript-gpl
+RDEPEND="dev-libs/gmp"
+DEPEND="${RDEPEND}
+ doc? ( app-text/ghostscript-gpl
dev-tex/hevea
- dev-texlive/texlive-latex
- ) "
+ dev-texlive/texlive-latex )
+ gecode? ( dev-libs/gecode )
+ mysql? ( virtual/mysql )
+ java? ( dev-java/batik dev-java/javahelp )"
-S="${WORKDIR}/Eclipse_${MY_PV}"
+S=${WORKDIR}/Eclipse_${MY_PV}
-src_prepare() {
- append-cflags -DUSE_INTERP_RESULT -fPIC
- tc-export AR
+pkg_setup() {
+ use gecode && ewarn gecode does not work yet
+ use doc && ewarn doc does not work yet
+}
+src_prepare() {
epatch \
"${FILESDIR}"/${P}-automagic-doc.patch \
- "${FILESDIR}"/${P}-includedir.patch \
- "${FILESDIR}"/${P}-shm-respect-ar.patch
+ "${FILESDIR}"/${P}-mysql.patch \
+ "${FILESDIR}"/${P}-shm-respect-ar.patch \
+ "${FILESDIR}"/${P}-tcl8.6.patch
- eautoreconf
+ append-cflags -DUSE_INTERP_RESULT
+ rm ARCH RUNME || die
- #replace arch guessing script
- rm ARCH || die
case "${ARCH}" in
amd64) export ARCH=x86_64_linux ;;
x86) export ARCH=i386_linux ;;
*) die "unsupported arch ${ARCH}" ;;
esac
- mkdir build
- echo -e '#!/bin/sh\necho $ARCH' > build/ARCH
- chmod +x build/ARCH
+ export ECLIPSEDIR=${EROOT}opt/${PN}
+
+ eautoreconf
}
src_configure() {
- econf \
- --with-gmp
+ MYSQLDIR="${EROOT}usr/include/mysql" econf \
+ $(use_with gmp) \
--without-cplex \
- --without-cpviz \
- --without-flexlm \
- --without-gfd \
+ --with-osi \
+ --with-flexlm \
+ $(use_with gecode gfd) \
--without-graphviz \
--without-gurobi \
- --without-mysql \
- --without-osi \
+ $(use_with mysql) \
--without-xpress \
+ $(use_with java) \
+ $(use_with java cpviz) \
$(use_with threads pthreads) \
$(use_with doc) \
$(use_with tcl)
}
src_compile() {
- emake -f Makefile.${ARCH} PREFIX="${S}/build" -j1
+ mkdir -p "${S}/build/bin/${ARCH}"
+
+ #replace toplevel Makefile.${ARCH}, -j1 bug etc.
+ rm -fv Makefile.${ARCH} || die
+ einfo "compile & install Shm"
+ emake -C Shm/${ARCH} AR="$(tc-getAR) ruv" PREFIX="${S}/build" install
+ einfo "compile & install Kernel"
+ emake -C Kernel/${ARCH} sepia
+ emake -C Kernel/${ARCH} PREFIX="${S}/build" install
+ einfo "install legal files"
+ cp -pr legal "${S}/build" || die
+
+ runme() {
+ einfo "create wrapper $1"
+ cat << EOF > "build/bin/${ARCH}/$1"
+#!/bin/sh
+export ECLIPSEDIR="\${ECLIPSEDIR:-${EROOT}opt/${PN}}"
+if [ -z "\${LD_LIBRARY_PATH}" ] ; then
+ export LD_LIBRARY_PATH="\${ECLIPSEDIR}/lib/${ARCH}"
+else
+ export LD_LIBRARY_PATH="\${ECLIPSEDIR}/lib/${ARCH}:\${LD_LIBRARY_PATH}"
+fi
+export JRE_HOME="\${JRE_HOME:-\${JAVA_HOME}}"
+$2
+EOF
+ chmod +x "build/bin/${ARCH}/$1"
+ }
+ runme "eclipse" "exec \"\${ECLIPSEDIR}/lib/x86_64_linux/eclipse.exe\" \"\$@\""
+
+ if use tcl ; then
+ einfo "install lib_tcl"
+ cp -pr lib_tcl "build" || die
+
+ runme "tkeclipse" "exec wish \"\${ECLIPSEDIR}/lib_tcl/tkeclipse.tcl\" -- \"\$@\""
+ runme "tktools" "exec wish \"\${ECLIPSEDIR}/lib_tcl/tktools.tcl\" -- \"\$@\""
+ fi
+ einfo "compile & install Flexlm"
+ emake -C Flexlm -f Makefile.${ARCH} PREFIX="${S}/build" install
+ #einfo "install Eplex"
+ #emake -C Eplex -f Makefile.${ARCH} PREFIX="${my_ED}" install_eplex -j1
+ if use mysql ; then
+ einfo "compile & install Oci"
+ emake -C Oci -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
+ fi
+
+ if use gecode ; then
+ einfo "compile & install GecodeInterface"
+ emake -C GecodeInterface -f Makefile.${ARCH} AR="$(tc-getAR)" PREFIX="${S}/build" install
+ fi
+ if use java ; then
+ einfo "compile & install JavaInterface"
+ # installs documentation and examples
+ emake -C JavaInterface -f Makefile.${ARCH} PREFIX="${S}/build" install
+ runme "jeclipse" "exec \"\${JRE_HOME}/bin/java\" -Xss2m -Declipse.directory=\"\${ECLIPSEDIR}\" -classpath \"\${ECLIPSEDIR}/lib/eclipse.jar\" com.parctechnologies.eclipse.JEclipse \"\$@\""
+
+ einfo "compile & install Visualisation"
+ # installs documentation and examples
+ emake -C Visualisation -f Makefile.${ARCH} PREFIX="${S}/build" install
+ fi
}
src_install() {
- local my_file
- for my_file in "build/bin/${ARCH}/"* ; do
- sed -e "s:${S}/build:${EROOT}opt/${PN}:g" \
- -i "${my_file}" || die
- make_wrapper "$(basename "${my_file}")" "${EROOT}opt/${PN}/bin/${ARCH}/$(basename "${my_file}")"
- done
-
- rmdir build/tcltk{/x86_64_linux,}
- use doc || rm -rf build/doc
dodir /opt
- mv build "${ED}"opt/${PN}
+ mv "${S}/build" "${ED}opt/${PN}" || die
+
+ local my_file
+ make_wrapper eclipse "${EROOT}opt/${PN}/bin/${ARCH}/eclipse"
+ if use tcl ; then
+ make_wrapper tkeclipse "${EROOT}opt/${PN}/bin/${ARCH}/tkeclipse"
+ make_wrapper tktools "${EROOT}opt/${PN}/bin/${ARCH}/tktools"
+ fi
+ if use java ; then
+ make_wrapper jeclipse "${EROOT}opt/${PN}/bin/${ARCH}/jeclipse"
+ fi
+
+ echo "ECLIPSEDIR=\"${EROOT}opt/${PN}\"" > "${TMP}"/90${PN}
+ doenvd "${TMP}"/90${PN}
+
+ dodoc README_UNIX
+ readme.gentoo_create_doc
}
diff --git a/dev-util/eclipse-cpl/files/README.gentoo b/dev-util/eclipse-cpl/files/README.gentoo
new file mode 100644
index 0000000..97ca535
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/README.gentoo
@@ -0,0 +1 @@
+Please reload your environment to ensure a correct ECLIPSEDIR variable.
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch
deleted file mode 100644
index 41fdd4d..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Eclipse_6.1_187/Makefile.in
-+++ Eclipse_6.1_187/Makefile.in
-@@ -27,9 +27,7 @@
- # (e.g. because they try to make .eco/.eci files and need to run eclipse,
- # or requires the making of such a subsystem)
- install_all: install_cross \
-- make_ecrc_solvers \
- make_pt_libraries \
-- make_zincinterface \
- make_compiler \
- make_contrib \
- make_mercury
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch
deleted file mode 100644
index 5e2c5bf..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Eclipse_6.1_187/Makefile.in
-+++ Eclipse_6.1_187/Makefile.in
-@@ -18,7 +18,6 @@
- make_flexlm \
- make_eplex \
- make_gecodeinterface \
-- make_icparc_solvers \
- make_javainterface \
- make_visualisation \
- make_oci \
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-mysql.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-mysql.patch
new file mode 100644
index 0000000..7aa1c17
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-mysql.patch
@@ -0,0 +1,11 @@
+--- Eclipse_6.1_187/configure.ac
++++ Eclipse_6.1_187/configure.ac
+@@ -1908,7 +1908,7 @@
+ mysql_versions_requested="55 54 53 52 51 50"
+ fi
+ for version in $mysql_versions_requested; do
+- MYSQLDIR="$ECLIPSETHIRDPARTY/mysql$version/$ARCH"
++ MYSQLDIR=${MYSQLDIR:-"$ECLIPSETHIRDPARTY/mysql$version/$ARCH"}
+ if test -d "$MYSQLDIR"; then
+ ALL_WITH_MYSQL=all_with_mysql
+ ALL_CROSS_WITH_MYSQL=all_cross_with_mysql
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch
new file mode 100644
index 0000000..6a02660
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch
@@ -0,0 +1,35 @@
+--- Eclipse_6.1_187/RUNME
++++ Eclipse_6.1_187/RUNME
+@@ -124,7 +124,7 @@
+ }
+
+
+-TCL_REQUIRED="8.5 8.4 8.3"
++TCL_REQUIRED="8.6 8.5 8.4 8.3"
+
+ usable_tcl() {
+ [ -x "$TCL_WISH" -a \
+@@ -227,10 +227,10 @@
+
+ case $ARCH in
+ *_macosx)
+- ask "What is the version number of your Tcl/Tk installation (8.X) \n[Note that 8.5 prior to 8.5.7 was broken for ECLiPSe]" TCL_VERSION "8.3 8.4 8.5"
++ ask "What is the version number of your Tcl/Tk installation (8.X) \n[Note that 8.5 prior to 8.5.7 was broken for ECLiPSe]" TCL_VERSION "8.3 8.4 8.5 8.6"
+ ;;
+ *)
+- ask "What is the version number of your Tcl/Tk installation (8.X)" TCL_VERSION "8.3 8.4 8.5"
++ ask "What is the version number of your Tcl/Tk installation (8.X)" TCL_VERSION "8.3 8.4 8.5 8.6"
+ ;;
+ esac
+
+--- Eclipse_6.1_187/configure.ac
++++ Eclipse_6.1_187/configure.ac
+@@ -1296,7 +1296,7 @@
+
+ if test "$tcl_requested" = "yes"; then
+
+- TCL_REQUIRED="8.5 8.4 8.3"
++ TCL_REQUIRED="8.6 8.5 8.4 8.3"
+
+ if test "$OSCLASS" != "win" ; then
+ dnl find X includes and libraries
diff --git a/dev-util/eclipse-cpl/metadata.xml b/dev-util/eclipse-cpl/metadata.xml
index 5b80fb9..71da1de 100644
--- a/dev-util/eclipse-cpl/metadata.xml
+++ b/dev-util/eclipse-cpl/metadata.xml
@@ -5,4 +5,7 @@
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
+<use>
+<flag name="gecode">Bindings for dev-libs/gecode</flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
@ 2014-05-18 8:10 Michael Weber
0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2014-05-18 8:10 UTC (permalink / raw
To: gentoo-commits
commit: f5efa292ef11c9442cbca075a17bde92994e8fbf
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Sun May 18 08:09:49 2014 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun May 18 08:09:49 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=f5efa292
work in progress
Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090
---
dev-util/eclipse-cpl/ChangeLog | 11 ++
dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 82 ++++++++++-----
.../eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch | 31 ++++++
.../files/eclipse-cpl-6.1.187-Eplex-include.patch | 10 ++
.../files/eclipse-cpl-6.1.187-automagic-doc.patch | 23 -----
.../files/eclipse-cpl-6.1.187-configure-osi.patch | 113 +++++++++++++++++++++
...ch => eclipse-cpl-6.1.187-icparc_solvers.patch} | 2 +-
.../files/eclipse-cpl-6.1.187-shm-respect-ar.patch | 38 -------
dev-util/eclipse-cpl/metadata.xml | 2 +
9 files changed, 226 insertions(+), 86 deletions(-)
diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index 9fc9fa6..e06bd28 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,3 +1,14 @@
+ 18 May 2014; Michael Weber <xmw@gentoo.org>
+ +files/eclipse-cpl-6.1.187-AR.patch,
+ +files/eclipse-cpl-6.1.187-Eplex-include.patch,
+ +files/eclipse-cpl-6.1.187-configure-osi.patch,
+ +files/eclipse-cpl-6.1.187-icparc_solvers.patch,
+ -files/eclipse-cpl-6.1.187-automagic-doc.patch,
+ -files/eclipse-cpl-6.1.187-includedir.patch,
+ -files/eclipse-cpl-6.1.187-shm-respect-ar.patch, eclipse-cpl-6.1.187.ebuild,
+ metadata.xml:
+ work in progress
+
16 May 2014; Michael Weber <xmw@gentoo.org> +files/README.gentoo,
+files/eclipse-cpl-6.1.187-mysql.patch,
+files/eclipse-cpl-6.1.187-tcl8.6.patch,
diff --git a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
index f5ab7a4..66c81e1 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit autotools eutils flag-o-matic readme.gentoo toolchain-funcs versionator
+inherit autotools eutils flag-o-matic readme.gentoo versionator
DESCRIPTION="OSS system for the cost-effective development and deployment of constraint programming applications"
HOMEPAGE="http://eclipseclp.org/"
@@ -15,30 +15,47 @@ SRC_URI="http://eclipseclp.org/Distribution/${MY_PV}/src/${PN/-cpl}_src.tgz -> $
LICENSE="${pn} LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="doc gecode gmp java mysql tcl threads"
+IUSE="doc +coin +gecode +glpk +gmp +java +mysql +tcl +threads"
-RDEPEND="dev-libs/gmp"
+RDEPEND=""
DEPEND="${RDEPEND}
+ gmp? ( dev-libs/gmp )
doc? ( app-text/ghostscript-gpl
- dev-tex/hevea
- dev-texlive/texlive-latex )
+ dev-tex/hevea
+ dev-texlive/texlive-latex )
gecode? ( dev-libs/gecode )
mysql? ( virtual/mysql )
- java? ( dev-java/batik dev-java/javahelp )"
+ java? ( dev-java/batik dev-java/javahelp )
+ coin? ( sci-libs/coinor-cbc[examples]
+ sci-libs/coinor-osi[glpk?]
+ sci-libs/coinor-symphony[glpk?]
+ glpk? ( <sci-mathematics/glpk-4.54 ) )"
S=${WORKDIR}/Eclipse_${MY_PV}
+REQUIRED_USE="coin? ( gmp ) glpk? ( coin )"
+
pkg_setup() {
use gecode && ewarn gecode does not work yet
use doc && ewarn doc does not work yet
}
+src_unpack() {
+ default
+ local my_cbc=$(best_version sci-libs/coinor-cbc)
+ cp "${EROOT}"usr/share/doc/${my_cbc/sci-libs\//}/examples/Cbc{Branch,Compare}User.{c,h}pp.* . || die
+ unpack ./Cbc{Branch,Compare}User.{c,h}pp.*
+ mv Cbc{Branch,Compare}User.{c,h}pp "${S}"/Eplex || die
+}
+
src_prepare() {
epatch \
- "${FILESDIR}"/${P}-automagic-doc.patch \
"${FILESDIR}"/${P}-mysql.patch \
- "${FILESDIR}"/${P}-shm-respect-ar.patch \
- "${FILESDIR}"/${P}-tcl8.6.patch
+ "${FILESDIR}"/${P}-tcl8.6.patch \
+ "${FILESDIR}"/${P}-configure-osi.patch \
+ "${FILESDIR}"/${P}-AR.patch \
+ "${FILESDIR}"/${P}-Eplex-include.patch \
+ "${FILESDIR}"/${P}-icparc_solvers.patch
append-cflags -DUSE_INTERP_RESULT
rm ARCH RUNME || die
@@ -49,21 +66,30 @@ src_prepare() {
*) die "unsupported arch ${ARCH}" ;;
esac
export ECLIPSEDIR=${EROOT}opt/${PN}
-
+ export MYSQLDIR="${EROOT}usr/include/mysql"
+ export prefix="${S}/build"
eautoreconf
}
src_configure() {
- MYSQLDIR="${EROOT}usr/include/mysql" econf \
- $(use_with gmp) \
+ local my_osi="--without-osi"
+ if use coin ; then
+ if use glpk ; then
+ my_osi="--with-osi=clpcbc symclp glpk"
+ else
+ my_osi="--with-osi=clpcbc symclp"
+ fi
+ fi
+ econf \
--without-cplex \
- --with-osi \
+ --without-xpress \
+ $(use_with gmp) \
+ "${my_osi}" \
--with-flexlm \
$(use_with gecode gfd) \
--without-graphviz \
--without-gurobi \
$(use_with mysql) \
- --without-xpress \
$(use_with java) \
$(use_with java cpviz) \
$(use_with threads pthreads) \
@@ -77,7 +103,7 @@ src_compile() {
#replace toplevel Makefile.${ARCH}, -j1 bug etc.
rm -fv Makefile.${ARCH} || die
einfo "compile & install Shm"
- emake -C Shm/${ARCH} AR="$(tc-getAR) ruv" PREFIX="${S}/build" install
+ emake -C Shm/${ARCH} PREFIX="${S}/build" install
einfo "compile & install Kernel"
emake -C Kernel/${ARCH} sepia
emake -C Kernel/${ARCH} PREFIX="${S}/build" install
@@ -108,29 +134,37 @@ EOF
runme "tkeclipse" "exec wish \"\${ECLIPSEDIR}/lib_tcl/tkeclipse.tcl\" -- \"\$@\""
runme "tktools" "exec wish \"\${ECLIPSEDIR}/lib_tcl/tktools.tcl\" -- \"\$@\""
fi
+
+ #einfo "compile & install ecrc_solvers"
+ #emake -C ecrc_solvers -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
+
einfo "compile & install Flexlm"
emake -C Flexlm -f Makefile.${ARCH} PREFIX="${S}/build" install
- #einfo "install Eplex"
- #emake -C Eplex -f Makefile.${ARCH} PREFIX="${my_ED}" install_eplex -j1
- if use mysql ; then
- einfo "compile & install Oci"
- emake -C Oci -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
- fi
+ if use coin ; then
+ einfo "compile & install Eplex"
+ emake -C Eplex -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
+
+ einfo "compile & install icparc_solvers"
+ emake -C icparc_solvers -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
+ fi
if use gecode ; then
einfo "compile & install GecodeInterface"
- emake -C GecodeInterface -f Makefile.${ARCH} AR="$(tc-getAR)" PREFIX="${S}/build" install
+ emake -C GecodeInterface -f Makefile.${ARCH} PREFIX="${S}/build" install
fi
if use java ; then
einfo "compile & install JavaInterface"
- # installs documentation and examples
emake -C JavaInterface -f Makefile.${ARCH} PREFIX="${S}/build" install
runme "jeclipse" "exec \"\${JRE_HOME}/bin/java\" -Xss2m -Declipse.directory=\"\${ECLIPSEDIR}\" -classpath \"\${ECLIPSEDIR}/lib/eclipse.jar\" com.parctechnologies.eclipse.JEclipse \"\$@\""
einfo "compile & install Visualisation"
- # installs documentation and examples
emake -C Visualisation -f Makefile.${ARCH} PREFIX="${S}/build" install
fi
+
+ if use mysql ; then
+ einfo "compile & install Oci"
+ emake -C Oci -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
+ fi
}
src_install() {
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch
new file mode 100644
index 0000000..b4784da
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch
@@ -0,0 +1,31 @@
+--- Eclipse_6.1_187/configure.ac
++++ Eclipse_6.1_187/configure.ac
+@@ -750,7 +750,7 @@
+ AC_PROG_CXX
+ AC_PROG_CXXCPP
+ AC_PROG_AWK
+-AC_PATH_PROG(AR,ar,ar,[$PATH:/usr/ccs/bin])
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_LN_S
+ AC_CHECK_PROG(SED,sed,sed,false)
+--- Eclipse_6.1_187/Shm/src/Makefile.in
++++ Eclipse_6.1_187/Shm/src/Makefile.in
+@@ -33,7 +33,7 @@
+ RANLIB = @RANLIB@
+ LOCK = @LOCK@
+
+-AR = ar ruv
++AR = @AR@
+ RM = /bin/rm -f
+ CP = /bin/cp
+
+@@ -66,7 +66,7 @@
+
+
+ libshm.a: $(SHM_OBJ)
+- ar rcv libshm.a $(SHM_OBJ)
++ $(AR) rcv libshm.a $(SHM_OBJ)
+ $(RANLIB) libshm.a
+
+ alloc.o: config.h memman.h
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-include.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-include.patch
new file mode 100644
index 0000000..9ad1520
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-include.patch
@@ -0,0 +1,10 @@
+--- Eclipse_6.1_187/Eplex/coinplex.cpp
++++ Eclipse_6.1_187/Eplex/coinplex.cpp
+@@ -139,6 +139,7 @@
+ #include <stdio.h>
+ #include <exception>
+ #include <string>
++#include <cmath>
+ using std::string;
+ using namespace std;
+
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch
deleted file mode 100644
index 8549af6..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Eclipse_6.1_187/configure.ac
-+++ Eclipse_6.1_187/configure.ac
-@@ -1962,13 +1962,20 @@
- AC_CHECK_PROG(PROG_PS2PDF,ps2pdf,yes,no)
- AC_CHECK_PROG(PROG_HEVEA, hevea, yes,no)
-
-+AC_ARG_WITH([doc], [[ --without-doc
-+ Build ECLiPSe without documentation
-+ ]],
-+ [doc_requested="$withval"], [doc_requested=yes])
-+
- MAKE_DOCUMENTS=
-+if test "$doc_requested" != "no"; then
- if test "$PROG_LATEX" = yes -a "$PROG_PS2PDF" = yes -a "$PROG_HEVEA" = yes; then
- MAKE_DOCUMENTS="make_documents"
- AC_MSG_NOTICE([Can build ECLiPSe documentation])
- else
- AC_MSG_WARN([No tools to build ECLiPSe documentation])
- fi
-+fi
-
-
- #----------------------------------------------------------------------
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-configure-osi.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-configure-osi.patch
new file mode 100644
index 0000000..9d20a0b
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-configure-osi.patch
@@ -0,0 +1,113 @@
+--- Eclipse_6.1_187/configure.ac
++++ Eclipse_6.1_187/configure.ac
+@@ -1494,7 +1494,7 @@
+
+ AC_ARG_WITH([osi], [[ --with-osi[=versions]
+ Build ECLiPSe interface to COIN-OR Osi. You can
+- optionally specify a version list, e.g. "clpcbc symclp".
++ optionally specify a version list, e.g. "clpcbc symclp glpk".
+ Default is to build all available versions.
+ ]],
+ [osi_versions_requested="$withval"], [osi_versions_requested=yes])
+@@ -1504,34 +1504,22 @@
+ OSICLP_ADDDEF=""
+ if test "$osi_versions_requested" != "no"; then
+ if test "$osi_versions_requested" = "yes"; then
+- osi_versions_requested="clpcbc symclp"
++ osi_versions_requested="clpcbc symclp glpk"
+ fi
++ OSI_VERSIONS=
++ PKG_CHECK_MODULES(OSI, [osi])
+ for version in $osi_versions_requested; do
+- found_osi_version=
+- dnl For backward compatibility, allow ${version}amd as well
+- OSIDIRS="$OSIBASEDIR${version}amd $OSIBASEDIR$version"
+- for OSIDIR in $OSIDIRS; do
+- if test -d "$OSIDIR/$ARCH/lib"; then
+- found_osi_version=yes
+- OSI_VERSIONS="$OSI_VERSIONS $version"
+- AC_MSG_NOTICE([Using OSI $version in $OSIDIR])
+- case $version in
+- clpcbc) CLPCBCDIR="$OSIDIR" ;;
+- symclp) SYMCLPDIR="$OSIDIR" ;;
+- glpk) OSIGLPKDIR="$OSIDIR" ;;
+- esac
+- ls -d $OSIDIR/$ARCH/lib/*amd* >/dev/null 2>/dev/null
+- if test $? -eq 0; then
+- AC_MSG_NOTICE([Found AMD support for $version])
+- OSICLP_ADDLIB="-lamd"
+- OSICLP_ADDDEF="-DUFL_BARRIER"
+- fi
+- break
+- fi
+- done
+- if test -z "$found_osi_version"; then
+- AC_MSG_WARN([Could not find $ARCH support for $version in $OSIDIRS])
+- fi
++ case $version in
++ clpcbc)
++ PKG_CHECK_MODULES(CLPCBC, [osi-cbc], [CLPCBCDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
++ ;;
++ symclp)
++ PKG_CHECK_MODULES(SYMCLP, [osi-sym], [SYMCLPDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
++ ;;
++ glpk)
++ PKG_CHECK_MODULES(OSIGLPK, [osi-glpk], [OSIGLPKDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
++ ;;
++ esac
+ done
+ fi
+ if test -n "$OSI_VERSIONS"; then
+--- Eclipse_6.1_187/Eplex/Makefile.in
++++ Eclipse_6.1_187/Eplex/Makefile.in
+@@ -96,34 +96,34 @@
+ SYMCLPDIR = @SYMCLPDIR@
+ OSIGLPKDIR = @OSIGLPKDIR@
+
+-CLPCBCARCHDIR = $(CLPCBCDIR)/$(ARCH)
+-SYMCLPARCHDIR = $(SYMCLPDIR)/$(ARCH)
+-OSIGLPKARCHDIR = $(OSIGLPKDIR)/$(ARCH)
+-
+-COINOSILIBS = -lOsi -lCoinUtils
+-COINCLPLIBS = -lOsiClp -lCgl -lClp
+-COINCBCLIBS = -lCbcSolver -lCbc
++CLPCBC_CFLAGS = @CLPCBC_CFLAGS@
++SYMCLP_CFLAGS = @SYMCLP_CFLAGS@
++OSIGLPK_CFLAGS = @OSIGLPK_CFLAGS@
++
++CLPCBC_LIBS = @CLPCBC_LIBS@
++SYMCLP_LIBS = @SYMCLP_LIBS@
++OSIGLPK_LIBS = @OSIGLPK_LIBS@
+
+ $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h coinplex_params.h
+- $(CXX) -DCOIN -DCOIN_USE_CLP @OSICLP_ADDDEF@ $(CPPFLAGS) $(CFLAGS) -I$(CLPCBCARCHDIR)/include -c coinplex.cpp
++ $(CXX) -DCOIN -DCOIN_USE_CLP @OSICLP_ADDDEF@ $(CPPFLAGS) $(CFLAGS) $(CLPCBC_CFLAGS) -c coinplex.cpp
+ $(CC) -DCOIN -DCOIN_USE_CLP -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
+- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(CLPCBCARCHDIR)/lib/CbcBranchUser.o $(CLPCBCARCHDIR)/lib/CbcCompareUser.o -L$(CLPCBCARCHDIR)/lib $(COINCBCLIBS) $(COINCLPLIBS) @OSICLP_ADDLIB@ $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiclpcbc.$(OBJ_SUFFIX)
++ $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(CLPCBC_LIBS) @OSICLP_ADDLIB@ $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiclpcbc.$(OBJ_SUFFIX)
+ [ -d $(ARCH) ] || mkdir $(ARCH)
+- mv seosiclpcbc.$(OBJ_SUFFIX) $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX)
++ cp seosiclpcbc.$(OBJ_SUFFIX) $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX)
+
+ $(ARCH)/seosisymclp.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
+- $(CXX) -DCOIN -DCOIN_USE_SYM $(CPPFLAGS) $(CFLAGS) -I$(SYMCLPARCHDIR)/include -c coinplex.cpp
++ $(CXX) -DCOIN -DCOIN_USE_SYM $(CPPFLAGS) $(CFLAGS) $(SYMCLP_CFLAGS) -c coinplex.cpp
+ $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
+- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o -L$(SYMCLPARCHDIR)/lib -lOsiSym -lSym $(COINCLPLIBS) $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosisymclp.$(OBJ_SUFFIX)
++ $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(SYMCLP_LIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosisymclp.$(OBJ_SUFFIX)
+ [ -d $(ARCH) ] || mkdir $(ARCH)
+- mv seosisymclp.$(OBJ_SUFFIX) $(ARCH)/seosisymclp.$(OBJ_SUFFIX)
++ cp seosisymclp.$(OBJ_SUFFIX) $(ARCH)/seosisymclp.$(OBJ_SUFFIX)
+
+ $(ARCH)/seosiglpk.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
+- $(CXX) -DCOIN -DCOIN_USE_GLPK $(CPPFLAGS) $(CFLAGS) -I$(OSIGLPKARCHDIR)/include -c coinplex.cpp
++ $(CXX) -DCOIN -DCOIN_USE_GLPK $(CPPFLAGS) $(CFLAGS) $(OSIGLPK_CFLAGS) -c coinplex.cpp
+ $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
+- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o -L$(OSIGLPKARCHDIR)/lib -lOsiGlpk -lglpk $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiglpk.$(OBJ_SUFFIX)
++ $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(OSIGLPK_LIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiglpk.$(OBJ_SUFFIX)
+ [ -d $(ARCH) ] || mkdir $(ARCH)
+- mv seosiglpk.$(OBJ_SUFFIX) $(ARCH)/seosiglpk.$(OBJ_SUFFIX)
++ cp seosiglpk.$(OBJ_SUFFIX) $(ARCH)/seosiglpk.$(OBJ_SUFFIX)
+
+ #----------------------------------------------------------------------
+ # EPLEX/CPLEX
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch
similarity index 76%
rename from dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch
rename to dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch
index 3fa08bd..561c35d 100644
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch
@@ -5,7 +5,7 @@
FLOAT_ROUND_FLAGS = @FLOAT_ROUND_FLAGS@
-CPPFLAGS = -I. -I$(ECLIPSEDIR)/include/$(ARCH) -I$(ECLIPSEDIR)/Kernel/src -I- $(OS_INCLUDES)
-+CPPFLAGS = -I. -I$(ECLIPSEDIR)/include/$(ARCH) -I$(top_srcdir)/Kernel/src -iquote $(OS_INCLUDES)
++CPPFLAGS = -fPIC -I. -I$(ECLIPSEDIR)/include/$(ARCH) -I$(top_srcdir)/Kernel/src -iquote $(OS_INCLUDES)
STDCXXLIB = @STDCXXLIB@
ECLIBS = -L$(ECLIPSEDIR)/lib/$(ARCH) -leclipse @LIBS@
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch
deleted file mode 100644
index 16bacaf..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Eclipse_6.1_187/Shm/src/Makefile.in
-+++ Eclipse_6.1_187/Shm/src/Makefile.in
-@@ -33,7 +33,7 @@
- RANLIB = @RANLIB@
- LOCK = @LOCK@
-
--AR = ar ruv
-+AR = @AR@ ruv
- RM = /bin/rm -f
- CP = /bin/cp
-
-@@ -66,7 +66,7 @@
-
-
- libshm.a: $(SHM_OBJ)
-- ar rcv libshm.a $(SHM_OBJ)
-+ $(AR) libshm.a $(SHM_OBJ)
- $(RANLIB) libshm.a
-
- alloc.o: config.h memman.h
---- Eclipse_6.1_187/Shm/src/configure.in
-+++ Eclipse_6.1_187/Shm/src/configure.in
-@@ -35,6 +35,7 @@
- #
-
- AC_PROG_CC
-+AC_PROG_AR
- CFLAGS="-O"
- LOCK=""
-
-@@ -199,6 +200,7 @@
- AC_SUBST(LIB)
- AC_SUBST(RANLIB)
- AC_SUBST(ARCH)
-+AC_SUBST(AR)
- AC_SUBST(LOCK)
- AC_SUBST(S_TO_O)
-
diff --git a/dev-util/eclipse-cpl/metadata.xml b/dev-util/eclipse-cpl/metadata.xml
index 71da1de..2673404 100644
--- a/dev-util/eclipse-cpl/metadata.xml
+++ b/dev-util/eclipse-cpl/metadata.xml
@@ -7,5 +7,7 @@
</maintainer>
<use>
<flag name="gecode">Bindings for dev-libs/gecode</flag>
+<flag name="coin">Bindings for COIN-OR Open Solver Interface</flag>
+<flag name="glpk">Bindings for COIN-OR OSI Gnu Linear Programming Kit</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
@ 2014-05-18 21:25 Michael Weber
0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2014-05-18 21:25 UTC (permalink / raw
To: gentoo-commits
commit: ef0c892d474a21d1245ab3fb603f06100106c47b
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Sun May 18 21:25:15 2014 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun May 18 21:25:15 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=ef0c892d
parallel fooo
Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090
---
dev-util/eclipse-cpl/ChangeLog | 8 +
dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 10 +-
.../files/eclipse-cpl-6.1.187-Eplex-Makefile.patch | 196 +++++++++++++++++++++
.../files/eclipse-cpl-6.1.187-Oci-mkdir.patch | 21 +++
.../files/eclipse-cpl-6.1.187-configure-osi.patch | 113 ------------
.../files/eclipse-cpl-6.1.187-icparc_solvers.patch | 100 +++++++++++
.../files/eclipse-cpl-6.1.187-tcl8.6.patch | 11 ++
7 files changed, 341 insertions(+), 118 deletions(-)
diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index 797904e..e46844c 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,3 +1,11 @@
+ 18 May 2014; Michael Weber <xmw@gentoo.org>
+ +files/eclipse-cpl-6.1.187-Eplex-Makefile.patch,
+ +files/eclipse-cpl-6.1.187-Oci-mkdir.patch,
+ -files/eclipse-cpl-6.1.187-configure-osi.patch, eclipse-cpl-6.1.187.ebuild,
+ files/eclipse-cpl-6.1.187-icparc_solvers.patch,
+ files/eclipse-cpl-6.1.187-tcl8.6.patch:
+ parallel fooo
+
18 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
building version
diff --git a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
index b2a0b49..a44e7c1 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit autotools eutils flag-o-matic readme.gentoo versionator
+inherit autotools eutils readme.gentoo versionator
DESCRIPTION="OSS system for the cost-effective development and deployment of constraint programming applications"
HOMEPAGE="http://eclipseclp.org/"
@@ -52,12 +52,12 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-mysql.patch \
"${FILESDIR}"/${P}-tcl8.6.patch \
- "${FILESDIR}"/${P}-configure-osi.patch \
+ "${FILESDIR}"/${P}-Eplex-Makefile.patch \
"${FILESDIR}"/${P}-AR.patch \
"${FILESDIR}"/${P}-Eplex-include.patch \
- "${FILESDIR}"/${P}-icparc_solvers.patch
+ "${FILESDIR}"/${P}-icparc_solvers.patch \
+ "${FILESDIR}"/${P}-Oci-mkdir.patch
- append-cflags -DUSE_INTERP_RESULT
rm ARCH RUNME || die
case "${ARCH}" in
@@ -146,7 +146,7 @@ EOF
emake -C Eplex -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
einfo "compile & install icparc_solvers"
- emake -C icparc_solvers -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
+ emake -C icparc_solvers -f Makefile.${ARCH} PREFIX="${S}/build" install
fi
if use gecode ; then
einfo "compile & install GecodeInterface"
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-Makefile.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-Makefile.patch
new file mode 100644
index 0000000..f069c70
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-Makefile.patch
@@ -0,0 +1,196 @@
+--- Eclipse_6.1_187/configure.ac
++++ Eclipse_6.1_187/configure.ac
+@@ -1494,7 +1494,7 @@
+
+ AC_ARG_WITH([osi], [[ --with-osi[=versions]
+ Build ECLiPSe interface to COIN-OR Osi. You can
+- optionally specify a version list, e.g. "clpcbc symclp".
++ optionally specify a version list, e.g. "clpcbc symclp glpk".
+ Default is to build all available versions.
+ ]],
+ [osi_versions_requested="$withval"], [osi_versions_requested=yes])
+@@ -1504,34 +1504,22 @@
+ OSICLP_ADDDEF=""
+ if test "$osi_versions_requested" != "no"; then
+ if test "$osi_versions_requested" = "yes"; then
+- osi_versions_requested="clpcbc symclp"
++ osi_versions_requested="clpcbc symclp glpk"
+ fi
++ OSI_VERSIONS=
++ PKG_CHECK_MODULES(OSI, [osi])
+ for version in $osi_versions_requested; do
+- found_osi_version=
+- dnl For backward compatibility, allow ${version}amd as well
+- OSIDIRS="$OSIBASEDIR${version}amd $OSIBASEDIR$version"
+- for OSIDIR in $OSIDIRS; do
+- if test -d "$OSIDIR/$ARCH/lib"; then
+- found_osi_version=yes
+- OSI_VERSIONS="$OSI_VERSIONS $version"
+- AC_MSG_NOTICE([Using OSI $version in $OSIDIR])
+- case $version in
+- clpcbc) CLPCBCDIR="$OSIDIR" ;;
+- symclp) SYMCLPDIR="$OSIDIR" ;;
+- glpk) OSIGLPKDIR="$OSIDIR" ;;
+- esac
+- ls -d $OSIDIR/$ARCH/lib/*amd* >/dev/null 2>/dev/null
+- if test $? -eq 0; then
+- AC_MSG_NOTICE([Found AMD support for $version])
+- OSICLP_ADDLIB="-lamd"
+- OSICLP_ADDDEF="-DUFL_BARRIER"
+- fi
+- break
+- fi
+- done
+- if test -z "$found_osi_version"; then
+- AC_MSG_WARN([Could not find $ARCH support for $version in $OSIDIRS])
+- fi
++ case $version in
++ clpcbc)
++ PKG_CHECK_MODULES(CLPCBC, [osi-cbc], [CLPCBCDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
++ ;;
++ symclp)
++ PKG_CHECK_MODULES(SYMCLP, [osi-sym], [SYMCLPDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
++ ;;
++ glpk)
++ PKG_CHECK_MODULES(OSIGLPK, [osi-glpk], [OSIGLPKDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
++ ;;
++ esac
+ done
+ fi
+ if test -n "$OSI_VERSIONS"; then
+--- Eclipse_6.1_187/Eplex/Makefile.in
++++ Eclipse_6.1_187/Eplex/Makefile.in
+@@ -96,34 +96,31 @@
+ SYMCLPDIR = @SYMCLPDIR@
+ OSIGLPKDIR = @OSIGLPKDIR@
+
+-CLPCBCARCHDIR = $(CLPCBCDIR)/$(ARCH)
+-SYMCLPARCHDIR = $(SYMCLPDIR)/$(ARCH)
+-OSIGLPKARCHDIR = $(OSIGLPKDIR)/$(ARCH)
+-
+-COINOSILIBS = -lOsi -lCoinUtils
+-COINCLPLIBS = -lOsiClp -lCgl -lClp
+-COINCBCLIBS = -lCbcSolver -lCbc
+-
+-$(ARCH)/seosiclpcbc.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h coinplex_params.h
+- $(CXX) -DCOIN -DCOIN_USE_CLP @OSICLP_ADDDEF@ $(CPPFLAGS) $(CFLAGS) -I$(CLPCBCARCHDIR)/include -c coinplex.cpp
+- $(CC) -DCOIN -DCOIN_USE_CLP -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
+- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(CLPCBCARCHDIR)/lib/CbcBranchUser.o $(CLPCBCARCHDIR)/lib/CbcCompareUser.o -L$(CLPCBCARCHDIR)/lib $(COINCBCLIBS) $(COINCLPLIBS) @OSICLP_ADDLIB@ $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiclpcbc.$(OBJ_SUFFIX)
+- [ -d $(ARCH) ] || mkdir $(ARCH)
+- mv seosiclpcbc.$(OBJ_SUFFIX) $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX)
+-
+-$(ARCH)/seosisymclp.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
+- $(CXX) -DCOIN -DCOIN_USE_SYM $(CPPFLAGS) $(CFLAGS) -I$(SYMCLPARCHDIR)/include -c coinplex.cpp
+- $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
+- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o -L$(SYMCLPARCHDIR)/lib -lOsiSym -lSym $(COINCLPLIBS) $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosisymclp.$(OBJ_SUFFIX)
+- [ -d $(ARCH) ] || mkdir $(ARCH)
+- mv seosisymclp.$(OBJ_SUFFIX) $(ARCH)/seosisymclp.$(OBJ_SUFFIX)
+-
+-$(ARCH)/seosiglpk.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
+- $(CXX) -DCOIN -DCOIN_USE_GLPK $(CPPFLAGS) $(CFLAGS) -I$(OSIGLPKARCHDIR)/include -c coinplex.cpp
+- $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
+- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o -L$(OSIGLPKARCHDIR)/lib -lOsiGlpk -lglpk $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiglpk.$(OBJ_SUFFIX)
+- [ -d $(ARCH) ] || mkdir $(ARCH)
+- mv seosiglpk.$(OBJ_SUFFIX) $(ARCH)/seosiglpk.$(OBJ_SUFFIX)
++CLPCBC_CFLAGS = @CLPCBC_CFLAGS@
++SYMCLP_CFLAGS = @SYMCLP_CFLAGS@
++OSIGLPK_CFLAGS = @OSIGLPK_CFLAGS@
++
++CLPCBC_LIBS = @CLPCBC_LIBS@
++SYMCLP_LIBS = @SYMCLP_LIBS@
++OSIGLPK_LIBS = @OSIGLPK_LIBS@
++
++dir_$(ARCH):
++ mkdir -pv $(ARCH)
++
++$(ARCH)/seosiclpcbc.$(OBJ_SUFFIX): dir_$(ARCH) eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h coinplex_params.h
++ $(CXX) -DCOIN -DCOIN_USE_CLP @OSICLP_ADDDEF@ $(CPPFLAGS) $(CFLAGS) $(CLPCBC_CFLAGS) -c coinplex.cpp -o coinplex_cbc.o
++ $(CC) -DCOIN -DCOIN_USE_CLP -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c -o eplex_cbc.o
++ $(DYLD) $(DYNLDFLAGS) eplex_cbc.o coinplex_cbc.o $(CLPCBC_LIBS) @OSICLP_ADDLIB@ $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX)
++
++$(ARCH)/seosisymclp.$(OBJ_SUFFIX): dir_$(ARCH) eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
++ $(CXX) -DCOIN -DCOIN_USE_SYM $(CPPFLAGS) $(CFLAGS) $(SYMCLP_CFLAGS) -c coinplex.cpp -o coinplex_sym.o
++ $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c -o eplex_sym.o
++ $(DYLD) $(DYNLDFLAGS) eplex_sym.o coinplex_sym.o $(SYMCLP_LIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o $(ARCH)/seosisymclp.$(OBJ_SUFFIX)
++
++$(ARCH)/seosiglpk.$(OBJ_SUFFIX): dir_$(ARCH) eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
++ $(CXX) -DCOIN -DCOIN_USE_GLPK $(CPPFLAGS) $(CFLAGS) $(OSIGLPK_CFLAGS) -c coinplex.cpp -o coinplex_glpk.o
++ $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c -o eplex_glpk.o
++ $(DYLD) $(DYNLDFLAGS) eplex_glpk.o coinplex_glpk.o $(OSIGLPK_LIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o $(ARCH)/seosiglpk.$(OBJ_SUFFIX)
+
+ #----------------------------------------------------------------------
+ # EPLEX/CPLEX
+@@ -308,35 +303,25 @@
+ cp $(CPLEX1251_SUPPORT_x86_64_nt) x86_64_nt/
+ cp $(CPLEX1251_SUPPORT_x86_64_nt) ../lib/x86_64_nt/
+
+-x86_64_linux/secplex90.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
++x86_64_linux/secplex90.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
+ $(CC) -DCPLEX=9 -DCPLEXMINOR=0 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex90/include/ilcplex -c eplex.c
+- $(CC) -shared eplex.o $(THIRDPARTY)/cplex90/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
+- [ -d x86_64_linux ] || mkdir x86_64_linux
+- mv secplex.so x86_64_linux/secplex90.so
++ $(CC) -shared eplex.o $(THIRDPARTY)/cplex90/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex90.so
+
+-x86_64_linux/secplex102.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
++x86_64_linux/secplex102.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
+ $(CC) -DCPLEX=10 -DCPLEXMINOR=2 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex102/include/ilcplex -c eplex.c
+- $(CC) -shared eplex.o $(THIRDPARTY)/cplex102/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
+- [ -d x86_64_linux ] || mkdir x86_64_linux
+- mv secplex.so x86_64_linux/secplex102.so
++ $(CC) -shared eplex.o $(THIRDPARTY)/cplex102/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex102.so
+
+-x86_64_linux/secplex110.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
++x86_64_linux/secplex110.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
+ $(CC) -DCPLEX=11 -DCPLEXMINOR=0 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex110/include/ilcplex -c eplex.c
+- $(CC) -shared eplex.o $(THIRDPARTY)/cplex110/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
+- [ -d x86_64_linux ] || mkdir x86_64_linux
+- mv secplex.so x86_64_linux/secplex110.so
++ $(CC) -shared eplex.o $(THIRDPARTY)/cplex110/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex110.so
+
+-x86_64_linux/secplex121.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
++x86_64_linux/secplex121.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
+ $(CC) -DCPLEX=12 -DCPLEXMINOR=1 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex121/include/ilcplex -c eplex.c
+- $(CC) -shared eplex.o $(THIRDPARTY)/cplex121/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
+- [ -d x86_64_linux ] || mkdir x86_64_linux
+- mv secplex.so x86_64_linux/secplex121.so
++ $(CC) -shared eplex.o $(THIRDPARTY)/cplex121/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex121.so
+
+-x86_64_linux/secplex122.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
++x86_64_linux/secplex122.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
+ $(CC) -DCPLEX=12 -DCPLEXMINOR=2 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex122/include/ilcplex -c eplex.c
+- $(CC) -shared eplex.o $(THIRDPARTY)/cplex122/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
+- [ -d x86_64_linux ] || mkdir x86_64_linux
+- mv secplex.so x86_64_linux/secplex122.so
++ $(CC) -shared eplex.o $(THIRDPARTY)/cplex122/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex122.so
+
+ i386_macosx/secplex110.dylib: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
+ $(CC) -DCPLEX=11 -DCPLEXMINOR=0 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex110/include/ilcplex -c eplex.c
+@@ -657,24 +653,19 @@
+ # - we add . to the library path because some libraries might not yet
+ # be installed in ECLIPSEDIR/lib at [fi]compile time
+
+-objects: $(OBJ_FILES)
+-
+ $(PREFIX)/doc/examples/tutorial/%.ecl: %.ecl $(PREFIX)/doc/examples/tutorial/.stamp
+ /bin/cp $< $@
+ -@/bin/chmod $(PERM) $@
+
+-$(PREFIX)/lib/%.eco: %.pl $(PREFIX)/lib/.stamp
+- @$(MAKE) -f $(MAKEFILE) objects
++$(PREFIX)/lib/%.eco: $(OBJ_FILES) %.pl $(PREFIX)/lib/.stamp
+ $(ECLIPSE) -e 'get_flag(library_path,P),set_flag(library_path,["."|P]),lib(fcompile), set_flag(variable_names,off), fcompile("$(*F)", [outdir:"$(@D)"])'
+ -@/bin/chmod $(PERM) $@
+
+-$(PREFIX)/lib/%.eco: %.ecl $(PREFIX)/lib/.stamp
+- @$(MAKE) -f $(MAKEFILE) objects
++$(PREFIX)/lib/%.eco: $(OBJ_FILES) %.ecl $(PREFIX)/lib/.stamp
+ LD_LIBRARY_PATH=$(COINARCHDIR)/lib:$(LD_LIBRARY_PATH) $(ECLIPSE) -e 'get_flag(library_path,P),set_flag(library_path,["."|P]),lib(fcompile), set_flag(variable_names,off), fcompile("$(*F)", [outdir:"$(@D)"])'
+ -@/bin/chmod $(PERM) $@
+
+-$(PREFIX)/lib/%.eci: %.ecl $(PREFIX)/lib/.stamp
+- @$(MAKE) -f $(MAKEFILE) objects
++$(PREFIX)/lib/%.eci: $(OBJ_FILES) %.ecl $(PREFIX)/lib/.stamp
+ LD_LIBRARY_PATH=$(COINARCHDIR)/lib:$(LD_LIBRARY_PATH) $(ECLIPSE) -e 'get_flag(library_path,P),set_flag(library_path,["."|P]),lib(document),icompile("$(*F)","$(@D)")'
+ -@/bin/chmod $(PERM) $@
+
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Oci-mkdir.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Oci-mkdir.patch
new file mode 100644
index 0000000..c61d3e0
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Oci-mkdir.patch
@@ -0,0 +1,21 @@
+--- Eclipse_6.1_187/Oci/Makefile.in
++++ Eclipse_6.1_187/Oci/Makefile.in
+@@ -131,15 +131,15 @@
+
+
+ $(ARCH)/dbi.o : dbi.h dbi.c
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(OPT_FLAGS) $(CFLAGS) $(CPPFLAGS) -c -o $(ARCH)/dbi.o dbi.c
+
+ $(ARCH)/mysql.o: dbi.h mysql.c
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(OPT_FLAGS) $(CFLAGS) $(CPPFLAGS) $(MFLAGS) -c -o $(ARCH)/mysql.o mysql.c
+
+ $(ARCH)/dbi_mysql.$(OBJ_SUFFIX): $(MOBJ)
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(DYLD) $(DYNLDFLAGS) \
+ $(MOBJ) $(MLIBS) $(ELIBS) \
+ -o $(ARCH)/dbi_mysql.$(OBJ_SUFFIX)
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-configure-osi.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-configure-osi.patch
deleted file mode 100644
index 9d20a0b..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-configure-osi.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- Eclipse_6.1_187/configure.ac
-+++ Eclipse_6.1_187/configure.ac
-@@ -1494,7 +1494,7 @@
-
- AC_ARG_WITH([osi], [[ --with-osi[=versions]
- Build ECLiPSe interface to COIN-OR Osi. You can
-- optionally specify a version list, e.g. "clpcbc symclp".
-+ optionally specify a version list, e.g. "clpcbc symclp glpk".
- Default is to build all available versions.
- ]],
- [osi_versions_requested="$withval"], [osi_versions_requested=yes])
-@@ -1504,34 +1504,22 @@
- OSICLP_ADDDEF=""
- if test "$osi_versions_requested" != "no"; then
- if test "$osi_versions_requested" = "yes"; then
-- osi_versions_requested="clpcbc symclp"
-+ osi_versions_requested="clpcbc symclp glpk"
- fi
-+ OSI_VERSIONS=
-+ PKG_CHECK_MODULES(OSI, [osi])
- for version in $osi_versions_requested; do
-- found_osi_version=
-- dnl For backward compatibility, allow ${version}amd as well
-- OSIDIRS="$OSIBASEDIR${version}amd $OSIBASEDIR$version"
-- for OSIDIR in $OSIDIRS; do
-- if test -d "$OSIDIR/$ARCH/lib"; then
-- found_osi_version=yes
-- OSI_VERSIONS="$OSI_VERSIONS $version"
-- AC_MSG_NOTICE([Using OSI $version in $OSIDIR])
-- case $version in
-- clpcbc) CLPCBCDIR="$OSIDIR" ;;
-- symclp) SYMCLPDIR="$OSIDIR" ;;
-- glpk) OSIGLPKDIR="$OSIDIR" ;;
-- esac
-- ls -d $OSIDIR/$ARCH/lib/*amd* >/dev/null 2>/dev/null
-- if test $? -eq 0; then
-- AC_MSG_NOTICE([Found AMD support for $version])
-- OSICLP_ADDLIB="-lamd"
-- OSICLP_ADDDEF="-DUFL_BARRIER"
-- fi
-- break
-- fi
-- done
-- if test -z "$found_osi_version"; then
-- AC_MSG_WARN([Could not find $ARCH support for $version in $OSIDIRS])
-- fi
-+ case $version in
-+ clpcbc)
-+ PKG_CHECK_MODULES(CLPCBC, [osi-cbc], [CLPCBCDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
-+ ;;
-+ symclp)
-+ PKG_CHECK_MODULES(SYMCLP, [osi-sym], [SYMCLPDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
-+ ;;
-+ glpk)
-+ PKG_CHECK_MODULES(OSIGLPK, [osi-glpk], [OSIGLPKDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
-+ ;;
-+ esac
- done
- fi
- if test -n "$OSI_VERSIONS"; then
---- Eclipse_6.1_187/Eplex/Makefile.in
-+++ Eclipse_6.1_187/Eplex/Makefile.in
-@@ -96,34 +96,34 @@
- SYMCLPDIR = @SYMCLPDIR@
- OSIGLPKDIR = @OSIGLPKDIR@
-
--CLPCBCARCHDIR = $(CLPCBCDIR)/$(ARCH)
--SYMCLPARCHDIR = $(SYMCLPDIR)/$(ARCH)
--OSIGLPKARCHDIR = $(OSIGLPKDIR)/$(ARCH)
--
--COINOSILIBS = -lOsi -lCoinUtils
--COINCLPLIBS = -lOsiClp -lCgl -lClp
--COINCBCLIBS = -lCbcSolver -lCbc
-+CLPCBC_CFLAGS = @CLPCBC_CFLAGS@
-+SYMCLP_CFLAGS = @SYMCLP_CFLAGS@
-+OSIGLPK_CFLAGS = @OSIGLPK_CFLAGS@
-+
-+CLPCBC_LIBS = @CLPCBC_LIBS@
-+SYMCLP_LIBS = @SYMCLP_LIBS@
-+OSIGLPK_LIBS = @OSIGLPK_LIBS@
-
- $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h coinplex_params.h
-- $(CXX) -DCOIN -DCOIN_USE_CLP @OSICLP_ADDDEF@ $(CPPFLAGS) $(CFLAGS) -I$(CLPCBCARCHDIR)/include -c coinplex.cpp
-+ $(CXX) -DCOIN -DCOIN_USE_CLP @OSICLP_ADDDEF@ $(CPPFLAGS) $(CFLAGS) $(CLPCBC_CFLAGS) -c coinplex.cpp
- $(CC) -DCOIN -DCOIN_USE_CLP -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
-- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(CLPCBCARCHDIR)/lib/CbcBranchUser.o $(CLPCBCARCHDIR)/lib/CbcCompareUser.o -L$(CLPCBCARCHDIR)/lib $(COINCBCLIBS) $(COINCLPLIBS) @OSICLP_ADDLIB@ $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiclpcbc.$(OBJ_SUFFIX)
-+ $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(CLPCBC_LIBS) @OSICLP_ADDLIB@ $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiclpcbc.$(OBJ_SUFFIX)
- [ -d $(ARCH) ] || mkdir $(ARCH)
-- mv seosiclpcbc.$(OBJ_SUFFIX) $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX)
-+ cp seosiclpcbc.$(OBJ_SUFFIX) $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX)
-
- $(ARCH)/seosisymclp.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
-- $(CXX) -DCOIN -DCOIN_USE_SYM $(CPPFLAGS) $(CFLAGS) -I$(SYMCLPARCHDIR)/include -c coinplex.cpp
-+ $(CXX) -DCOIN -DCOIN_USE_SYM $(CPPFLAGS) $(CFLAGS) $(SYMCLP_CFLAGS) -c coinplex.cpp
- $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
-- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o -L$(SYMCLPARCHDIR)/lib -lOsiSym -lSym $(COINCLPLIBS) $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosisymclp.$(OBJ_SUFFIX)
-+ $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(SYMCLP_LIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosisymclp.$(OBJ_SUFFIX)
- [ -d $(ARCH) ] || mkdir $(ARCH)
-- mv seosisymclp.$(OBJ_SUFFIX) $(ARCH)/seosisymclp.$(OBJ_SUFFIX)
-+ cp seosisymclp.$(OBJ_SUFFIX) $(ARCH)/seosisymclp.$(OBJ_SUFFIX)
-
- $(ARCH)/seosiglpk.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
-- $(CXX) -DCOIN -DCOIN_USE_GLPK $(CPPFLAGS) $(CFLAGS) -I$(OSIGLPKARCHDIR)/include -c coinplex.cpp
-+ $(CXX) -DCOIN -DCOIN_USE_GLPK $(CPPFLAGS) $(CFLAGS) $(OSIGLPK_CFLAGS) -c coinplex.cpp
- $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
-- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o -L$(OSIGLPKARCHDIR)/lib -lOsiGlpk -lglpk $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiglpk.$(OBJ_SUFFIX)
-+ $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(OSIGLPK_LIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiglpk.$(OBJ_SUFFIX)
- [ -d $(ARCH) ] || mkdir $(ARCH)
-- mv seosiglpk.$(OBJ_SUFFIX) $(ARCH)/seosiglpk.$(OBJ_SUFFIX)
-+ cp seosiglpk.$(OBJ_SUFFIX) $(ARCH)/seosiglpk.$(OBJ_SUFFIX)
-
- #----------------------------------------------------------------------
- # EPLEX/CPLEX
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch
index 561c35d..5d2cc26 100644
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch
@@ -9,3 +9,103 @@
STDCXXLIB = @STDCXXLIB@
ECLIBS = -L$(ECLIPSEDIR)/lib/$(ARCH) -leclipse @LIBS@
+@@ -84,14 +84,14 @@
+ ifeq ($(OSCLASS),win)
+
+ $(ARCH)/edge_finder.dll: edge_finder.c
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(CPPFLAGS) $(CFLAGS) -shared -o $@ \
+ $(<:.c=.def) $< $(ECLIBS)
+
+ else
+
+ $(ARCH)/edge_finder.$(OBJ_SUFFIX): edge_finder.c
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LOCAL_FLAGS) edge_finder.c \
+ -c -o $(ARCH)/edge_finder.o
+ $(DYLD) $(DYNLDFLAGS) $(GMP_LD) $(ECLIBS) \
+@@ -101,14 +101,14 @@
+ ifeq ($(OSCLASS),win)
+
+ $(ARCH)/edge_finder3.dll: edge_finder.c
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) -DSTRONG $(CPPFLAGS) $(CFLAGS) -shared -o $@ \
+ $(<:.c=.def) $< $(ECLIBS)
+
+ else
+
+ $(ARCH)/edge_finder3.$(OBJ_SUFFIX): edge_finder3.c
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) -DSTRONG $(CPPFLAGS) $(CFLAGS) $(LOCAL_FLAGS) edge_finder3.c \
+ -c -o $(ARCH)/edge_finder3.o
+ $(DYLD) $(DYNLDFLAGS) $(GMP_LD) $(ECLIBS) \
+@@ -123,14 +123,14 @@
+ ifeq ($(OSCLASS),win)
+
+ $(ARCH)/bitmap.dll: bitmap.c
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(CPPFLAGS) $(CFLAGS) -shared -o $@ \
+ $(<:.c=.def) $< $(ECLIBS)
+
+ else
+
+ $(ARCH)/bitmap.$(OBJ_SUFFIX): bitmap.c
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LOCAL_FLAGS) bitmap.c \
+ -c -o $(ARCH)/bitmap.o
+ $(DYLD) $(DYNLDFLAGS) $(GMP_LD) $(ECLIBS) \
+@@ -145,19 +145,19 @@
+ ifeq ($(OSCLASS),win)
+
+ $(ARCH)/ic.dll: ic.c $(ARCH)/bitmap.dll
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(CPPFLAGS) $(CFLAGS) -shared -o $@ \
+ $(<:.c=.def) $< $(ARCH)/bitmap.dll $(ECLIBS)
+ else
+
+ $(ARCH)/ic.$(OBJ_SUFFIX): ic.c $(ARCH)/bitmap.$(OBJ_SUFFIX)
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(FLOAT_ROUND_FLAGS) \
+ ic.c -c -o $(ARCH)/ic.o
+ $(DYLD) $(DYNLDFLAGS) $(ECLIBS) $(GMP_LD) \
+ $(ARCH)/ic.o $(ARCH)/bitmap.$(OBJ_SUFFIX) -o $(ARCH)/ic.$(OBJ_SUFFIX)
+ #i386_linux/ic.so: ic2.c
+-# [ -d i386_linux ] || mkdir i386_linux
++# mkdir -p i386_linux
+ # $(CC) -g $(CPPFLAGS) $(CFLAGS) -shared ic2.c $(ECLIBS) -o i386_linux/ic.so
+
+ endif
+@@ -178,14 +178,14 @@
+ ifeq ($(OSCLASS),win)
+
+ $(ARCH)/eregex.dll: eregex.c $(ARCH)/libregex.a
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(CPPFLAGS) $(CFLAGS) -Irxspencer -shared -o $@ \
+ $(<:.c=.def) $< $(ARCH)/libregex.a $(ECLIBS)
+
+ else
+
+ $(ARCH)/eregex.$(OBJ_SUFFIX): eregex.c
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LOCAL_FLAGS) eregex.c \
+ -c -o $(ARCH)/eregex.o
+ $(DYLD) $(DYNLDFLAGS) $(GMP_LD) $(ECLIBS) $(RXLIBS) \
+@@ -196,7 +196,7 @@
+ # CAUTION: we build directly in the rxspencer directory, but the binary
+ # libregex.a is moved after building to allow different architectures
+ $(ARCH)/libregex.a:
+- [ -d $(ARCH) ] || mkdir $(ARCH)
++ mkdir -p $(ARCH)
+ ( cd rxspencer ; \
+ CC="$(CC)" AR="$(AR)" $(MAKE) lib)
+ mv rxspencer/libregex.a $(ARCH)/.
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch
index 6a02660..f378b61 100644
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch
@@ -33,3 +33,14 @@
if test "$OSCLASS" != "win" ; then
dnl find X includes and libraries
+--- Eclipse_6.1_187/Kernel/src/Makefile.in
++++ Eclipse_6.1_187/Kernel/src/Makefile.in
+@@ -94,7 +94,7 @@
+ OPT_FLAGS_ARITH = @OPT_FLAGS_ARITH@
+ LOCAL_FLAGS = @LOCAL_FLAGS@
+ FLOAT_ROUND_FLAGS = @FLOAT_ROUND_FLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = -DUSE_INTERP_RESULT @CFLAGS@
+ OBJECTS_SUFFIX = @OBJECTS_SUFFIX@
+ LIB_PREFIX = @LIB_PREFIX@
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
@ 2014-06-05 13:43 Michael Weber
0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2014-06-05 13:43 UTC (permalink / raw
To: gentoo-commits
commit: e825bdfd7531cb68141fd98bd9362ce3ebd961aa
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Thu Jun 5 13:42:58 2014 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Jun 5 13:42:58 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=e825bdfd
eclipse-cpl -> eclipse-clp (part2)
---
dev-util/eclipse-cpl/ChangeLog | 57 ------
dev-util/eclipse-cpl/Manifest | 11 --
dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 191 --------------------
dev-util/eclipse-cpl/files/README.gentoo | 1 -
.../eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch | 31 ----
.../files/eclipse-cpl-6.1.187-Eplex-Makefile.patch | 196 ---------------------
.../files/eclipse-cpl-6.1.187-Eplex-include.patch | 10 --
.../files/eclipse-cpl-6.1.187-Oci-mkdir.patch | 21 ---
.../files/eclipse-cpl-6.1.187-icparc_solvers.patch | 111 ------------
.../files/eclipse-cpl-6.1.187-mysql.patch | 11 --
.../files/eclipse-cpl-6.1.187-tcl8.6.patch | 46 -----
dev-util/eclipse-cpl/metadata.xml | 13 --
12 files changed, 699 deletions(-)
diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
deleted file mode 100644
index 5835420..0000000
--- a/dev-util/eclipse-cpl/ChangeLog
+++ /dev/null
@@ -1,57 +0,0 @@
- 20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
- revert to default use flags
-
- 20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
- more non-parallel build
-
- 20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
- fix tempdir
-
- 20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
- make use of USE=coin
-
- 18 May 2014; Michael Weber <xmw@gentoo.org>
- +files/eclipse-cpl-6.1.187-Eplex-Makefile.patch,
- +files/eclipse-cpl-6.1.187-Oci-mkdir.patch,
- -files/eclipse-cpl-6.1.187-configure-osi.patch, eclipse-cpl-6.1.187.ebuild,
- files/eclipse-cpl-6.1.187-icparc_solvers.patch,
- files/eclipse-cpl-6.1.187-tcl8.6.patch:
- parallel fooo
-
- 18 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
- building version
-
- 18 May 2014; Michael Weber <xmw@gentoo.org>
- +files/eclipse-cpl-6.1.187-AR.patch,
- +files/eclipse-cpl-6.1.187-Eplex-include.patch,
- +files/eclipse-cpl-6.1.187-configure-osi.patch,
- +files/eclipse-cpl-6.1.187-icparc_solvers.patch,
- -files/eclipse-cpl-6.1.187-automagic-doc.patch,
- -files/eclipse-cpl-6.1.187-includedir.patch,
- -files/eclipse-cpl-6.1.187-shm-respect-ar.patch, eclipse-cpl-6.1.187.ebuild,
- metadata.xml:
- work in progress
-
- 16 May 2014; Michael Weber <xmw@gentoo.org> +files/README.gentoo,
- +files/eclipse-cpl-6.1.187-mysql.patch,
- +files/eclipse-cpl-6.1.187-tcl8.6.patch,
- -files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch,
- -files/eclipse-cpl-6.1.187-disable-icparc-solver.patch,
- eclipse-cpl-6.1.187.ebuild, metadata.xml:
- work in progress
-
- 15 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
- second approach generating wrappers
-
- 15 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
- meh, no parallel build
-
-*eclipse-cpl-6.1.187 (15 May 2014)
-
- 15 May 2014; Michael Weber <xmw@gentoo.org> +eclipse-cpl-6.1.187.ebuild,
- +files/eclipse-cpl-6.1.187-automagic-doc.patch,
- +files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch,
- +files/eclipse-cpl-6.1.187-disable-icparc-solver.patch,
- +files/eclipse-cpl-6.1.187-includedir.patch,
- +files/eclipse-cpl-6.1.187-shm-respect-ar.patch, +metadata.xml:
- Iniital import
diff --git a/dev-util/eclipse-cpl/Manifest b/dev-util/eclipse-cpl/Manifest
deleted file mode 100644
index feafafd..0000000
--- a/dev-util/eclipse-cpl/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST eclipse-cpl-6.1.187.tar.gz 8624698 SHA256 cfddbdc4a45b6e8f8fbb1c0e36881264d2b68169d6fbaf55c09e9ddb66612a72 SHA512 ff14a81f7ae9b9ba0805016e856f01fdd9fa67edf0fe4a3048f375b82d1795f9ad52fd078da94da4ebf13aa269f5035dbbe15c119453949597942183e899152a WHIRLPOOL 5ae43380b0458814d94a9e7a5919d61ae1ad9cf12dbdf65f3c7c8b77f60498e3d5162d0f3a530992f6d4e1157b62b88420a54eda65d40562176ff6c5eff054c4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlN0s+0ACgkQknrdDGLu8JC9HAD/QcUKnkzfUXYz7y2/FJTy82AF
-0U1TIIuGZpqmMM/3SxkA/3sw+qH+KUDf9mjCVyIgCYKaCH5so77sp7DwTH4N3RSh
-=mH9N
------END PGP SIGNATURE-----
diff --git a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
deleted file mode 100644
index 0ac0e93..0000000
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit autotools eutils readme.gentoo versionator
-
-DESCRIPTION="OSS system for the cost-effective development and deployment of constraint programming applications"
-HOMEPAGE="http://eclipseclp.org/"
-
-MY_PV=$(replace_version_separator 2 _ ${PV})
-SRC_URI="http://eclipseclp.org/Distribution/${MY_PV}/src/${PN/-cpl}_src.tgz -> ${P}.tar.gz"
-
-LICENSE="${pn} LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc +coin +gecode +glpk +gmp java mysql tcl +threads"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- gmp? ( dev-libs/gmp )
- doc? ( app-text/ghostscript-gpl
- dev-tex/hevea
- dev-texlive/texlive-latex )
- gecode? ( dev-libs/gecode )
- mysql? ( virtual/mysql )
- java? ( dev-java/batik dev-java/javahelp )
- coin? ( sci-libs/coinor-cbc[examples]
- sci-libs/coinor-osi[glpk?]
- sci-libs/coinor-symphony[glpk?]
- glpk? ( <sci-mathematics/glpk-4.54 ) )"
-
-S=${WORKDIR}/Eclipse_${MY_PV}
-
-REQUIRED_USE="coin? ( gmp ) glpk? ( coin )"
-
-pkg_setup() {
- use gecode && ewarn gecode does not work yet
- use doc && ewarn doc does not work yet
-}
-
-src_unpack() {
- default
- if use coin ; then
- local my_cbc=$(best_version sci-libs/coinor-cbc)
- cp "${EROOT}"usr/share/doc/${my_cbc/sci-libs\//}/examples/Cbc{Branch,Compare}User.{c,h}pp.* . || die
- unpack ./Cbc{Branch,Compare}User.{c,h}pp.*
- mv Cbc{Branch,Compare}User.{c,h}pp "${S}"/Eplex || die
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-mysql.patch \
- "${FILESDIR}"/${P}-tcl8.6.patch \
- "${FILESDIR}"/${P}-Eplex-Makefile.patch \
- "${FILESDIR}"/${P}-AR.patch \
- "${FILESDIR}"/${P}-Eplex-include.patch \
- "${FILESDIR}"/${P}-icparc_solvers.patch \
- "${FILESDIR}"/${P}-Oci-mkdir.patch
-
- rm ARCH RUNME || die
-
- case "${ARCH}" in
- amd64) export ARCH=x86_64_linux ;;
- x86) export ARCH=i386_linux ;;
- *) die "unsupported arch ${ARCH}" ;;
- esac
- export ECLIPSEDIR=${EROOT}opt/${PN}
- export MYSQLDIR="${EROOT}usr/include/mysql"
- export prefix="${S}/build"
- eautoreconf
-}
-
-src_configure() {
- local my_osi="--without-osi"
- if use coin ; then
- my_osi="--with-osi=symclp"
- #my_osi=" ... clpcbc" doesn't build jet
- if use glpk ; then
- my_osi="${my_osi} glpk"
- fi
- fi
- econf \
- --without-cplex \
- --without-xpress \
- $(use_with gmp) \
- "${my_osi}" \
- --with-flexlm \
- $(use_with gecode gfd) \
- --without-graphviz \
- --without-gurobi \
- $(use_with mysql) \
- $(use_with java) \
- $(use_with java cpviz) \
- $(use_with threads pthreads) \
- $(use_with doc) \
- $(use_with tcl)
-}
-
-src_compile() {
- mkdir -p "${S}/build/bin/${ARCH}"
-
- #replace toplevel Makefile.${ARCH}, -j1 bug etc.
- rm -fv Makefile.${ARCH} || die
- einfo "compile & install Shm"
- emake -C Shm/${ARCH} PREFIX="${S}/build" install
- einfo "compile & install Kernel"
- emake -C Kernel/${ARCH} sepia
- emake -C Kernel/${ARCH} PREFIX="${S}/build" install
- einfo "install legal files"
- cp -pr legal "${S}/build" || die
-
- runme() {
- einfo "create wrapper $1"
- cat << EOF > "build/bin/${ARCH}/$1"
-#!/bin/sh
-export ECLIPSEDIR="\${ECLIPSEDIR:-${EROOT}opt/${PN}}"
-if [ -z "\${LD_LIBRARY_PATH}" ] ; then
- export LD_LIBRARY_PATH="\${ECLIPSEDIR}/lib/${ARCH}"
-else
- export LD_LIBRARY_PATH="\${ECLIPSEDIR}/lib/${ARCH}:\${LD_LIBRARY_PATH}"
-fi
-export JRE_HOME="\${JRE_HOME:-\${JAVA_HOME}}"
-$2
-EOF
- chmod +x "build/bin/${ARCH}/$1"
- }
- runme "eclipse" "exec \"\${ECLIPSEDIR}/lib/x86_64_linux/eclipse.exe\" \"\$@\""
-
- if use tcl ; then
- einfo "install lib_tcl"
- cp -pr lib_tcl "build" || die
-
- runme "tkeclipse" "exec wish \"\${ECLIPSEDIR}/lib_tcl/tkeclipse.tcl\" -- \"\$@\""
- runme "tktools" "exec wish \"\${ECLIPSEDIR}/lib_tcl/tktools.tcl\" -- \"\$@\""
- fi
-
- #einfo "compile & install ecrc_solvers"
- #emake -C ecrc_solvers -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
-
- einfo "compile & install Flexlm"
- emake -C Flexlm -f Makefile.${ARCH} PREFIX="${S}/build" install
-
- if use coin ; then
- einfo "compile & install Eplex"
- emake -C Eplex -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
-
- einfo "compile & install icparc_solvers"
- emake -C icparc_solvers -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
- fi
- if use gecode ; then
- einfo "compile & install GecodeInterface"
- emake -C GecodeInterface -f Makefile.${ARCH} PREFIX="${S}/build" install
- fi
- if use java ; then
- einfo "compile & install JavaInterface"
- emake -C JavaInterface -f Makefile.${ARCH} PREFIX="${S}/build" install
- runme "jeclipse" "exec \"\${JRE_HOME}/bin/java\" -Xss2m -Declipse.directory=\"\${ECLIPSEDIR}\" -classpath \"\${ECLIPSEDIR}/lib/eclipse.jar\" com.parctechnologies.eclipse.JEclipse \"\$@\""
-
- einfo "compile & install Visualisation"
- emake -C Visualisation -f Makefile.${ARCH} PREFIX="${S}/build" install
- fi
-
- if use mysql ; then
- einfo "compile & install Oci"
- emake -C Oci -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
- fi
-}
-
-src_install() {
- dodir /opt
- mv "${S}/build" "${ED}opt/${PN}" || die
-
- local my_file
- make_wrapper eclipse "${EROOT}opt/${PN}/bin/${ARCH}/eclipse"
- if use tcl ; then
- make_wrapper tkeclipse "${EROOT}opt/${PN}/bin/${ARCH}/tkeclipse"
- make_wrapper tktools "${EROOT}opt/${PN}/bin/${ARCH}/tktools"
- fi
- if use java ; then
- make_wrapper jeclipse "${EROOT}opt/${PN}/bin/${ARCH}/jeclipse"
- fi
-
- echo "ECLIPSEDIR=\"${EROOT}opt/${PN}\"" > "${T}"/90${PN}
- doenvd "${T}"/90${PN}
-
- dodoc README_UNIX
- readme.gentoo_create_doc
-}
diff --git a/dev-util/eclipse-cpl/files/README.gentoo b/dev-util/eclipse-cpl/files/README.gentoo
deleted file mode 100644
index 97ca535..0000000
--- a/dev-util/eclipse-cpl/files/README.gentoo
+++ /dev/null
@@ -1 +0,0 @@
-Please reload your environment to ensure a correct ECLIPSEDIR variable.
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch
deleted file mode 100644
index b4784da..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Eclipse_6.1_187/configure.ac
-+++ Eclipse_6.1_187/configure.ac
-@@ -750,7 +750,7 @@
- AC_PROG_CXX
- AC_PROG_CXXCPP
- AC_PROG_AWK
--AC_PATH_PROG(AR,ar,ar,[$PATH:/usr/ccs/bin])
-+AM_PROG_AR
- AC_PROG_RANLIB
- AC_PROG_LN_S
- AC_CHECK_PROG(SED,sed,sed,false)
---- Eclipse_6.1_187/Shm/src/Makefile.in
-+++ Eclipse_6.1_187/Shm/src/Makefile.in
-@@ -33,7 +33,7 @@
- RANLIB = @RANLIB@
- LOCK = @LOCK@
-
--AR = ar ruv
-+AR = @AR@
- RM = /bin/rm -f
- CP = /bin/cp
-
-@@ -66,7 +66,7 @@
-
-
- libshm.a: $(SHM_OBJ)
-- ar rcv libshm.a $(SHM_OBJ)
-+ $(AR) rcv libshm.a $(SHM_OBJ)
- $(RANLIB) libshm.a
-
- alloc.o: config.h memman.h
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-Makefile.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-Makefile.patch
deleted file mode 100644
index f069c70..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-Makefile.patch
+++ /dev/null
@@ -1,196 +0,0 @@
---- Eclipse_6.1_187/configure.ac
-+++ Eclipse_6.1_187/configure.ac
-@@ -1494,7 +1494,7 @@
-
- AC_ARG_WITH([osi], [[ --with-osi[=versions]
- Build ECLiPSe interface to COIN-OR Osi. You can
-- optionally specify a version list, e.g. "clpcbc symclp".
-+ optionally specify a version list, e.g. "clpcbc symclp glpk".
- Default is to build all available versions.
- ]],
- [osi_versions_requested="$withval"], [osi_versions_requested=yes])
-@@ -1504,34 +1504,22 @@
- OSICLP_ADDDEF=""
- if test "$osi_versions_requested" != "no"; then
- if test "$osi_versions_requested" = "yes"; then
-- osi_versions_requested="clpcbc symclp"
-+ osi_versions_requested="clpcbc symclp glpk"
- fi
-+ OSI_VERSIONS=
-+ PKG_CHECK_MODULES(OSI, [osi])
- for version in $osi_versions_requested; do
-- found_osi_version=
-- dnl For backward compatibility, allow ${version}amd as well
-- OSIDIRS="$OSIBASEDIR${version}amd $OSIBASEDIR$version"
-- for OSIDIR in $OSIDIRS; do
-- if test -d "$OSIDIR/$ARCH/lib"; then
-- found_osi_version=yes
-- OSI_VERSIONS="$OSI_VERSIONS $version"
-- AC_MSG_NOTICE([Using OSI $version in $OSIDIR])
-- case $version in
-- clpcbc) CLPCBCDIR="$OSIDIR" ;;
-- symclp) SYMCLPDIR="$OSIDIR" ;;
-- glpk) OSIGLPKDIR="$OSIDIR" ;;
-- esac
-- ls -d $OSIDIR/$ARCH/lib/*amd* >/dev/null 2>/dev/null
-- if test $? -eq 0; then
-- AC_MSG_NOTICE([Found AMD support for $version])
-- OSICLP_ADDLIB="-lamd"
-- OSICLP_ADDDEF="-DUFL_BARRIER"
-- fi
-- break
-- fi
-- done
-- if test -z "$found_osi_version"; then
-- AC_MSG_WARN([Could not find $ARCH support for $version in $OSIDIRS])
-- fi
-+ case $version in
-+ clpcbc)
-+ PKG_CHECK_MODULES(CLPCBC, [osi-cbc], [CLPCBCDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
-+ ;;
-+ symclp)
-+ PKG_CHECK_MODULES(SYMCLP, [osi-sym], [SYMCLPDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
-+ ;;
-+ glpk)
-+ PKG_CHECK_MODULES(OSIGLPK, [osi-glpk], [OSIGLPKDIR="yes" ; OSI_VERSIONS="$OSI_VERSIONS $version"])
-+ ;;
-+ esac
- done
- fi
- if test -n "$OSI_VERSIONS"; then
---- Eclipse_6.1_187/Eplex/Makefile.in
-+++ Eclipse_6.1_187/Eplex/Makefile.in
-@@ -96,34 +96,31 @@
- SYMCLPDIR = @SYMCLPDIR@
- OSIGLPKDIR = @OSIGLPKDIR@
-
--CLPCBCARCHDIR = $(CLPCBCDIR)/$(ARCH)
--SYMCLPARCHDIR = $(SYMCLPDIR)/$(ARCH)
--OSIGLPKARCHDIR = $(OSIGLPKDIR)/$(ARCH)
--
--COINOSILIBS = -lOsi -lCoinUtils
--COINCLPLIBS = -lOsiClp -lCgl -lClp
--COINCBCLIBS = -lCbcSolver -lCbc
--
--$(ARCH)/seosiclpcbc.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h coinplex_params.h
-- $(CXX) -DCOIN -DCOIN_USE_CLP @OSICLP_ADDDEF@ $(CPPFLAGS) $(CFLAGS) -I$(CLPCBCARCHDIR)/include -c coinplex.cpp
-- $(CC) -DCOIN -DCOIN_USE_CLP -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
-- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o $(CLPCBCARCHDIR)/lib/CbcBranchUser.o $(CLPCBCARCHDIR)/lib/CbcCompareUser.o -L$(CLPCBCARCHDIR)/lib $(COINCBCLIBS) $(COINCLPLIBS) @OSICLP_ADDLIB@ $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiclpcbc.$(OBJ_SUFFIX)
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-- mv seosiclpcbc.$(OBJ_SUFFIX) $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX)
--
--$(ARCH)/seosisymclp.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
-- $(CXX) -DCOIN -DCOIN_USE_SYM $(CPPFLAGS) $(CFLAGS) -I$(SYMCLPARCHDIR)/include -c coinplex.cpp
-- $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
-- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o -L$(SYMCLPARCHDIR)/lib -lOsiSym -lSym $(COINCLPLIBS) $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosisymclp.$(OBJ_SUFFIX)
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-- mv seosisymclp.$(OBJ_SUFFIX) $(ARCH)/seosisymclp.$(OBJ_SUFFIX)
--
--$(ARCH)/seosiglpk.$(OBJ_SUFFIX): eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
-- $(CXX) -DCOIN -DCOIN_USE_GLPK $(CPPFLAGS) $(CFLAGS) -I$(OSIGLPKARCHDIR)/include -c coinplex.cpp
-- $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c
-- $(DYLD) $(DYNLDFLAGS) eplex.o coinplex.o -L$(OSIGLPKARCHDIR)/lib -lOsiGlpk -lglpk $(COINOSILIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o seosiglpk.$(OBJ_SUFFIX)
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-- mv seosiglpk.$(OBJ_SUFFIX) $(ARCH)/seosiglpk.$(OBJ_SUFFIX)
-+CLPCBC_CFLAGS = @CLPCBC_CFLAGS@
-+SYMCLP_CFLAGS = @SYMCLP_CFLAGS@
-+OSIGLPK_CFLAGS = @OSIGLPK_CFLAGS@
-+
-+CLPCBC_LIBS = @CLPCBC_LIBS@
-+SYMCLP_LIBS = @SYMCLP_LIBS@
-+OSIGLPK_LIBS = @OSIGLPK_LIBS@
-+
-+dir_$(ARCH):
-+ mkdir -pv $(ARCH)
-+
-+$(ARCH)/seosiclpcbc.$(OBJ_SUFFIX): dir_$(ARCH) eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h coinplex_params.h
-+ $(CXX) -DCOIN -DCOIN_USE_CLP @OSICLP_ADDDEF@ $(CPPFLAGS) $(CFLAGS) $(CLPCBC_CFLAGS) -c coinplex.cpp -o coinplex_cbc.o
-+ $(CC) -DCOIN -DCOIN_USE_CLP -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c -o eplex_cbc.o
-+ $(DYLD) $(DYNLDFLAGS) eplex_cbc.o coinplex_cbc.o $(CLPCBC_LIBS) @OSICLP_ADDLIB@ $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o $(ARCH)/seosiclpcbc.$(OBJ_SUFFIX)
-+
-+$(ARCH)/seosisymclp.$(OBJ_SUFFIX): dir_$(ARCH) eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
-+ $(CXX) -DCOIN -DCOIN_USE_SYM $(CPPFLAGS) $(CFLAGS) $(SYMCLP_CFLAGS) -c coinplex.cpp -o coinplex_sym.o
-+ $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c -o eplex_sym.o
-+ $(DYLD) $(DYNLDFLAGS) eplex_sym.o coinplex_sym.o $(SYMCLP_LIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o $(ARCH)/seosisymclp.$(OBJ_SUFFIX)
-+
-+$(ARCH)/seosiglpk.$(OBJ_SUFFIX): dir_$(ARCH) eplex.c coinplex.cpp eplex_coin.h eplex_coin.c eplex.h
-+ $(CXX) -DCOIN -DCOIN_USE_GLPK $(CPPFLAGS) $(CFLAGS) $(OSIGLPK_CFLAGS) -c coinplex.cpp -o coinplex_glpk.o
-+ $(CC) -DCOIN -DC_TO_COIN $(CPPFLAGS) $(CFLAGS) -c eplex.c -o eplex_glpk.o
-+ $(DYLD) $(DYNLDFLAGS) eplex_glpk.o coinplex_glpk.o $(OSIGLPK_LIBS) $(STDCXXLIB) $(ECLIBS) $(GMP_LD) -o $(ARCH)/seosiglpk.$(OBJ_SUFFIX)
-
- #----------------------------------------------------------------------
- # EPLEX/CPLEX
-@@ -308,35 +303,25 @@
- cp $(CPLEX1251_SUPPORT_x86_64_nt) x86_64_nt/
- cp $(CPLEX1251_SUPPORT_x86_64_nt) ../lib/x86_64_nt/
-
--x86_64_linux/secplex90.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
-+x86_64_linux/secplex90.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
- $(CC) -DCPLEX=9 -DCPLEXMINOR=0 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex90/include/ilcplex -c eplex.c
-- $(CC) -shared eplex.o $(THIRDPARTY)/cplex90/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
-- [ -d x86_64_linux ] || mkdir x86_64_linux
-- mv secplex.so x86_64_linux/secplex90.so
-+ $(CC) -shared eplex.o $(THIRDPARTY)/cplex90/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex90.so
-
--x86_64_linux/secplex102.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
-+x86_64_linux/secplex102.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
- $(CC) -DCPLEX=10 -DCPLEXMINOR=2 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex102/include/ilcplex -c eplex.c
-- $(CC) -shared eplex.o $(THIRDPARTY)/cplex102/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
-- [ -d x86_64_linux ] || mkdir x86_64_linux
-- mv secplex.so x86_64_linux/secplex102.so
-+ $(CC) -shared eplex.o $(THIRDPARTY)/cplex102/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex102.so
-
--x86_64_linux/secplex110.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
-+x86_64_linux/secplex110.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
- $(CC) -DCPLEX=11 -DCPLEXMINOR=0 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex110/include/ilcplex -c eplex.c
-- $(CC) -shared eplex.o $(THIRDPARTY)/cplex110/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
-- [ -d x86_64_linux ] || mkdir x86_64_linux
-- mv secplex.so x86_64_linux/secplex110.so
-+ $(CC) -shared eplex.o $(THIRDPARTY)/cplex110/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex110.so
-
--x86_64_linux/secplex121.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
-+x86_64_linux/secplex121.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
- $(CC) -DCPLEX=12 -DCPLEXMINOR=1 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex121/include/ilcplex -c eplex.c
-- $(CC) -shared eplex.o $(THIRDPARTY)/cplex121/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
-- [ -d x86_64_linux ] || mkdir x86_64_linux
-- mv secplex.so x86_64_linux/secplex121.so
-+ $(CC) -shared eplex.o $(THIRDPARTY)/cplex121/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex121.so
-
--x86_64_linux/secplex122.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
-+x86_64_linux/secplex122.so: dir_x86_64_linux eplex.c eplex_cplex.h eplex_cplex.c eplex.h
- $(CC) -DCPLEX=12 -DCPLEXMINOR=2 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex122/include/ilcplex -c eplex.c
-- $(CC) -shared eplex.o $(THIRDPARTY)/cplex122/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o secplex.so
-- [ -d x86_64_linux ] || mkdir x86_64_linux
-- mv secplex.so x86_64_linux/secplex122.so
-+ $(CC) -shared eplex.o $(THIRDPARTY)/cplex122/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS) -lpthread -o x86_64_linux/secplex122.so
-
- i386_macosx/secplex110.dylib: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
- $(CC) -DCPLEX=11 -DCPLEXMINOR=0 $(CPPFLAGS) $(CFLAGS) -I$(THIRDPARTY)/cplex110/include/ilcplex -c eplex.c
-@@ -657,24 +653,19 @@
- # - we add . to the library path because some libraries might not yet
- # be installed in ECLIPSEDIR/lib at [fi]compile time
-
--objects: $(OBJ_FILES)
--
- $(PREFIX)/doc/examples/tutorial/%.ecl: %.ecl $(PREFIX)/doc/examples/tutorial/.stamp
- /bin/cp $< $@
- -@/bin/chmod $(PERM) $@
-
--$(PREFIX)/lib/%.eco: %.pl $(PREFIX)/lib/.stamp
-- @$(MAKE) -f $(MAKEFILE) objects
-+$(PREFIX)/lib/%.eco: $(OBJ_FILES) %.pl $(PREFIX)/lib/.stamp
- $(ECLIPSE) -e 'get_flag(library_path,P),set_flag(library_path,["."|P]),lib(fcompile), set_flag(variable_names,off), fcompile("$(*F)", [outdir:"$(@D)"])'
- -@/bin/chmod $(PERM) $@
-
--$(PREFIX)/lib/%.eco: %.ecl $(PREFIX)/lib/.stamp
-- @$(MAKE) -f $(MAKEFILE) objects
-+$(PREFIX)/lib/%.eco: $(OBJ_FILES) %.ecl $(PREFIX)/lib/.stamp
- LD_LIBRARY_PATH=$(COINARCHDIR)/lib:$(LD_LIBRARY_PATH) $(ECLIPSE) -e 'get_flag(library_path,P),set_flag(library_path,["."|P]),lib(fcompile), set_flag(variable_names,off), fcompile("$(*F)", [outdir:"$(@D)"])'
- -@/bin/chmod $(PERM) $@
-
--$(PREFIX)/lib/%.eci: %.ecl $(PREFIX)/lib/.stamp
-- @$(MAKE) -f $(MAKEFILE) objects
-+$(PREFIX)/lib/%.eci: $(OBJ_FILES) %.ecl $(PREFIX)/lib/.stamp
- LD_LIBRARY_PATH=$(COINARCHDIR)/lib:$(LD_LIBRARY_PATH) $(ECLIPSE) -e 'get_flag(library_path,P),set_flag(library_path,["."|P]),lib(document),icompile("$(*F)","$(@D)")'
- -@/bin/chmod $(PERM) $@
-
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-include.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-include.patch
deleted file mode 100644
index 9ad1520..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Eclipse_6.1_187/Eplex/coinplex.cpp
-+++ Eclipse_6.1_187/Eplex/coinplex.cpp
-@@ -139,6 +139,7 @@
- #include <stdio.h>
- #include <exception>
- #include <string>
-+#include <cmath>
- using std::string;
- using namespace std;
-
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Oci-mkdir.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Oci-mkdir.patch
deleted file mode 100644
index c61d3e0..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Oci-mkdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Eclipse_6.1_187/Oci/Makefile.in
-+++ Eclipse_6.1_187/Oci/Makefile.in
-@@ -131,15 +131,15 @@
-
-
- $(ARCH)/dbi.o : dbi.h dbi.c
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(OPT_FLAGS) $(CFLAGS) $(CPPFLAGS) -c -o $(ARCH)/dbi.o dbi.c
-
- $(ARCH)/mysql.o: dbi.h mysql.c
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(OPT_FLAGS) $(CFLAGS) $(CPPFLAGS) $(MFLAGS) -c -o $(ARCH)/mysql.o mysql.c
-
- $(ARCH)/dbi_mysql.$(OBJ_SUFFIX): $(MOBJ)
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(DYLD) $(DYNLDFLAGS) \
- $(MOBJ) $(MLIBS) $(ELIBS) \
- -o $(ARCH)/dbi_mysql.$(OBJ_SUFFIX)
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch
deleted file mode 100644
index 5d2cc26..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-icparc_solvers.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- Eclipse_6.1_187/icparc_solvers/Makefile.in
-+++ Eclipse_6.1_187/icparc_solvers/Makefile.in
-@@ -47,7 +47,7 @@
- GMP_LD = @GMP_LD@
- FLOAT_ROUND_FLAGS = @FLOAT_ROUND_FLAGS@
-
--CPPFLAGS = -I. -I$(ECLIPSEDIR)/include/$(ARCH) -I$(ECLIPSEDIR)/Kernel/src -I- $(OS_INCLUDES)
-+CPPFLAGS = -fPIC -I. -I$(ECLIPSEDIR)/include/$(ARCH) -I$(top_srcdir)/Kernel/src -iquote $(OS_INCLUDES)
- STDCXXLIB = @STDCXXLIB@
- ECLIBS = -L$(ECLIPSEDIR)/lib/$(ARCH) -leclipse @LIBS@
-
-@@ -84,14 +84,14 @@
- ifeq ($(OSCLASS),win)
-
- $(ARCH)/edge_finder.dll: edge_finder.c
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(CPPFLAGS) $(CFLAGS) -shared -o $@ \
- $(<:.c=.def) $< $(ECLIBS)
-
- else
-
- $(ARCH)/edge_finder.$(OBJ_SUFFIX): edge_finder.c
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LOCAL_FLAGS) edge_finder.c \
- -c -o $(ARCH)/edge_finder.o
- $(DYLD) $(DYNLDFLAGS) $(GMP_LD) $(ECLIBS) \
-@@ -101,14 +101,14 @@
- ifeq ($(OSCLASS),win)
-
- $(ARCH)/edge_finder3.dll: edge_finder.c
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) -DSTRONG $(CPPFLAGS) $(CFLAGS) -shared -o $@ \
- $(<:.c=.def) $< $(ECLIBS)
-
- else
-
- $(ARCH)/edge_finder3.$(OBJ_SUFFIX): edge_finder3.c
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) -DSTRONG $(CPPFLAGS) $(CFLAGS) $(LOCAL_FLAGS) edge_finder3.c \
- -c -o $(ARCH)/edge_finder3.o
- $(DYLD) $(DYNLDFLAGS) $(GMP_LD) $(ECLIBS) \
-@@ -123,14 +123,14 @@
- ifeq ($(OSCLASS),win)
-
- $(ARCH)/bitmap.dll: bitmap.c
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(CPPFLAGS) $(CFLAGS) -shared -o $@ \
- $(<:.c=.def) $< $(ECLIBS)
-
- else
-
- $(ARCH)/bitmap.$(OBJ_SUFFIX): bitmap.c
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LOCAL_FLAGS) bitmap.c \
- -c -o $(ARCH)/bitmap.o
- $(DYLD) $(DYNLDFLAGS) $(GMP_LD) $(ECLIBS) \
-@@ -145,19 +145,19 @@
- ifeq ($(OSCLASS),win)
-
- $(ARCH)/ic.dll: ic.c $(ARCH)/bitmap.dll
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(CPPFLAGS) $(CFLAGS) -shared -o $@ \
- $(<:.c=.def) $< $(ARCH)/bitmap.dll $(ECLIBS)
- else
-
- $(ARCH)/ic.$(OBJ_SUFFIX): ic.c $(ARCH)/bitmap.$(OBJ_SUFFIX)
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(CPPFLAGS) $(CFLAGS) $(FLOAT_ROUND_FLAGS) \
- ic.c -c -o $(ARCH)/ic.o
- $(DYLD) $(DYNLDFLAGS) $(ECLIBS) $(GMP_LD) \
- $(ARCH)/ic.o $(ARCH)/bitmap.$(OBJ_SUFFIX) -o $(ARCH)/ic.$(OBJ_SUFFIX)
- #i386_linux/ic.so: ic2.c
--# [ -d i386_linux ] || mkdir i386_linux
-+# mkdir -p i386_linux
- # $(CC) -g $(CPPFLAGS) $(CFLAGS) -shared ic2.c $(ECLIBS) -o i386_linux/ic.so
-
- endif
-@@ -178,14 +178,14 @@
- ifeq ($(OSCLASS),win)
-
- $(ARCH)/eregex.dll: eregex.c $(ARCH)/libregex.a
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(CPPFLAGS) $(CFLAGS) -Irxspencer -shared -o $@ \
- $(<:.c=.def) $< $(ARCH)/libregex.a $(ECLIBS)
-
- else
-
- $(ARCH)/eregex.$(OBJ_SUFFIX): eregex.c
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LOCAL_FLAGS) eregex.c \
- -c -o $(ARCH)/eregex.o
- $(DYLD) $(DYNLDFLAGS) $(GMP_LD) $(ECLIBS) $(RXLIBS) \
-@@ -196,7 +196,7 @@
- # CAUTION: we build directly in the rxspencer directory, but the binary
- # libregex.a is moved after building to allow different architectures
- $(ARCH)/libregex.a:
-- [ -d $(ARCH) ] || mkdir $(ARCH)
-+ mkdir -p $(ARCH)
- ( cd rxspencer ; \
- CC="$(CC)" AR="$(AR)" $(MAKE) lib)
- mv rxspencer/libregex.a $(ARCH)/.
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-mysql.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-mysql.patch
deleted file mode 100644
index 7aa1c17..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-mysql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Eclipse_6.1_187/configure.ac
-+++ Eclipse_6.1_187/configure.ac
-@@ -1908,7 +1908,7 @@
- mysql_versions_requested="55 54 53 52 51 50"
- fi
- for version in $mysql_versions_requested; do
-- MYSQLDIR="$ECLIPSETHIRDPARTY/mysql$version/$ARCH"
-+ MYSQLDIR=${MYSQLDIR:-"$ECLIPSETHIRDPARTY/mysql$version/$ARCH"}
- if test -d "$MYSQLDIR"; then
- ALL_WITH_MYSQL=all_with_mysql
- ALL_CROSS_WITH_MYSQL=all_cross_with_mysql
diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch
deleted file mode 100644
index f378b61..0000000
--- a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-tcl8.6.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- Eclipse_6.1_187/RUNME
-+++ Eclipse_6.1_187/RUNME
-@@ -124,7 +124,7 @@
- }
-
-
--TCL_REQUIRED="8.5 8.4 8.3"
-+TCL_REQUIRED="8.6 8.5 8.4 8.3"
-
- usable_tcl() {
- [ -x "$TCL_WISH" -a \
-@@ -227,10 +227,10 @@
-
- case $ARCH in
- *_macosx)
-- ask "What is the version number of your Tcl/Tk installation (8.X) \n[Note that 8.5 prior to 8.5.7 was broken for ECLiPSe]" TCL_VERSION "8.3 8.4 8.5"
-+ ask "What is the version number of your Tcl/Tk installation (8.X) \n[Note that 8.5 prior to 8.5.7 was broken for ECLiPSe]" TCL_VERSION "8.3 8.4 8.5 8.6"
- ;;
- *)
-- ask "What is the version number of your Tcl/Tk installation (8.X)" TCL_VERSION "8.3 8.4 8.5"
-+ ask "What is the version number of your Tcl/Tk installation (8.X)" TCL_VERSION "8.3 8.4 8.5 8.6"
- ;;
- esac
-
---- Eclipse_6.1_187/configure.ac
-+++ Eclipse_6.1_187/configure.ac
-@@ -1296,7 +1296,7 @@
-
- if test "$tcl_requested" = "yes"; then
-
-- TCL_REQUIRED="8.5 8.4 8.3"
-+ TCL_REQUIRED="8.6 8.5 8.4 8.3"
-
- if test "$OSCLASS" != "win" ; then
- dnl find X includes and libraries
---- Eclipse_6.1_187/Kernel/src/Makefile.in
-+++ Eclipse_6.1_187/Kernel/src/Makefile.in
-@@ -94,7 +94,7 @@
- OPT_FLAGS_ARITH = @OPT_FLAGS_ARITH@
- LOCAL_FLAGS = @LOCAL_FLAGS@
- FLOAT_ROUND_FLAGS = @FLOAT_ROUND_FLAGS@
--CFLAGS = @CFLAGS@
-+CFLAGS = -DUSE_INTERP_RESULT @CFLAGS@
- OBJECTS_SUFFIX = @OBJECTS_SUFFIX@
- LIB_PREFIX = @LIB_PREFIX@
-
diff --git a/dev-util/eclipse-cpl/metadata.xml b/dev-util/eclipse-cpl/metadata.xml
deleted file mode 100644
index 2673404..0000000
--- a/dev-util/eclipse-cpl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-<use>
-<flag name="gecode">Bindings for dev-libs/gecode</flag>
-<flag name="coin">Bindings for COIN-OR Open Solver Interface</flag>
-<flag name="glpk">Bindings for COIN-OR OSI Gnu Linear Programming Kit</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-06-05 13:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-18 21:25 [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/ Michael Weber
-- strict thread matches above, loose matches on Subject: below --
2014-06-05 13:43 Michael Weber
2014-05-18 8:10 Michael Weber
2014-05-16 0:06 Michael Weber
2014-05-15 12:46 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox