Skip to content

Commit 296f0f1

Browse files
author
adam
committed
bash: properly install shared objects; pkglint fixes
1 parent 2138647 commit 296f0f1

File tree

6 files changed

+25
-9
lines changed

6 files changed

+25
-9
lines changed

shells/bash/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.107 2022/11/25 18:20:46 kre Exp $
1+
# $NetBSD: Makefile,v 1.108 2022/11/25 23:29:47 adam Exp $
22

33
BASH_VERSION= 5.2
44
BASH_PATCHLEVEL= 12
@@ -70,7 +70,7 @@ BUILDLINK_API_DEPENDS.readline+= readline>=7.0
7070
.include "../../devel/readline/buildlink3.mk"
7171
.endif
7272

73-
.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
73+
.if ${USE_CROSS_COMPILE:U:tl} == yes && ${OPSYS} == "NetBSD"
7474
CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
7575
CONFIGURE_ENV+= ac_cv_c_long_long=yes
7676
CONFIGURE_ENV+= ac_cv_c_long_double=yes

shells/bash/distinfo

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.75 2022/11/25 18:20:46 kre Exp $
1+
$NetBSD: distinfo,v 1.76 2022/11/25 23:29:47 adam Exp $
22

33
BLAKE2s (bash-5.2.tar.gz) = 430755ea2af4903dba2bdbeffd4d861edb9f54c248071362f0d14f15171764cd
44
SHA512 (bash-5.2.tar.gz) = 5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae
@@ -39,11 +39,12 @@ Size (bash52-011) = 1229 bytes
3939
BLAKE2s (bash52-012) = b980049d0314616909334aa332dbe55e7f2c4be0cab342a2b35342ca98d4c9af
4040
SHA512 (bash52-012) = 8f969cb36ee81ac47a4c3c6ee7fbe62159192fa4f14cb48973eccd55c458e6a093adc3045ee1c379544d8183d77813977a43cad5d225322d8816540a1cb8893b
4141
Size (bash52-012) = 9107 bytes
42-
SHA1 (patch-af) = e26e3209902247263884cfebc11a2f7e43245062
43-
SHA1 (patch-ag) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47
44-
SHA1 (patch-aj) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
42+
SHA1 (patch-Makefile.in) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
43+
SHA1 (patch-builtins_printf.def) = e26e3209902247263884cfebc11a2f7e43245062
44+
SHA1 (patch-builtins_psize.c) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47
4545
SHA1 (patch-builtins_ulimit.def) = 1390069344607204eb3abbd6ddeb148ff590c55e
4646
SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
47+
SHA1 (patch-examples_loadables_Makefile.in) = 0d27f82399c4ae9fae8ac0f8c48c68a23a3dcbd8
4748
SHA1 (patch-examples_loadables_fdflags.c) = dce409c76b7d6c838eb25c3ccc7a89ee57ca69b8
4849
SHA1 (patch-examples_loadables_getconf.c) = a71df9f54d77ee14de453b67bd4b3658ad7123eb
4950
SHA1 (patch-lib_malloc_malloc.c) = 6e500228972eac0cb4d4defb02e9cf573b7fa207

shells/bash/patches/patch-aj renamed to shells/bash/patches/patch-Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: patch-aj,v 1.2 2015/03/07 22:40:48 rodent Exp $
1+
$NetBSD: patch-Makefile.in,v 1.1 2022/11/25 23:29:47 adam Exp $
22

33
This patch fixes the build on MirBSD and OpenBSD, where LIBINTL and
44
LIBICONV are incorrectly set.

shells/bash/patches/patch-af renamed to shells/bash/patches/patch-builtins_printf.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: patch-af,v 1.8 2016/06/11 12:54:24 rillig Exp $
1+
$NetBSD: patch-builtins_printf.def,v 1.1 2022/11/25 23:29:47 adam Exp $
22

33
Fixes PRIdMAX and PRIuMAX on AIX < 5.1.
44

shells/bash/patches/patch-ag renamed to shells/bash/patches/patch-builtins_psize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: patch-ag,v 1.4 2016/06/11 12:54:24 rillig Exp $
1+
$NetBSD: patch-builtins_psize.c,v 1.1 2022/11/25 23:29:47 adam Exp $
22

33
Use the definition of errno from <errno.h>.
44

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
$NetBSD: patch-examples_loadables_Makefile.in,v 1.1 2022/11/25 23:29:47 adam Exp $
2+
3+
Correctly install shared objects (e.g. unstripped on some platforms).
4+
5+
--- examples/loadables/Makefile.in.orig 2022-11-25 23:21:05.000000000 +0000
6+
+++ examples/loadables/Makefile.in
7+
@@ -281,7 +281,7 @@ install-supported: all installdirs insta
8+
@echo installing example loadable builtins in $(DESTDIR)${loadablesdir}
9+
@for prog in ${ALLPROG}; do \
10+
echo $$prog ; \
11+
- $(INSTALL_PROGRAM) $(INSTALLMODE) $$prog $(DESTDIR)$(loadablesdir)/$$prog ;\
12+
+ ${BSD_INSTALL_LIB} $(INSTALLMODE) $$prog $(DESTDIR)$(loadablesdir)/$$prog ;\
13+
done
14+
15+
uninstall-dev:

0 commit comments

Comments
 (0)