>From 64c9494ce37d76739b708167eca4f919f006eb0a Mon Sep 17 00:00:00 2001 From: Knut Petersen Date: Wed, 24 Jul 2019 11:36:12 +0200 Subject: [PATCH] NETPBM: Use defaults. We used the defaults anyway, but the way we used 'answer' broke on WSL. --- gub/specs/netpbm.py | 6 ++++-- .../netpbm-10-47.71-use-configure.pl-defaults | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 patches/netpbm-10-47.71-use-configure.pl-defaults diff --git a/gub/specs/netpbm.py b/gub/specs/netpbm.py index 3ba3f84fcb..b7ef79e520 100644 --- a/gub/specs/netpbm.py +++ b/gub/specs/netpbm.py @@ -3,12 +3,14 @@ from gub import tools class Netpbm__tools (tools.AutoBuild): source='https://sourceforge.net/projects/netpbm/files/super_stable/10.47.71/netpbm-10.47.71.tgz' + patches = [ + 'netpbm-10-47.71-use-configure.pl-defaults', + ] parallel_build_broken = True dependencies = ['flex', 'libjpeg', 'libpng', 'libtiff', 'zlib'] #libxml2? libx11-dev def configure (self): self.shadow () - self.dump ('\n'*3 + 'static\n' + '\n'*11, '%(builddir)s/answers') - self.system ('cd %(builddir)s && sh %(srcdir)s/configure < answers') + self.system ('cd %(builddir)s && sh %(srcdir)s/configure') make_flags = misc.join_lines (''' CC=gcc CFLAGS='-O2 -fPIC' diff --git a/patches/netpbm-10-47.71-use-configure.pl-defaults b/patches/netpbm-10-47.71-use-configure.pl-defaults new file mode 100644 index 0000000000..b4ec4fe06c --- /dev/null +++ b/patches/netpbm-10-47.71-use-configure.pl-defaults @@ -0,0 +1,20 @@ +--- netpbm-10.47.71/buildtools/configure.pl.old 2019-07-24 12:25:35.594244637 +0200 ++++ netpbm-10.47.71/buildtools/configure.pl 2019-07-24 12:26:13.526245251 +0200 +@@ -76,7 +76,7 @@ + + print("$prompt [$defaultPrompt] ==> "); + +- my $response = ; ++ my $response = "\n"; + + if (defined($response)) { + chomp($response); +@@ -306,7 +306,7 @@ + print("\n"); + + print("Hit ENTER to begin.\n"); +- my $response = ; ++ my $response = "\n"; + } + + -- 2.22.0