commit: d6085e36d9586a45e3ba9f1250cca36704c56b00 Author: layman <layman <AT> localhost> AuthorDate: Tue Jul 8 15:09:16 2014 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Tue Jul 8 15:09:16 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=d6085e36
Version bump, parallel stuff Package-Manager: portage-2.2.10 Manifest-Sign-Key: --- dev-util/eclipse-clp/ChangeLog | 23 +++++ dev-util/eclipse-clp/Manifest | 14 +-- ....1.187-r1.ebuild => eclipse-clp-6.1.189.ebuild} | 99 +++++++++++++++------- ...1.187-AR.patch => eclipse-clp-6.1.189-AR.patch} | 0 .../files/eclipse-clp-6.1.189-Alog-64bit.patch | 42 +++++++++ ...ch => eclipse-clp-6.1.189-Eplex-Makefile.patch} | 0 ...tch => eclipse-clp-6.1.189-Eplex-include.patch} | 0 ...r.patch => eclipse-clp-6.1.189-Oci-mkdir.patch} | 0 .../files/eclipse-clp-6.1.189-Pds-64bit.patch | 61 +++++++++++++ .../files/eclipse-clp-6.1.189-Usc-64bit.patch | 42 +++++++++ ...ch => eclipse-clp-6.1.189-icparc_solvers.patch} | 0 ...mysql.patch => eclipse-clp-6.1.189-mysql.patch} | 0 ...l8.6.patch => eclipse-clp-6.1.189-tcl8.6.patch} | 0 .../files/eclipse-clp-6.1.189-weclipse.patch | 80 +++++++++++++++++ dev-util/eclipse-clp/metadata.xml | 1 + 15 files changed, 317 insertions(+), 45 deletions(-) diff --git a/dev-util/eclipse-clp/ChangeLog b/dev-util/eclipse-clp/ChangeLog index 5835420..f2d9d5f 100644 --- a/dev-util/eclipse-clp/ChangeLog +++ b/dev-util/eclipse-clp/ChangeLog @@ -1,3 +1,26 @@ +*eclipse-clp-6.1.189 (08 Jul 2014) + + 08 Jul 2014; Michael Weber <[email protected]> +eclipse-clp-6.1.189.ebuild, + +files/eclipse-clp-6.1.189-AR.patch, + +files/eclipse-clp-6.1.189-Alog-64bit.patch, + +files/eclipse-clp-6.1.189-Eplex-Makefile.patch, + +files/eclipse-clp-6.1.189-Eplex-include.patch, + +files/eclipse-clp-6.1.189-Oci-mkdir.patch, + +files/eclipse-clp-6.1.189-Pds-64bit.patch, + +files/eclipse-clp-6.1.189-Usc-64bit.patch, + +files/eclipse-clp-6.1.189-icparc_solvers.patch, + +files/eclipse-clp-6.1.189-mysql.patch, + +files/eclipse-clp-6.1.189-tcl8.6.patch, + +files/eclipse-clp-6.1.189-weclipse.patch, -eclipse-clp-6.1.187-r1.ebuild, + -files/eclipse-clp-6.1.187-AR.patch, + -files/eclipse-clp-6.1.187-Eplex-Makefile.patch, + -files/eclipse-clp-6.1.187-Eplex-include.patch, + -files/eclipse-clp-6.1.187-Oci-mkdir.patch, + -files/eclipse-clp-6.1.187-icparc_solvers.patch, + -files/eclipse-clp-6.1.187-mysql.patch, + -files/eclipse-clp-6.1.187-tcl8.6.patch, metadata.xml: + Version bump, parallel stuff + 20 May 2014; Michael Weber <[email protected]> eclipse-cpl-6.1.187.ebuild: revert to default use flags diff --git a/dev-util/eclipse-clp/Manifest b/dev-util/eclipse-clp/Manifest index f2e00fe..41c8302 100644 --- a/dev-util/eclipse-clp/Manifest +++ b/dev-util/eclipse-clp/Manifest @@ -1,13 +1 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST eclipse-clp-6.1.187.tar.gz 8624698 SHA256 cfddbdc4a45b6e8f8fbb1c0e36881264d2b68169d6fbaf55c09e9ddb66612a72 SHA512 ff14a81f7ae9b9ba0805016e856f01fdd9fa67edf0fe4a3048f375b82d1795f9ad52fd078da94da4ebf13aa269f5035dbbe15c119453949597942183e899152a WHIRLPOOL 5ae43380b0458814d94a9e7a5919d61ae1ad9cf12dbdf65f3c7c8b77f60498e3d5162d0f3a530992f6d4e1157b62b88420a54eda65d40562176ff6c5eff054c4 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iL4EAREIAGYFAlOQc8pfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl -bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky -N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JB4bAD+OzKNdI9HhyQ2w+psaQV7c188 -uaHE2ou6uFT85WrDfz4BAJMyVJg0sNsldFU2m/eA/bv3z59jjlhtnj5tvqp+qIjG -=zctd ------END PGP SIGNATURE----- +DIST eclipse-clp-6.1.189.tar.gz 8624838 SHA256 5fe428aab9b2d8251fefc8c8fb73a5edfafddde9f1f2f686ffd9bf24be35b0a3 SHA512 5ab804d59bbf3b9a59bf0af74e039d8781d8518d95c4e6c0e2af5c213dcb2ae08e3d789837fe2ff183b1229c91468041592c0dc8eef13370b5101e73a0b749d8 WHIRLPOOL 2012c3d068ad61634697e443d59a2906de8d1a3b4559a58857d094315ccc2c396cad56fd11f2cf5e77e27fc9bd7f8a1f4da0fab08595c6da14d60058d094c853 diff --git a/dev-util/eclipse-clp/eclipse-clp-6.1.187-r1.ebuild b/dev-util/eclipse-clp/eclipse-clp-6.1.189.ebuild similarity index 68% rename from dev-util/eclipse-clp/eclipse-clp-6.1.187-r1.ebuild rename to dev-util/eclipse-clp/eclipse-clp-6.1.189.ebuild index 0b1e1f5..a6e53ae 100644 --- a/dev-util/eclipse-clp/eclipse-clp-6.1.187-r1.ebuild +++ b/dev-util/eclipse-clp/eclipse-clp-6.1.189.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://eclipseclp.org/Distribution/${MY_PV}/src/${PN/-clp}_src.tgz -> $ LICENSE="${pn} LGPL-2.1" SLOT="0" KEYWORDS="~amd64" -IUSE="doc +coin +gecode +glpk +gmp java mysql tcl +threads" +IUSE="doc +coin +gecode +glpk +gmp java mysql parallel tcl +threads" RDEPEND="" DEPEND="${RDEPEND} @@ -33,7 +33,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/Eclipse_${MY_PV} -REQUIRED_USE="coin? ( gmp ) glpk? ( coin )" +REQUIRED_USE="coin? ( gmp ) glpk? ( coin ) parallel? ( tcl )" pkg_setup() { use gecode && ewarn gecode does not work yet @@ -58,22 +58,31 @@ src_prepare() { "${FILESDIR}"/${P}-AR.patch \ "${FILESDIR}"/${P}-Eplex-include.patch \ "${FILESDIR}"/${P}-icparc_solvers.patch \ - "${FILESDIR}"/${P}-Oci-mkdir.patch + "${FILESDIR}"/${P}-Oci-mkdir.patch \ + "${FILESDIR}"/${P}-Usc-64bit.patch \ + "${FILESDIR}"/${P}-Pds-64bit.patch \ + "${FILESDIR}"/${P}-Alog-64bit.patch \ + "${FILESDIR}"/${P}-weclipse.patch rm ARCH RUNME || die case "${ARCH}" in amd64) export ARCH=x86_64_linux ;; - x86) export ARCH=i386_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" + tc-export CC AR eautoreconf } src_configure() { + #pushd Pds/src >/dev/null + #ARCH=${PDS_ARCH} econf + #popd >/dev/null + local my_osi="--without-osi" if use coin ; then my_osi="--with-osi=symclp" @@ -100,21 +109,9 @@ src_configure() { } 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" + cat << EOF > "bin/${ARCH}/$1" #!/bin/sh export ECLIPSEDIR="\${ECLIPSEDIR:-${EROOT}opt/${PN}}" if [ -z "\${LD_LIBRARY_PATH}" ] ; then @@ -125,14 +122,46 @@ fi export JRE_HOME="\${JRE_HOME:-\${JAVA_HOME}}" $2 EOF - chmod +x "build/bin/${ARCH}/$1" + chmod +x "bin/${ARCH}/$1" } + mkdir -p "${S}/bin/${ARCH}" + + #replace toplevel Makefile.${ARCH}, -j1 bug etc. + rm -fv Makefile.${ARCH} || die + einfo "compile & install Shm" + emake -C Shm/${ARCH} PREFIX="${S}" install + + einfo "compile & install Usc (Micro Second Clock)" + pushd Usc + ./INSTALL || die + popd + + einfo "compile & install Alog" + pushd Alog + ./INSTALL || die + popd + + einfo "compile & install Pds (Parallel Distributed System)" + pushd Pds + ./INSTALL || die + popd + + einfo "compile & install Kernel" + emake -C Kernel/${ARCH} sepia + emake -C Kernel/${ARCH} PREFIX="${S}" install runme "eclipse" "exec \"\${ECLIPSEDIR}/lib/x86_64_linux/eclipse.exe\" \"\$@\"" - if use tcl ; then - einfo "install lib_tcl" - cp -pr lib_tcl "build" || die + if use parallel ; then + einfo "compile & install parallel Kernel" + emake -C Kernel/${ARCH} weclipse + cp -v {Kernel,lib}/${ARCH}/weclipse + runme "weclipse" "exec \"\${ECLIPSEDIR}/lib/x86_64_linux/weclipse\" \"\$@\"" + emake -C Kernel/${ARCH} peclipse + cp -v {Kernel,lib}/${ARCH}/weclipse + runme "peclipse" "exec \"\${ECLIPSEDIR}/lib/x86_64_linux/peclipse\" \"\$@\"" + fi + if use tcl ; then runme "tkeclipse" "exec wish \"\${ECLIPSEDIR}/lib_tcl/tkeclipse.tcl\" -- \"\$@\"" runme "tktools" "exec wish \"\${ECLIPSEDIR}/lib_tcl/tktools.tcl\" -- \"\$@\"" fi @@ -141,44 +170,50 @@ EOF #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 + emake -C Flexlm -f Makefile.${ARCH} PREFIX="${S}" install if use coin ; then einfo "compile & install Eplex" - emake -C Eplex -f Makefile.${ARCH} PREFIX="${S}/build" install -j1 + emake -C Eplex -f Makefile.${ARCH} PREFIX="${S}" 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}" install -j1 fi if use gecode ; then einfo "compile & install GecodeInterface" - emake -C GecodeInterface -f Makefile.${ARCH} PREFIX="${S}/build" install + emake -C GecodeInterface -f Makefile.${ARCH} PREFIX="${S}" install fi if use java ; then einfo "compile & install JavaInterface" - emake -C JavaInterface -f Makefile.${ARCH} PREFIX="${S}/build" install + emake -C JavaInterface -f Makefile.${ARCH} PREFIX="${S}" 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 + emake -C Visualisation -f Makefile.${ARCH} PREFIX="${S}" install fi if use mysql ; then einfo "compile & install Oci" - emake -C Oci -f Makefile.${ARCH} PREFIX="${S}/build" install -j1 + emake -C Oci -f Makefile.${ARCH} PREFIX="${S}" install -j1 fi } src_install() { - dodir /opt - mv "${S}/build" "${ED}opt/${PN}" || die - - local my_file + dodir /opt/${PN} + mv bin doc include legal lib "${ED}opt/${PN}" || die make_wrapper eclipse "${EROOT}opt/${PN}/bin/${ARCH}/eclipse" + if use tcl ; then + mv lib_tcl "${ED}opt/${PN}" || die make_wrapper tkeclipse "${EROOT}opt/${PN}/bin/${ARCH}/tkeclipse" make_wrapper tktools "${EROOT}opt/${PN}/bin/${ARCH}/tktools" fi + + if use parallel ; then + make_wrapper weclipse "${EROOT}opt/${PN}/bin/${ARCH}/weclipse" + make_wrapper peclipse "${EROOT}opt/${PN}/bin/${ARCH}/peclipse" + fi + if use java ; then make_wrapper jeclipse "${EROOT}opt/${PN}/bin/${ARCH}/jeclipse" fi diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.187-AR.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-AR.patch similarity index 100% rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.187-AR.patch rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.189-AR.patch diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Alog-64bit.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Alog-64bit.patch new file mode 100644 index 0000000..c204b17 --- /dev/null +++ b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Alog-64bit.patch @@ -0,0 +1,42 @@ +--- Eclipse_6.1_187/Alog/src/configure ++++ Eclipse_6.1_187/Alog/src/configure +@@ -531,8 +531,9 @@ + # + # UNIX variants + # +-CC=cc +-CFLAGS="-O" ++CC=${CC:-cc} ++AR=${AR:-ar} ++CFLAGS=${CFLAGS:-"-O"} + case "$ARCH" in + sun3) + ;; +@@ -556,7 +557,7 @@ + ;; + i386_sunos5) + ;; +- i386_linux) ++ i386_linux|x86_64_linux) + LIBS="-lieee $LIBS" + ;; + rs_aix32) +@@ -767,6 +768,7 @@ + s%@infodir@%$infodir%g + s%@mandir@%$mandir%g + s%@CC@%$CC%g ++s%@AR@%$AR%g + s%@ARCH@%$ARCH%g + s%@RANLIB@%$RANLIB%g + s%@SYS_DIR@%$SYS_DIR%g +--- Eclipse_6.1_187/Alog/src/Makefile.in ++++ Eclipse_6.1_187/Alog/src/Makefile.in +@@ -20,7 +20,7 @@ + + CCFLAGS = $(CFLAGS) $(IPATH) + +-AR = ar ruv ++AR = @AR@ ruv + RM = /bin/rm -f + CP = /bin/cp + diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.187-Eplex-Makefile.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Eplex-Makefile.patch similarity index 100% rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.187-Eplex-Makefile.patch rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Eplex-Makefile.patch diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.187-Eplex-include.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Eplex-include.patch similarity index 100% rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.187-Eplex-include.patch rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Eplex-include.patch diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.187-Oci-mkdir.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Oci-mkdir.patch similarity index 100% rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.187-Oci-mkdir.patch rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Oci-mkdir.patch diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Pds-64bit.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Pds-64bit.patch new file mode 100644 index 0000000..4cecb38 --- /dev/null +++ b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Pds-64bit.patch @@ -0,0 +1,61 @@ +--- Eclipse_6.1_187/Pds/src/configure ++++ Eclipse_6.1_187/Pds/src/configure +@@ -539,9 +539,10 @@ + # + # UNIX variants + # +-CC=cc ++CC=${CC:-cc} ++AR=${AR:-ar} + DFLAGS="-DTRUSTED -DNDEBUG -DINTERRUPT_SAFE -DBMSGLOG -DAMSGLOG -DALOG_TRACE" +-CFLAGS="-O" ++CFLAGS=${CFLAGS:-"-O"} + case "$ARCH" in + sun3) + ;; +@@ -569,7 +570,7 @@ + i386_sunos5) + LIBS="-lsocket -lnsl $LIBS" + ;; +- i386_linux) ++ i386_linux|x86_64_linux) + LIBS="-lieee $LIBS" + ;; + rs_aix32) +@@ -1368,6 +1369,7 @@ + s%@mandir@%$mandir%g + s%@CPP@%$CPP%g + s%@CC@%$CC%g ++s%@AR@%$AR%g + s%@DFLAGS@%$DFLAGS%g + s%@ARCH@%$ARCH%g + s%@RANLIB@%$RANLIB%g +--- Eclipse_6.1_187/Pds/src/Makefile.in ++++ Eclipse_6.1_187/Pds/src/Makefile.in +@@ -44,7 +44,7 @@ + + CCFLAGS = $(CFLAGS) $(DFLAGS) $(IPATH) + +-AR = ar ++AR = @AR@ + RM = /bin/rm -f + CP = /bin/cp + +--- Eclipse_6.1_187/Pds/src/pds.types.h ++++ Eclipse_6.1_187/Pds/src/pds.types.h +@@ -46,15 +46,6 @@ + typedef float pds_sp_float; + typedef double pds_dp_float; + +-#define INT8_MIN -0x80 +-#define INT8_MAX 0x7F +-#define INT16_MIN -0x8000 +-#define INT16_MAX 0x7FFF +-#define UINT16_MAX 0xFFFF +-#define INT32_MIN -0x80000000 +-#define INT32_MAX 0x7FFFFFFF +-#define UINT32_MAX 0xFFFFFFFF +- + #if HAVE_NO_VOID_PTR + typedef char * void_ptr; + #else diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Usc-64bit.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Usc-64bit.patch new file mode 100644 index 0000000..80a3d5e --- /dev/null +++ b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Usc-64bit.patch @@ -0,0 +1,42 @@ +--- Eclipse_6.1_187/Usc/src/configure ++++ Eclipse_6.1_187/Usc/src/configure +@@ -526,8 +526,9 @@ + # + # UNIX variants + # +-CC=cc +-CFLAGS="-O" ++CC=${CC:-cc} ++AR=${AR:-ar} ++CFLAGS=${CFLAGS:-"-O"} + case "$ARCH" in + sun3) + ;; +@@ -587,7 +588,7 @@ + EOF + + ;; +- i386_linux) ++ i386_linux|x86_64_linux) + LIBS="-lieee $LIBS" + ;; + rs_aix32) +@@ -950,6 +951,7 @@ + s%@mandir@%$mandir%g + s%@CPP@%$CPP%g + s%@CC@%$CC%g ++s%@AR@%$AR%g + s%@DFLAGS@%$DFLAGS%g + s%@ARCH@%$ARCH%g + s%@RANLIB@%$RANLIB%g +--- Eclipse_6.1_187/Usc/src/Makefile.in ++++ Eclipse_6.1_187/Usc/src/Makefile.in +@@ -18,7 +18,7 @@ + + CCFLAGS = $(CFLAGS) $(DFLAGS) + +-AR = ar ruv ++AR = @AR@ ruv + RM = /bin/rm -f + CP = /bin/cp + diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.187-icparc_solvers.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-icparc_solvers.patch similarity index 100% rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.187-icparc_solvers.patch rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.189-icparc_solvers.patch diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.187-mysql.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-mysql.patch similarity index 100% rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.187-mysql.patch rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.189-mysql.patch diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.187-tcl8.6.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-tcl8.6.patch similarity index 100% rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.187-tcl8.6.patch rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.189-tcl8.6.patch diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-weclipse.patch b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-weclipse.patch new file mode 100644 index 0000000..8f68e8d --- /dev/null +++ b/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-weclipse.patch @@ -0,0 +1,80 @@ +--- Eclipse_6.1_187/Kernel/src/scheduler.c ++++ Eclipse_6.1_187/Kernel/src/scheduler.c +@@ -31,6 +31,7 @@ + #include <stdio.h> + + #include "config.h" ++#include "ec_public.h" + + #include "pds.h" /* The Underlying Message Passing System */ + #include "memman.h" +--- Eclipse_6.1_189/Kernel/src/emu_par.c ++++ Eclipse_6.1_189/Kernel/src/emu_par.c +@@ -856,7 +856,7 @@ + while (po && b_aux >= bcommon) + { + while (IsGcFrame(BTop(b_aux)) +- || IsSmallFrame(BTop(b_aux)) ++ //|| IsSmallFrame(BTop(b_aux)) + || IsCatchFrame(BTop(b_aux)) + || IsExceptionFrame(BTop(b_aux))) + { +@@ -898,7 +898,7 @@ + while ( po && b_aux >= bcommon) + { + while (IsGcFrame(BTop(b_aux)) +- || IsSmallFrame(BTop(b_aux)) ++ //|| IsSmallFrame(BTop(b_aux)) + || IsCatchFrame(BTop(b_aux)) + || IsExceptionFrame(BTop(b_aux))) + { +--- Eclipse_6.1_189/Kernel/src/Makefile.in ++++ Eclipse_6.1_189/Kernel/src/Makefile.in +@@ -264,8 +264,8 @@ + $(CC) $(LDFLAGS) -L$(SYS_LIB) $(DEVSYS_OBJECTS) $(COMMON_OBJECTS) mps.o whereami.o $(PAR_LIBS) $(BASIC_LIBS) libdummies.a $(LIBS) -o $@ + + # An eclipse parallel worker (includes mps) +-weclipse: $(DEVSYS_OBJECTS) $(COMMON_OBJECTS) o parallel.o mps.o whereami.o libdummies.a +- $(CC) $(LDFLAGS) -L$(SYS_LIB) $(DEVSYS_OBJECTS) $(COMMON_OBJECTS) parallel.o mps.o whereami.o $(PAR_LIBS) $(BASIC_LIBS) libdummies.a $(LIBS) -o $@ ++weclipse: $(DEVSYS_OBJECTS) $(COMMON_OBJECTS) parallel.o mps.o whereami.o lib1.o lib2.o lib7.o ++ $(CC) $(LDFLAGS) -L$(SYS_LIB) $(DEVSYS_OBJECTS) $(COMMON_OBJECTS) parallel.o mps.o whereami.o $(PAR_LIBS) $(BASIC_LIBS) lib1.o lib2.o lib7.o $(LIBS) -o $@ + + # The worker manager + peclipse: wm.o whereami.o wm_interface.o eclipsedir.o os_support.o +@@ -463,12 +463,12 @@ + $(CC) $(OPT_FLAGS) $(FLOAT_ROUND_FLAGS) $(CFLAGS) $(CPPFLAGS) \ + -c $< + +-wm.o: wm.c +- $(CC) $(OPT_FLAGS) $(CFLAGS) $(CPPFLAGS) -c wm.c ++wm.o: ../src/wm.c ++ $(CC) $(OPT_FLAGS) $(CFLAGS) $(CPPFLAGS) -c ../src/wm.c + +-wm_interface.o: wm_interface.c ++wm_interface.o: ../src/wm_interface.c + $(CC) $(OPT_FLAGS) $(CFLAGS) $(CPPFLAGS) \ +- -c wm_interface.c ++ -c ../src/wm_interface.c + + + # +--- Eclipse_6.1_189/Kernel/src/wm.c ++++ Eclipse_6.1_189/Kernel/src/wm.c +@@ -87,6 +87,7 @@ + #include "trace.h" + #include "wm_msgs.h" + #include "wm_types.h" ++#include "os_support.h" + + /* #define DEBUG_MPS*/ + +--- Eclipse_6.1_189/Kernel/src/wm_interface.c ++++ Eclipse_6.1_189/Kernel/src/wm_interface.c +@@ -59,6 +59,7 @@ + #include "trace.h" + #include "wm_msgs.h" + #include "wm_types.h" ++#include "os_support.h" + + + /* Tcl/Tk includes */ diff --git a/dev-util/eclipse-clp/metadata.xml b/dev-util/eclipse-clp/metadata.xml index 2673404..543ab9f 100644 --- a/dev-util/eclipse-clp/metadata.xml +++ b/dev-util/eclipse-clp/metadata.xml @@ -9,5 +9,6 @@ <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> +<flag name="parallel">Build parallel engine</flag> </use> </pkgmetadata>
