Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
ea2fc97c
Commit
ea2fc97c
authored
1 year ago
by
Luis Guzmán
Browse files
Options
Downloads
Patches
Plain Diff
ncurses: fix #1035621 ncurses FTBFS issue.
parent
9dbe6eeb
No related branches found
No related tags found
1 merge request
!1224
ncurses: fix #1035621 ncurses FTBFS issue.
Pipeline
#1123
passed
1 year ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
helpers/DATA/ncurses/bbd46b3955647bf401325951d9f31db054e8d889.patch
+54
-0
54 additions, 0 deletions
...TA/ncurses/bbd46b3955647bf401325951d9f31db054e8d889.patch
helpers/make-ncurses
+5
-2
5 additions, 2 deletions
helpers/make-ncurses
with
59 additions
and
2 deletions
helpers/DATA/ncurses/bbd46b3955647bf401325951d9f31db054e8d889.patch
0 → 100644
+
54
−
0
View file @
ea2fc97c
From bbd46b3955647bf401325951d9f31db054e8d889 Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenjoac@gmx.de>
Date: Sun, 7 May 2023 13:54:13 +0200
Subject: [PATCH] Run autoconf-dickey rather than autoreconf-dickey in
debian/rules
Unfortunately autoreconf-dickey picks up and processes the quilt
backup file of configure.in below .pc/ directory. As the other
expected files are not present there, this fails and randomly leads to
FTBFS, depending on the order in which autoreconf-dickey processes the
directories.
As pointed out by Thomas Dickey, we do not need to run the whole
autotools machinery and can make do with autoconf-dickey which only
runs in one directory at a time. Since we should regenerate both
./configure and test/configure and dh_autoreconf may only be run once,
this needs to be done by a script, as suggested by the dh_autoreconf
manpage.
Closes: #1035621
---
debian/autoconf.sh | 5 +++++
debian/changelog | 9 +++++++++
debian/rules | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
create mode 100755 debian/autoconf.sh
diff --git a/debian/autoconf.sh b/debian/autoconf.sh
new file mode 100755
index 000000000..603b898a5
--- /dev/null
+++ b/debian/autoconf.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+
+autoconf-dickey
+cd test && autoconf-dickey
diff --git a/debian/rules b/debian/rules
index 9504f3977..8d7f83d00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -211,7 +211,7 @@
endif
config.guess-stamp:
dh_update_autotools_config
- dh_autoreconf autoreconf-dickey -- -f -i
+ dh_autoreconf debian/autoconf.sh
touch $@
$(objdir)/config.status: config.guess-stamp
--
GitLab
This diff is collapsed.
Click to expand it.
helpers/make-ncurses
+
5
−
2
View file @
ea2fc97c
...
...
@@ -23,7 +23,7 @@
# such packages from Debian in order to build the required udeb packages.
##
VERSION
=
1
VERSION
=
2
NETINST
=
true
BUILD_UNTIL
=
11.0
.
./config
...
...
@@ -32,7 +32,10 @@ BUILD_UNTIL=11.0
# Set version number due to source origin change
export
FULLVERSION
=
"
$(
sed
's|ubuntu0.1||'
<<<
$FULLVERSION
)
"
changelog
"Fetch and build as udeb dependency for debian-installer."
# Apply Debian#1035621: ncurses: FTBFS: dh_autoreconf error on various architectures
patch
--no-backup-if-mismatch
-p1
<
$DATA
/bbd46b3955647bf401325951d9f31db054e8d889.patch
changelog
"Rebuild as udeb dependency for debian-installer and patch dh_autoreconf."
head
-n1
debian/changelog |
grep
-q
ubuntu
&&
echo
"error: update upstream version"
&&
exit
compile
This diff is collapsed.
Click to expand it.
Luis Guzmán
@Ark74
mentioned in issue
#124 (closed)
·
1 year ago
mentioned in issue
#124 (closed)
mentioned in issue #124
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment