Date: Mon, 2 Sep 2013 18:28:34 +0200 (CEST) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/181759: [patch] graphics/SciPlot: fix build on current Message-ID: <201309021628.r82GSY7h055819@kalimero.tijl.coosemans.org> Resent-Message-ID: <201309021630.r82GU0jf082039@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181759 >Category: ports >Synopsis: [patch] graphics/SciPlot: fix build on current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Sep 02 16:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Tijl Coosemans >Release: FreeBSD 10.0-CURRENT i386 >Organization: >Environment: >Description: Fails to build on current: http://pb2.nyi.freebsd.org/bulk/nogcc-default/2013-09-01_22h32m11s/logs/errors/SciPlot-1.36_3.log >How-To-Repeat: >Fix: Modify patch-Imakefile to use MOTIFLIBS again instead of MOTIFLIB. Include -lXt and -lX11 in MOTIFLIBS. This fixes the build on current where all required libraries need to be explicitly linked in. --- sciplot.patch begins here --- Index: graphics/SciPlot/Makefile =================================================================== --- graphics/SciPlot/Makefile (revision 325982) +++ graphics/SciPlot/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= SciPlot PORTVERSION= 1.36 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= widgets @@ -12,7 +12,7 @@ MAINTAINER= thierry@FreeBSD.org COMMENT= Full-featured Xt widget to display 2D data in a graph USES= imake motif -USE_XORG= xp +USE_XORG= xp xt x11 MAKE_ENV= EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME} USE_LDCONFIG= yes Index: graphics/SciPlot/files/patch-Imakefile =================================================================== --- graphics/SciPlot/files/patch-Imakefile (revision 325982) +++ graphics/SciPlot/files/patch-Imakefile (working copy) @@ -18,7 +18,7 @@ MOTIFDEPS = $(DEPXMLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) -MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB) -+# MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB) ++MOTIFLIBS = $(MOTIFLIB) $(XTOOLONLYLIB) $(XONLYLIB) SYS_LIBRARIES = -lm CDEBUGFLAGS = @@ -32,20 +32,15 @@ SRCS = SciPlot.c SciPlotUtil.c xyplot.c realtime.c HDRS = SciPlot.h SciPlotP.h SciPlotUtil.h OBJS = $(SRCS:.c=.o) -@@ -54,10 +58,10 @@ +@@ -54,7 +58,7 @@ $(HDOC) $*.hdoc > $*.html -AllTarget(sciplot realtime) +AllTarget(sciplot realtime libs) --NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES)) --NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES)) -+NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIB),$(SYS_LIBRARIES)) -+NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIB),$(SYS_LIBRARIES)) - - doc: $(HOBJS) $(HDOC) - @echo "Updated html." + NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES)) + NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES)) @@ -79,9 +83,16 @@ tar cfv $(TARFILE).tar $(TARFILES) compress $(TARFILE).tar @@ -54,7 +49,7 @@ + $(AR) $(LIBNAME).a $(WIDGET).o $(WIDGET)Util.o + $(RANLIB) $(LIBNAME).a + $(CC) $(SHLIBLDFLAGS) -o $(SONAME).$(SONUM) $(WIDGET).o $(WIDGET)Util.o \ -+ $(LDFLAGS) $(MOTIFLIB) $(LDLIBS) ++ $(LDFLAGS) $(MOTIFLIBS) $(LDLIBS) + # Dependencies: --- sciplot.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309021628.r82GSY7h055819>