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 <x...@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 <x...@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@ +
