Skip to content

Commit

Permalink
fix: restore static library for ncurses
Browse files Browse the repository at this point in the history
It was actually used in pkgs, so it should be brought back.

Add a patch to make `.a` libraries reproducible.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
  • Loading branch information
smira committed Aug 31, 2021
1 parent 01104e5 commit 5b9d214
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 2 deletions.
36 changes: 36 additions & 0 deletions ncurses/patches/reproducibility.patch
@@ -0,0 +1,36 @@
http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch?h=rocko

From 939c994f3756c2d6d3cab2e6a04d05fa7c2b1d56 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 16 Aug 2017 14:45:27 +0800
Subject: [PATCH 2/2] configure: reproducible

"configure" enforces -U for ar flags, breaking deterministic builds.
The flag was added to fix some vaguely specified "recent POSIX binutil
build problems" in 2015.

Upstream-Status: Pending
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>

Rebase to Rebase to 6.0+20170715

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 7d7d2c1..f444354 100755
--- a/configure
+++ b/configure
@@ -4458,7 +4458,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
else

cf_cv_ar_flags=unknown
- for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
+ for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
do

# check if $ARFLAGS already contains this choice
--
1.8.3.1
6 changes: 4 additions & 2 deletions ncurses/pkg.yaml
@@ -1,6 +1,7 @@
name: ncurses
dependencies:
- stage: base
- stage: patch
steps:
- sources:
- url: https://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz
Expand All @@ -12,6 +13,9 @@ steps:
prepare:
- |
tar -xzf ncurses.tar.gz --strip-components=1
patch -p1 < /pkg/patches/reproducibility.patch
mkdir build
cd build
Expand All @@ -32,8 +36,6 @@ steps:
- |
cd build
make DESTDIR=/rootfs install
rm /rootfs${TOOLCHAIN}/lib/*.a
finalize:
- from: /rootfs
to: /

0 comments on commit 5b9d214

Please sign in to comment.