svn commit: r464388 - in head/math/abacus: . files

[Tobias Kortkamp]

On Tue, Mar 13, 2018, at 17:19, Pietro Cerutti wrote:
> Author: gahr
> Date: Tue Mar 13 16:19:22 2018
> New Revision: 464388
> URL: https://svnweb.freebsd.org/changeset/ports/464388
> 
> Log:
>   math/abacus: unbreak, undeprecate, bump
>   
>   PR:		199772
> 
> Modified:
>   head/math/abacus/Makefile
>   head/math/abacus/files/patch-Makefile
> 
> Modified: head/math/abacus/Makefile
> ==============================================================================
> --- head/math/abacus/Makefile	Tue Mar 13 15:06:22 2018	(r464387)
> +++ head/math/abacus/Makefile	Tue Mar 13 16:19:22 2018	(r464388)
> @@ -3,7 +3,7 @@
>  
>  PORTNAME=	abacus
>  DISTVERSION=	3.2betaU1
> -PORTREVISION=	8
> +PORTREVISION=	9
>  CATEGORIES=	math
>  MASTER_SITES=	http://www.informatik.uni-koeln.de/abacus/
>  
> @@ -12,9 +12,6 @@ COMMENT=	Branch-And-CUt System
>  
>  LICENSE=	LGPL21+
>  
> -DEPRECATED=	Unmaintained and has a broken shared library
> -EXPIRATION_DATE=	2018-03-31
> -
>  LIB_DEPENDS=	libClp.so:math/coinmp
>  
>  NO_WRKSUBDIR=	yes
> @@ -23,6 +20,7 @@ USES=		gmake perl5
>  USE_PERL5=	build
>  USE_LDCONFIG=	yes
>  ALL_TARGET=	abacus
> +CXXFLAGS+=	-fPIC
>  MAKE_ARGS=	CCC="${CXX}" PERL="${PERL}" STRIP="${STRIP_CMD} -x" \
>  		ARCHIVE="${AR} ${ARFLAGS}" CCFLAG_DEBOPT="${CXXFLAGS}" \
>  		OSI_INCLUDE="${LOCALBASE}/include/coin"
> 
> Modified: head/math/abacus/files/patch-Makefile
> ==============================================================================
> --- head/math/abacus/files/patch-Makefile	Tue Mar 13 15:06:22 2018	(r464387)
> +++ head/math/abacus/files/patch-Makefile	Tue Mar 13 16:19:22 2018	(r464388)
> @@ -1,5 +1,5 @@
> ---- Makefile.orig	2012-01-06 14:29:04.000000000 +0100
> -+++ Makefile	2013-09-05 14:35:52.000000000 +0200
> +--- Makefile.orig	2012-01-06 13:29:04 UTC
> ++++ Makefile
>  @@ -177,6 +177,11 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.cc
>   	$(CCC)  $(CCFLAGS) $(ADDFLAGS) -c $< -o $@
>   	$(STRIP) $@
> @@ -12,7 +12,7 @@
>   
>   #######################################################################
>   #
> -@@ -523,15 +524,20 @@
> +@@ -523,15 +528,22 @@ $(LIBDIR)/stuff/interface-osi.a: $(OSI_O
>   	$(ARCHIVE) $@ $(OSI_O)
>   
>   # The basic ABACUS library
> @@ -27,7 +27,9 @@
>   
>  +$(LIBDIR)/stuff/abacus-base.so.1: $(ABACUS_O:%.o=%.So)
>  +	rm -f $@
> -+	$(CCC) $(LDFLAGS) -shared -o $@ $(ABACUS_O:%.o=%.So)
> ++	$(CCC) $(LDFLAGS) -shared -o $@ $(ABACUS_O:%.o=%.So) \
> ++	    `find $(LIBDIR)/temp -name \*.o | xargs -n1` \
> ++	    `find $(LIBDIR)/stuff -name \*.o | xargs -n1` \
>  +
>   # Build the library distribution directory (lib and lib/stuff)
>  -lib-all: subdirs abacus-base lpif interface $(ADDITIONAL_LIB_ALL)
> @@ -35,7 +37,7 @@
>   
>   # Create a tar file containing all necessary stuff to compile ABACUS on
>   # a remote system.
> -@@ -571,6 +577,7 @@
> +@@ -571,6 +583,7 @@ have_lib = $(wildcard $(LIBDIR)/libabacu
>   
>   abacus: lib-all
>   	cp $(LIBDIR)/stuff/abacus-base.a $(LIBDIR)/libabacus-osi.a
> 

libabacus-osi.so is still missing a soname and it appears to still be broken even with this fix.
Now with different undefined references:

/usr/local/lib/libabacus-osi.so: undefined reference to `ABA_LPSUBOSI::ABA_LPSUBOSI(ABA_MASTER*, ABA_SUB*)'
/usr/local/lib/libabacus-osi.so: undefined reference to `ABA_LPMASTEROSI::ABA_LPMASTEROSI(ABA_MASTER*)'
cc: error: linker command failed with exit code 1 (use -v to see invocation)