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 <[email protected]> eclipse-cpl-6.1.187.ebuild: - revert to default use flags - - 20 May 2014; Michael Weber <[email protected]> eclipse-cpl-6.1.187.ebuild: - more non-parallel build - - 20 May 2014; Michael Weber <[email protected]> eclipse-cpl-6.1.187.ebuild: - fix tempdir - - 20 May 2014; Michael Weber <[email protected]> eclipse-cpl-6.1.187.ebuild: - make use of USE=coin - - 18 May 2014; Michael Weber <[email protected]> - +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 <[email protected]> eclipse-cpl-6.1.187.ebuild: - building version - - 18 May 2014; Michael Weber <[email protected]> - +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 <[email protected]> +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 <[email protected]> eclipse-cpl-6.1.187.ebuild: - second approach generating wrappers - - 15 May 2014; Michael Weber <[email protected]> eclipse-cpl-6.1.187.ebuild: - meh, no parallel build - -*eclipse-cpl-6.1.187 (15 May 2014) - - 15 May 2014; Michael Weber <[email protected]> +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>[email protected]</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>
