commit: de6e357dc3d037cfd8d5c1b2974522d971fc2738
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Mon Feb 16 19:13:21 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Feb 16 19:13:21 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=de6e357d
provisionary version
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 62EEF090
---
dev-util/eclipse-clp/ChangeLog | 28 +++++++
dev-util/eclipse-clp/Manifest | 14 +++-
...p-6.1.189.ebuild => eclipse-clp-6.1.194.ebuild} | 89 +++++++++++++---------
...1.189-AR.patch => eclipse-clp-6.1.194-AR.patch} | 0
....patch => eclipse-clp-6.1.194-Alog-64bit.patch} | 0
...ch => eclipse-clp-6.1.194-Eplex-Makefile.patch} | 59 +++++++++-----
...tch => eclipse-clp-6.1.194-Eplex-include.patch} | 0
...r.patch => eclipse-clp-6.1.194-Oci-mkdir.patch} | 0
...t.patch => eclipse-clp-6.1.194-Pds-64bit.patch} | 0
.../eclipse-clp-6.1.194-Shm-buildsystem.patch | 10 +++
...t.patch => eclipse-clp-6.1.194-Usc-64bit.patch} | 0
...ch => eclipse-clp-6.1.194-icparc_solvers.patch} | 0
...mysql.patch => eclipse-clp-6.1.194-mysql.patch} | 0
...l8.6.patch => eclipse-clp-6.1.194-tcl8.6.patch} | 0
...se.patch => eclipse-clp-6.1.194-weclipse.patch} | 0
15 files changed, 144 insertions(+), 56 deletions(-)
diff --git a/dev-util/eclipse-clp/ChangeLog b/dev-util/eclipse-clp/ChangeLog
index f2d9d5f..8e1b914 100644
--- a/dev-util/eclipse-clp/ChangeLog
+++ b/dev-util/eclipse-clp/ChangeLog
@@ -1,3 +1,31 @@
+*eclipse-clp-6.1.194 (16 Feb 2015)
+
+ 16 Feb 2015; Michael Weber <x...@gentoo.org> +eclipse-clp-6.1.194.ebuild,
+ +files/eclipse-clp-6.1.194-AR.patch,
+ +files/eclipse-clp-6.1.194-Alog-64bit.patch,
+ +files/eclipse-clp-6.1.194-Eplex-Makefile.patch,
+ +files/eclipse-clp-6.1.194-Eplex-include.patch,
+ +files/eclipse-clp-6.1.194-Oci-mkdir.patch,
+ +files/eclipse-clp-6.1.194-Pds-64bit.patch,
+ +files/eclipse-clp-6.1.194-Shm-buildsystem.patch,
+ +files/eclipse-clp-6.1.194-Usc-64bit.patch,
+ +files/eclipse-clp-6.1.194-icparc_solvers.patch,
+ +files/eclipse-clp-6.1.194-mysql.patch,
+ +files/eclipse-clp-6.1.194-tcl8.6.patch,
+ +files/eclipse-clp-6.1.194-weclipse.patch, -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:
+ provisionary version
+
*eclipse-clp-6.1.189 (08 Jul 2014)
08 Jul 2014; Michael Weber <x...@gentoo.org> +eclipse-clp-6.1.189.ebuild,
diff --git a/dev-util/eclipse-clp/Manifest b/dev-util/eclipse-clp/Manifest
index 41c8302..d6795ba 100644
--- a/dev-util/eclipse-clp/Manifest
+++ b/dev-util/eclipse-clp/Manifest
@@ -1 +1,13 @@
-DIST eclipse-clp-6.1.189.tar.gz 8624838 SHA256
5fe428aab9b2d8251fefc8c8fb73a5edfafddde9f1f2f686ffd9bf24be35b0a3 SHA512
5ab804d59bbf3b9a59bf0af74e039d8781d8518d95c4e6c0e2af5c213dcb2ae08e3d789837fe2ff183b1229c91468041592c0dc8eef13370b5101e73a0b749d8
WHIRLPOOL
2012c3d068ad61634697e443d59a2906de8d1a3b4559a58857d094315ccc2c396cad56fd11f2cf5e77e27fc9bd7f8a1f4da0fab08595c6da14d60058d094c853
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST eclipse-clp-6.1.194.tar.gz 8619283 SHA256
ebf740c6b3d0b84bdbf69616f42480aacccf55285019f4c3b1f051b029f3a094 SHA512
1c45a3a76bcaff9ea365fee83177b93ccaecae193f61d556d60bc5e251ccb174dca4e15fd33c953270fa22628612254197d92dee022ba51184f1fbec66a4c6aa
WHIRLPOOL
76e3838150ca72d16950f5fdc44435ffb786c3bc77f440e184c2d9fb5466aaf5eccabe097269002c0aeee5a87350b3281fce59f2ead79b65a28845288520cf7a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iL4EAREIAGYFAlTiQVFfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JAr1QD/QFTsewRG8NYdY20q0CtdOXH7
+U/K4BnJkfenx2484HBkBAJLx3BP1H19GxSnWZ0UGC2NswakWs2Wfw3Lo9ADUsAII
+=v71P
+-----END PGP SIGNATURE-----
diff --git a/dev-util/eclipse-clp/eclipse-clp-6.1.189.ebuild
b/dev-util/eclipse-clp/eclipse-clp-6.1.194.ebuild
similarity index 75%
rename from dev-util/eclipse-clp/eclipse-clp-6.1.189.ebuild
rename to dev-util/eclipse-clp/eclipse-clp-6.1.194.ebuild
index a6e53ae..6172279 100644
--- a/dev-util/eclipse-clp/eclipse-clp-6.1.189.ebuild
+++ b/dev-util/eclipse-clp/eclipse-clp-6.1.194.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -17,6 +17,8 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="doc +coin +gecode +glpk +gmp java mysql parallel tcl +threads"
+#Braucht gmp 4.2 4.1, vmtl dev-libs/gmp:3
+#[doc] brauch wohl hevea: dev-tex/hevea
RDEPEND=""
DEPEND="${RDEPEND}
gmp? ( dev-libs/gmp )
@@ -62,7 +64,8 @@ src_prepare() {
"${FILESDIR}"/${P}-Usc-64bit.patch \
"${FILESDIR}"/${P}-Pds-64bit.patch \
"${FILESDIR}"/${P}-Alog-64bit.patch \
- "${FILESDIR}"/${P}-weclipse.patch
+ "${FILESDIR}"/${P}-weclipse.patch \
+ "${FILESDIR}"/${P}-Shm-buildsystem.patch
rm ARCH RUNME || die
@@ -73,15 +76,24 @@ src_prepare() {
esac
export ECLIPSEDIR=${EROOT}opt/${PN}
export MYSQLDIR="${EROOT}usr/include/mysql"
- export prefix="${S}/build"
+ #export prefix="${S}/build"
tc-export CC AR
eautoreconf
+
+ pushd Shm/src >/dev/null
+ eautoreconf
+ popd >/dev/null
}
src_configure() {
- #pushd Pds/src >/dev/null
- #ARCH=${PDS_ARCH} econf
- #popd >/dev/null
+ my_submods="Shm Usc Alog Pds"
+ local my_submod
+ for my_submod in ${my_submods}; do
+ einfo "configure ${my_submod}"
+ pushd ${my_submod}/src >/dev/null || die
+ econf
+ popd >/dev/null || die
+ done
local my_osi="--without-osi"
if use coin ; then
@@ -109,9 +121,29 @@ src_configure() {
}
src_compile() {
+ #replace toplevel Makefile.${ARCH}, -j1 bug etc.
+ rm -fv Makefile.${ARCH} || die
+ mkdir -p sys_{include,{bin,lib}/${ARCH}} || die
+
+ local my_out
+ local my_submod
+ for my_submod in ${my_submods}; do
+ einfo "compile and install ${my_submod}"
+ mkdir -p $my_submod/{include,{bin,lib}/${ARCH}} || die
+ case $my_submod in
+ Pds) emake -C ${my_submod}/src install_all ;;
+ *) emake -C ${my_submod}/src install ;;
+ esac
+ for my_out in $(find ${my_submod}/{include,{bin,lib}/${ARCH}}
-type f) ; do
+ mv -vn ${my_out} sys_${my_out/${my_submod}\/} || die
+ done
+ done
+
runme() {
einfo "create wrapper $1"
- cat << EOF > "bin/${ARCH}/$1"
+ local my_dst="build/bin/${ARCH}/$1"
+ mkdir -p "$(dirname "${my_dest}")" || die
+ cat << EOF > "${my_dest}"
#!/bin/sh
export ECLIPSEDIR="\${ECLIPSEDIR:-${EROOT}opt/${PN}}"
if [ -z "\${LD_LIBRARY_PATH}" ] ; then
@@ -122,43 +154,26 @@ fi
export JRE_HOME="\${JRE_HOME:-\${JAVA_HOME}}"
$2
EOF
- chmod +x "bin/${ARCH}/$1"
+ chmod +x "${my_dest}" || die
}
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"
+ einfo "compile installation kernel (sepia)"
emake -C Kernel/${ARCH} sepia
- emake -C Kernel/${ARCH} PREFIX="${S}" install
- runme "eclipse" "exec \"\${ECLIPSEDIR}/lib/x86_64_linux/eclipse.exe\"
\"\$@\""
+ einfo "compile runtime kernel (eclipse.exe)"
+ emake -C Kernel/${ARCH} eclipse.exe
+ einfo "install kernel and header files"
+ emake -C Kernel/${ARCH} PREFIX="../../build" install
+ runme "eclipse" "exec \"\${ECLIPSEDIR}/lib/${ARCH}/eclipse.exe\"
\"\$@\""
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\" \"\$@\""
+ runme "weclipse" "exec \"\${ECLIPSEDIR}/lib/${ARCH}/weclipse\"
\"\$@\""
emake -C Kernel/${ARCH} peclipse
- cp -v {Kernel,lib}/${ARCH}/weclipse
- runme "peclipse" "exec
\"\${ECLIPSEDIR}/lib/x86_64_linux/peclipse\" \"\$@\""
+ cp -v {Kernel,lib}/${ARCH}/peclipse
+ runme "peclipse" "exec \"\${ECLIPSEDIR}/lib/${ARCH}/peclipse\"
\"\$@\""
fi
if use tcl ; then
@@ -170,7 +185,7 @@ 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}" install
+ emake -C Flexlm -f Makefile.${ARCH} PREFIX="../build" install
if use coin ; then
einfo "compile & install Eplex"
@@ -199,8 +214,8 @@ EOF
}
src_install() {
- dodir /opt/${PN}
- mv bin doc include legal lib "${ED}opt/${PN}" || die
+ mkdir "${ED}"opt || die
+ mv build "${ED}opt/${PN}" || die
make_wrapper eclipse "${EROOT}opt/${PN}/bin/${ARCH}/eclipse"
if use tcl ; then
diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-AR.patch
b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-AR.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-AR.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-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.194-Alog-64bit.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Alog-64bit.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Alog-64bit.patch
diff --git
a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Eplex-Makefile.patch
b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Eplex-Makefile.patch
similarity index 77%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Eplex-Makefile.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Eplex-Makefile.patch
index f069c70..fcd84cd 100644
--- a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Eplex-Makefile.patch
+++ b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Eplex-Makefile.patch
@@ -1,6 +1,6 @@
---- Eclipse_6.1_187/configure.ac
-+++ Eclipse_6.1_187/configure.ac
-@@ -1494,7 +1494,7 @@
+--- Eclipse_6.1_194/configure.ac
++++ Eclipse_6.1_194/configure.ac
+@@ -1498,7 +1498,7 @@
AC_ARG_WITH([osi], [[ --with-osi[=versions]
Build ECLiPSe interface to COIN-OR Osi. You can
@@ -9,7 +9,7 @@
Default is to build all available versions.
]],
[osi_versions_requested="$withval"], [osi_versions_requested=yes])
-@@ -1504,34 +1504,22 @@
+@@ -1508,34 +1508,22 @@
OSICLP_ADDDEF=""
if test "$osi_versions_requested" != "no"; then
if test "$osi_versions_requested" = "yes"; then
@@ -58,8 +58,15 @@
done
fi
if test -n "$OSI_VERSIONS"; then
---- Eclipse_6.1_187/Eplex/Makefile.in
-+++ Eclipse_6.1_187/Eplex/Makefile.in
+@@ -2115,4 +2103,4 @@
+ AC_SUBST(JHELP_DIR)
+ AC_SUBST(JAVA_PATH_SEP)
+
+-AC_OUTPUT
+\ No newline at end of file
++AC_OUTPUT
+--- Eclipse_6.1_194/Eplex/Makefile.in
++++ Eclipse_6.1_194/Eplex/Makefile.in
@@ -96,34 +96,31 @@
SYMCLPDIR = @SYMCLPDIR@
OSIGLPKDIR = @OSIGLPKDIR@
@@ -120,53 +127,69 @@
#----------------------------------------------------------------------
# EPLEX/CPLEX
-@@ -308,35 +303,25 @@
+@@ -308,47 +305,33 @@
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
+- $(DYLD) $(DYNLDFLAGS) 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
++ $(DYLD) $(DYNLDFLAGS) 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
+- $(DYLD) $(DYNLDFLAGS) 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
++ $(DYLD) $(DYNLDFLAGS) 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
+- $(DYLD) $(DYNLDFLAGS) 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
++ $(DYLD) $(DYNLDFLAGS) 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
+- $(DYLD) $(DYNLDFLAGS) 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
++ $(DYLD) $(DYNLDFLAGS) 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
+- $(DYLD) $(DYNLDFLAGS) 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
++ $(DYLD) $(DYNLDFLAGS) eplex.o
$(THIRDPARTY)/cplex122/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS)
-lpthread -o x86_64_linux/secplex122.so
+
+-x86_64_linux/secplex124.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
++x86_64_linux/secplex124.so: dir_x86_64_linux eplex.c eplex_cplex.h
eplex_cplex.c eplex.h
+ $(CC) -DCPLEX=12 -DCPLEXMINOR=4 $(CPPFLAGS) $(CFLAGS)
-I$(THIRDPARTY)/cplex124/include/ilcplex -c eplex.c
+- $(CC) -shared eplex.o
$(THIRDPARTY)/cplex124/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/secplex124.so
++ $(CC) -shared eplex.o
$(THIRDPARTY)/cplex124/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS)
-lpthread -o x86_64_linux/secplex124.so
+
+-x86_64_linux/secplex126.so: eplex.c eplex_cplex.h eplex_cplex.c eplex.h
++x86_64_linux/secplex126.so: dir_x86_64_linux eplex.c eplex_cplex.h
eplex_cplex.c eplex.h
+ $(CC) -DCPLEX=12 -DCPLEXMINOR=6 $(CPPFLAGS) $(CFLAGS)
-I$(THIRDPARTY)/cplex126/include/ilcplex -c eplex.c
+- $(CC) -shared eplex.o
$(THIRDPARTY)/cplex126/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/secplex126.so
++ $(CC) -shared eplex.o
$(THIRDPARTY)/cplex126/lib/x86_64_linux/static_pic/libcplex.a $(ECLIBS)
-lpthread -o x86_64_linux/secplex126.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 @@
+@@ -682,24 +665,19 @@
# - we add . to the library path because some libraries might not yet
# be installed in ECLIPSEDIR/lib at [fi]compile time
diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Eplex-include.patch
b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Eplex-include.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Eplex-include.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Eplex-include.patch
diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Oci-mkdir.patch
b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Oci-mkdir.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Oci-mkdir.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-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.194-Pds-64bit.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Pds-64bit.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Pds-64bit.patch
diff --git
a/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Shm-buildsystem.patch
b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Shm-buildsystem.patch
new file mode 100644
index 0000000..2abb90a
--- /dev/null
+++ b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Shm-buildsystem.patch
@@ -0,0 +1,10 @@
+--- Shm/src/configure.in
++++ Shm/src/configure.in
+@@ -201,5 +201,7 @@
+ AC_SUBST(ARCH)
+ AC_SUBST(LOCK)
+ AC_SUBST(S_TO_O)
++AC_SUBST(AR)
++AC_SUBST(OPT_FLAGS)
+
+ AC_OUTPUT(Makefile)
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.194-Usc-64bit.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-Usc-64bit.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-Usc-64bit.patch
diff --git
a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-icparc_solvers.patch
b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-icparc_solvers.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-icparc_solvers.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-icparc_solvers.patch
diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-mysql.patch
b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-mysql.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-mysql.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-mysql.patch
diff --git a/dev-util/eclipse-clp/files/eclipse-clp-6.1.189-tcl8.6.patch
b/dev-util/eclipse-clp/files/eclipse-clp-6.1.194-tcl8.6.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-tcl8.6.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-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.194-weclipse.patch
similarity index 100%
rename from dev-util/eclipse-clp/files/eclipse-clp-6.1.189-weclipse.patch
rename to dev-util/eclipse-clp/files/eclipse-clp-6.1.194-weclipse.patch
