svn commit: r496273 - in head/devel/t1lib: . files
Larry Rosenman
ler at FreeBSD.org
Tue Mar 19 16:40:07 UTC 2019
Author: ler
Date: Tue Mar 19 16:40:05 2019
New Revision: 496273
URL: https://svnweb.freebsd.org/changeset/ports/496273
Log:
devel/t1lib: fix dependencies, parallel build.
If the X11 is on, xglyph and libt1x directly depend on various X libs.
These dependencies are missing from USE_XORG (noticed by stage-qa).
If any of those missing dependencies are removed, t1lib will break.
Relying on indirect dependencies is insufficient since those dependencies can change on their own.
PR: 236640
Submitted by: jcfyecrayz at liamekaens.com
Added:
head/devel/t1lib/files/
head/devel/t1lib/files/patch-Makefile.in (contents, props changed)
head/devel/t1lib/files/patch-lib-Makefile.in (contents, props changed)
Modified:
head/devel/t1lib/Makefile
Modified: head/devel/t1lib/Makefile
==============================================================================
--- head/devel/t1lib/Makefile Tue Mar 19 16:26:25 2019 (r496272)
+++ head/devel/t1lib/Makefile Tue Mar 19 16:40:05 2019 (r496273)
@@ -3,7 +3,7 @@
PORTNAME= t1lib
PORTVERSION= 5.1.2
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= SUNSITE/libs/graphics/
@@ -15,22 +15,17 @@ LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/LGPL
USES= cpe gmake libtool
-GNU_CONFIGURE= yes
-ALL_TARGET= without_doc
USE_LDCONFIG= yes
OPTIONS_DEFINE= X11 DOCS
OPTIONS_DEFAULT= X11
OPTIONS_SUB= yes
-X11_USE= XORG=xaw
+X11_USE= XORG=ice,sm,x11,xaw,xext,xmu,xpm,xt
X11_CONFIGURE_WITH= x
-# Build fails with:
-# gmake[2]: Entering directory '/wrkdirs/usr/ports/devel/t1lib/work/t1lib-5.1.2/lib'
-# gmake[2]: *** pselect jobs pipe: Bad file descriptor. Stop.
-# gmake[2]: *** Waiting for unfinished jobs....
-MAKE_JOBS_UNSAFE= YES
+ALL_TARGET= without_doc
+GNU_CONFIGURE= yes
post-patch:
@${REINPLACE_CMD} -e \
Added: head/devel/t1lib/files/patch-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/t1lib/files/patch-Makefile.in Tue Mar 19 16:40:05 2019 (r496273)
@@ -0,0 +1,47 @@
+add + for submake lines - needed by gmake for parallel building if $(MAKE) not used directly
+
+--- Makefile.in.orig 2007-12-23 15:49:43 UTC
++++ Makefile.in
+@@ -93,25 +93,25 @@ dependencies: dummy
+
+
+ $(DOCSUBDIRS): dummy
+- for i in $(DOCSUBDIRS); do \
++ +for i in $(DOCSUBDIRS); do \
+ (cd $$i; $(SUBMAKE) ) || exit 1; \
+ done
+
+
+ $(DUMMYSUBDIRS): dummy
+- for i in $(ALLSUBDIRS); do \
++ +for i in $(ALLSUBDIRS); do \
+ (cd $$i; $(SUBMAKE) ) || exit 1; \
+ done
+
+
+ install: dummy
+- for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \
++ +for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \
+ (cd $$i; $(MAKE) install) || exit 1; \
+ done
+
+
+ uninstall: dummy
+- for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \
++ +for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \
+ (cd $$i; $(MAKE) uninstall) || exit 1; \
+ done
+ $(RM) -Rf $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision)
+@@ -127,10 +127,10 @@ uninstall: dummy
+
+
+ clean: dummy
+- for i in $(ALLSUBDIRS); do \
++ +for i in $(ALLSUBDIRS); do \
+ (cd $$i; $(MAKE) clean) || exit 1; \
+ done
+- for i in $(DOCSUBDIRS); do \
++ +for i in $(DOCSUBDIRS); do \
+ (cd $$i; $(MAKE) clean) || exit 1; \
+ done
+
Added: head/devel/t1lib/files/patch-lib-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/t1lib/files/patch-lib-Makefile.in Tue Mar 19 16:40:05 2019 (r496273)
@@ -0,0 +1,43 @@
+specify libt1 as dependency for libt1x (for parallel builds)
+
+--- lib/Makefile.in.orig 2007-12-23 15:49:42 UTC
++++ lib/Makefile.in
+@@ -118,11 +118,11 @@ $(T1LIB_OBJS) $(T1LIBX_OBJS): t1lib_targ
+
+
+ type1_target:
+- @set -e; (cd type1; $(SUBMAKE) ) || exit 1
++ + at set -e; (cd type1; $(SUBMAKE) ) || exit 1
+
+
+ t1lib_target:
+- @set -e; (cd t1lib; $(SUBMAKE) ) || exit 1
++ + at set -e; (cd t1lib; $(SUBMAKE) ) || exit 1
+
+
+ libt1.la: $(TYPE1_OBJS) $(T1LIB_OBJS)
+@@ -133,7 +133,7 @@ libt1.la: $(TYPE1_OBJS) $(T1LIB_OBJS)
+ cp t1lib/t1lib.h .
+
+
+-libt1x.la: $(T1LIBX_OBJS)
++libt1x.la: $(T1LIBX_OBJS) libt1.la
+ $(LIBTOOL) --mode=link \
+ $(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \
+ -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
+@@ -145,13 +145,13 @@ libt1x.la: $(T1LIBX_OBJS)
+
+
+ dependencies: dummy
+- for i in $(LIBSUBDIRS); do \
++ +for i in $(LIBSUBDIRS); do \
+ (cd $$i; $(MAKE) dependencies) || exit 1; \
+ done
+
+
+ clean: dummy
+- for i in $(LIBSUBDIRS); do \
++ +for i in $(LIBSUBDIRS); do \
+ (cd $$i; $(MAKE) clean) || exit 1; \
+ done
+ -$(RM) -f libt1*.la libt1*.a libt1*.so* *~ t1lib*.h .libs/*
More information about the svn-ports-all
mailing list