tags 669522 patch thanks Lucas Nussbaum <lu...@lucas-nussbaum.net> writes:
> During a rebuild of all packages in sid, your package failed to build on > amd64. It should build fine with the attached patch. It was caused by libCgl.la no longer being shipped by coinor-libcgl-dev (see #633173). Vincent
diff -Nru coinor-cbc-2.5.0/debian/changelog coinor-cbc-2.5.0/debian/changelog --- coinor-cbc-2.5.0/debian/changelog 2011-12-21 21:37:09.000000000 +0100 +++ coinor-cbc-2.5.0/debian/changelog 2012-06-14 20:52:23.000000000 +0200 @@ -1,3 +1,11 @@ +coinor-cbc (2.5.0-2.4) unstable; urgency=low + + * Non-maintainer upload. + * patches/Makefile.diff: .la files are no longer shipped by some -dev + libraries. Link against them using -l instead. (Closes: #669522) + + -- Vincent Legout <vleg...@debian.org> Thu, 14 Jun 2012 20:50:26 +0200 + coinor-cbc (2.5.0-2.3) unstable; urgency=low * Non-maintainer upload. diff -Nru coinor-cbc-2.5.0/debian/patches/Makefile.diff coinor-cbc-2.5.0/debian/patches/Makefile.diff --- coinor-cbc-2.5.0/debian/patches/Makefile.diff 2009-09-24 15:52:59.000000000 +0200 +++ coinor-cbc-2.5.0/debian/patches/Makefile.diff 2012-06-14 20:36:09.000000000 +0200 @@ -1,7 +1,7 @@ -Index: coinor-cbc-2.3.1/Cbc/src/Makefile.in +Index: coinor-cbc-2.5.0/Cbc/src/Makefile.in =================================================================== ---- coinor-cbc-2.3.1.orig/Cbc/src/Makefile.in 2009-07-28 14:38:50.000000000 +0200 -+++ coinor-cbc-2.3.1/Cbc/src/Makefile.in 2009-09-24 15:43:37.000000000 +0200 +--- coinor-cbc-2.5.0.orig/Cbc/src/Makefile.in 2012-06-14 20:31:14.694313988 +0200 ++++ coinor-cbc-2.5.0/Cbc/src/Makefile.in 2012-06-14 20:36:01.774321892 +0200 @@ -59,7 +59,7 @@ @COIN_HAS_CLP_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \ @COIN_HAS_CLP_TRUE@ -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` @@ -17,8 +17,8 @@ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_10 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_10 = /usr/lib/libOsiClp.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ /usr/lib/libClp.la ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_10 = -lOsiClp \ ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ -lClp -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_11 = `cat $(CLPOBJDIR)/clp_addlibs.txt` +@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_11 = -lClp @@ -31,8 +31,8 @@ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_15 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@ $(DYLPOBJDIR)/src/Dylp/libDylp.la -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_15 = /usr/lib/libOsiDylp.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@ /usr/lib/libDylp.la ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_15 = -lOsiDylp \ ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@ -lDylp -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_16 = `cat $(DYLPOBJDIR)/dylp_addlibs.txt` +@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_16 = -lDylp @@ -44,7 +44,7 @@ @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym` -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_28 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_28 = /usr/lib/libOsiSym.la \ ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_28 = -lOsiSym \ @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@ $(SYMPHONYOBJDIR)/src/libSym.la @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_29 = `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt` @@ -53,15 +53,15 @@ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_31 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_31 = /usr/lib/libOsiVol.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ /usr/lib/libVol.la ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_31 = -lOsiVol \ ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ -lVol -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_32 = `cat $(VOLOBJDIR)/vol_addlibs.txt` +@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_32 = -lVol @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_33 = -I`$(CYGPATH_W) $(XPRINCDIR)` \ @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr` -@@ -190,11 +190,11 @@ +@@ -204,11 +204,11 @@ @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 = \ @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@ $(am__DEPENDENCIES_2) @COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbcSolver.la libCbc.la \ @@ -70,27 +70,27 @@ -@COIN_HAS_CLP_TRUE@ $(OSIOBJDIR)/src/libOsi.la \ -@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la \ -@COIN_HAS_CLP_TRUE@ $(COINUTILSOBJDIR)/src/libCoinUtils.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libCgl.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libOsiClp.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libOsi.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libClp.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libCoinUtils.la \ ++@COIN_HAS_CLP_TRUE@ -lCgl \ ++@COIN_HAS_CLP_TRUE@ -lClp \ ++@COIN_HAS_CLP_TRUE@ -lOsi \ ++@COIN_HAS_CLP_TRUE@ -lClp \ ++@COIN_HAS_CLP_TRUE@ -lCoinUtils \ @COIN_HAS_CLP_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \ CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \ -@@ -216,25 +216,25 @@ +@@ -230,25 +230,25 @@ @CBC_BUILD_CBC_GENERIC_TRUE@ CbcGenSolution.$(OBJEXT) \ @CBC_BUILD_CBC_GENERIC_TRUE@ CbcGenSolvers.$(OBJEXT) cbc_generic_OBJECTS = $(am_cbc_generic_OBJECTS) -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_4 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_4 = /usr/lib/libOsiClp.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ /usr/lib/libClp.la ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_4 = -lOsiClp \ ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ -lClp @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_5 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_6 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@ $(DYLPOBJDIR)/src/Dylp/libDylp.la -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_6 = /usr/lib/libOsiDylp.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@ /usr/lib/libDylp.la ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_6 = -lOsiDylp \ ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@ -lDylp @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_FMP_TRUE@am__DEPENDENCIES_7 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_8 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_9 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la @@ -100,31 +100,31 @@ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@ $(SYMPHONYOBJDIR)/src/libSym.la -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_13 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \ -@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__DEPENDENCIES_12 = /usr/lib/libOsiSym.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@ /usr/lib/libSym.la -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_13 = /usr/lib/libOsiVol.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ /usr/lib/libVol.la ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__DEPENDENCIES_12 = -lOsiSym \ ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@ -lSym ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_13 = -lOsiVol \ ++@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ -lVol @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_14 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_2) @CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES = \ @CBC_BUILD_CBC_GENERIC_TRUE@ libCbcSolver.la libCbc.la \ -@CBC_BUILD_CBC_GENERIC_TRUE@ $(CGLOBJDIR)/src/libCgl.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@ /usr/lib/libCgl.la \ ++@CBC_BUILD_CBC_GENERIC_TRUE@ -lCgl \ @CBC_BUILD_CBC_GENERIC_TRUE@ $(am__DEPENDENCIES_4) \ @CBC_BUILD_CBC_GENERIC_TRUE@ $(am__DEPENDENCIES_5) \ @CBC_BUILD_CBC_GENERIC_TRUE@ $(am__DEPENDENCIES_6) \ -@@ -247,8 +247,8 @@ +@@ -261,8 +261,8 @@ @CBC_BUILD_CBC_GENERIC_TRUE@ $(am__DEPENDENCIES_13) \ @CBC_BUILD_CBC_GENERIC_TRUE@ $(am__DEPENDENCIES_14) \ @CBC_BUILD_CBC_GENERIC_TRUE@ $(am__DEPENDENCIES_15) \ -@CBC_BUILD_CBC_GENERIC_TRUE@ $(OSIOBJDIR)/src/libOsi.la \ -@CBC_BUILD_CBC_GENERIC_TRUE@ $(COINUTILSOBJDIR)/src/libCoinUtils.la -+@CBC_BUILD_CBC_GENERIC_TRUE@ /usr/lib/libOsi.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@ /usr/lib/libCoinUtils.la ++@CBC_BUILD_CBC_GENERIC_TRUE@ -lOsi \ ++@CBC_BUILD_CBC_GENERIC_TRUE@ -lCoinUtils depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -389,9 +389,8 @@ +@@ -403,9 +403,8 @@ LDFLAGS = @LDFLAGS@ LIBEXT = @LIBEXT@ LIBOBJS = @LIBOBJS@ @@ -136,7 +136,7 @@ $(am__append_3) $(am__append_11) $(am__append_16) \ $(am__append_29) $(am__append_32) LIBTOOL = @LIBTOOL@ -@@ -598,18 +597,13 @@ +@@ -651,18 +650,13 @@ # Additional COIN libraries @COIN_HAS_CLP_TRUE@cbc_LDADD = libCbcSolver.la libCbc.la \ @@ -145,11 +145,11 @@ -@COIN_HAS_CLP_TRUE@ $(OSIOBJDIR)/src/libOsi.la \ -@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la \ -@COIN_HAS_CLP_TRUE@ $(COINUTILSOBJDIR)/src/libCoinUtils.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libCgl.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libOsiClp.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libOsi.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libClp.la \ -+@COIN_HAS_CLP_TRUE@ /usr/lib/libCoinUtils.la \ ++@COIN_HAS_CLP_TRUE@ -lCgl \ ++@COIN_HAS_CLP_TRUE@ -lOsiClp \ ++@COIN_HAS_CLP_TRUE@ -lOsi \ ++@COIN_HAS_CLP_TRUE@ -lClp \ ++@COIN_HAS_CLP_TRUE@ -lCoinUtils \ @COIN_HAS_CLP_TRUE@ $(am__append_5) $(am__append_6) -# Finally, the -rpath flag is used by libtool to make sure that the shared @@ -160,12 +160,12 @@ # List all source files for this executable, including headers @CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_SOURCES = \ @CBC_BUILD_CBC_GENERIC_TRUE@ CbcGenBaB.cpp \ -@@ -626,20 +620,15 @@ +@@ -679,20 +673,15 @@ # Finally the Osi Coin library (many of the above need it) @CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDADD = libCbcSolver.la \ @CBC_BUILD_CBC_GENERIC_TRUE@ libCbc.la \ -@CBC_BUILD_CBC_GENERIC_TRUE@ $(CGLOBJDIR)/src/libCgl.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@ /usr/lib/libCgl.la \ ++@CBC_BUILD_CBC_GENERIC_TRUE@ -lCgl \ @CBC_BUILD_CBC_GENERIC_TRUE@ $(am__append_10) $(am__append_13) \ @CBC_BUILD_CBC_GENERIC_TRUE@ $(am__append_15) $(am__append_18) \ @CBC_BUILD_CBC_GENERIC_TRUE@ $(am__append_20) $(am__append_22) \ @@ -179,8 +179,8 @@ -# library is found (in the lib install directory) when we are using dynamic -# libraries. -@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDFLAGS = -rpath $(libdir) -+@CBC_BUILD_CBC_GENERIC_TRUE@ /usr/lib/libOsi.la \ -+@CBC_BUILD_CBC_GENERIC_TRUE@ /usr/lib/libCoinUtils.la ++@CBC_BUILD_CBC_GENERIC_TRUE@ -lOsi \ ++@CBC_BUILD_CBC_GENERIC_TRUE@ -lCoinUtils # This line is necessary to allow VPATH compilation with MS compilers # on Cygwin
