diff options
| author | wiz <wiz@pkgsrc.org> | 2022-03-30 07:09:57 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2022-03-30 07:09:57 +0000 |
| commit | 207358fd00a9fb54b717e7e5d501792b804e51b4 (patch) | |
| tree | c744397273ebbdbbb6a08e41f58657b3cfba80ad | |
| parent | 83af4475b72d97c5cc0a89f4dd0217324cf40c93 (diff) | |
| download | pkgsrc-207358fd00a9fb54b717e7e5d501792b804e51b4.tar.gz | |
libtecla: quote CPPFLAGS/LDFLAGS before passing them on.
Fixes build with whitespace in either of them.
Found with debugging help from rillig@
Remove gmake dependency, builds fine for me with BSD make.
| -rw-r--r-- | devel/libtecla/Makefile | 3 | ||||
| -rw-r--r-- | devel/libtecla/distinfo | 3 | ||||
| -rw-r--r-- | devel/libtecla/patches/patch-Makefile.in | 19 |
3 files changed, 22 insertions, 3 deletions
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile index 125ddb5969e..ae667ecb707 100644 --- a/devel/libtecla/Makefile +++ b/devel/libtecla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2020/03/15 23:41:54 tnn Exp $ +# $NetBSD: Makefile,v 1.18 2022/03/30 07:09:57 wiz Exp $ DISTNAME= libtecla-1.6.1 PKGREVISION= 4 @@ -12,7 +12,6 @@ COMMENT= Interactive command line editing facilities MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/${PKGBASE} -USE_TOOLS+= gmake GNU_CONFIGURE= yes BUILD_TARGET= default diff --git a/devel/libtecla/distinfo b/devel/libtecla/distinfo index 74304ec2546..c818a246fa7 100644 --- a/devel/libtecla/distinfo +++ b/devel/libtecla/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.10 2021/10/26 10:15:29 nia Exp $ +$NetBSD: distinfo,v 1.11 2022/03/30 07:09:57 wiz Exp $ BLAKE2s (libtecla-1.6.1.tar.gz) = eb4bc5ef10493a400f11bce594e8dc03ed76f8cb1c7a6cd2dae98886b1e61f16 SHA512 (libtecla-1.6.1.tar.gz) = 89d550868c99739b5cfd0ddba45f61d9a8fd1454c7044f29db6cced9cd1de83b895409706a8b85024d6c75678469a4b8b39dd184322d01e1ab6b5faf03c90fc7 Size (libtecla-1.6.1.tar.gz) = 518995 bytes +SHA1 (patch-Makefile.in) = c35528253258c5aa7a4cde643341e1cb71daaa32 SHA1 (patch-aa) = 11be4b3d36a8bfc3247db1999b0c0546d5994413 SHA1 (patch-configure) = 16200249075ab7379e3a0f03331b9265862742b0 diff --git a/devel/libtecla/patches/patch-Makefile.in b/devel/libtecla/patches/patch-Makefile.in new file mode 100644 index 00000000000..3d1be2d5dbf --- /dev/null +++ b/devel/libtecla/patches/patch-Makefile.in @@ -0,0 +1,19 @@ +$NetBSD: patch-Makefile.in,v 1.1 2022/03/30 07:09:58 wiz Exp $ + +Quote LDFLAGS/CPPFLAGS before passing them down. + +--- Makefile.in.orig 2004-10-31 20:30:57.000000000 +0000 ++++ Makefile.in +@@ -165,10 +165,10 @@ CFLAGS = $(OPT) $(WARNING_FLAGS) $(DEFIN + default: $(TARGETS) + + normal: +- @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS) ++ @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)' + + reentrant: +- @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS) ++ @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)' + + demos: normal + |