[gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michael Weber" <xmw@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
Date: Sun, 18 May 2014 08:10:01 +0000 (UTC)	[thread overview]
Message-ID: <1400400589.f5efa292ef11c9442cbca075a17bde92994e8fbf.xmw@gentoo> (raw)

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>

next             reply	other threads:[~2014-05-18  8:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-18  8:10 Michael Weber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-06-05 13:43 [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/ Michael Weber
2014-05-18 21:25 Michael Weber
2014-05-16  0:06 Michael Weber
2014-05-15 12:46 Michael Weber

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:9fc9fa6 dfblob:e06bd28 dfblob:f5ab7a4 dfblob:66c81e1
dfblob:b4784da dfblob:9ad1520 dfblob:8549af6 dfblob:9d20a0b
dfblob:3fa08bd dfblob:561c35d dfblob:16bacaf dfblob:71da1de
dfblob:2673404 )
 OR (
bs:"[gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1400400589.f5efa292ef11c9442cbca075a17bde92994e8fbf.xmw@gentoo \
    --to=xmw@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox