pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/shells/bash bash: properly install shared objects; pkg...
details: https://anonhg.NetBSD.org/pkgsrc/rev/eb3371dd9a49
branches: trunk
changeset: 388748:eb3371dd9a49
user: adam <adam%pkgsrc.org@localhost>
date: Fri Nov 25 23:29:47 2022 +0000
description:
bash: properly install shared objects; pkglint fixes
diffstat:
shells/bash/Makefile | 4 +-
shells/bash/distinfo | 9 +-
shells/bash/patches/patch-Makefile.in | 25 +++++++
shells/bash/patches/patch-af | 56 ----------------
shells/bash/patches/patch-ag | 17 ----
shells/bash/patches/patch-aj | 25 -------
shells/bash/patches/patch-builtins_printf.def | 56 ++++++++++++++++
shells/bash/patches/patch-builtins_psize.c | 17 ++++
shells/bash/patches/patch-examples_loadables_Makefile.in | 15 ++++
9 files changed, 120 insertions(+), 104 deletions(-)
diffs (282 lines):
diff -r 691c395e180b -r eb3371dd9a49 shells/bash/Makefile
--- a/shells/bash/Makefile Fri Nov 25 22:21:32 2022 +0000
+++ b/shells/bash/Makefile Fri Nov 25 23:29:47 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2022/11/25 18:20:46 kre Exp $
+# $NetBSD: Makefile,v 1.108 2022/11/25 23:29:47 adam Exp $
BASH_VERSION= 5.2
BASH_PATCHLEVEL= 12
@@ -70,7 +70,7 @@
.include "../../devel/readline/buildlink3.mk"
.endif
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
+.if ${USE_CROSS_COMPILE:U:tl} == yes && ${OPSYS} == "NetBSD"
CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
CONFIGURE_ENV+= ac_cv_c_long_long=yes
CONFIGURE_ENV+= ac_cv_c_long_double=yes
diff -r 691c395e180b -r eb3371dd9a49 shells/bash/distinfo
--- a/shells/bash/distinfo Fri Nov 25 22:21:32 2022 +0000
+++ b/shells/bash/distinfo Fri Nov 25 23:29:47 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2022/11/25 18:20:46 kre Exp $
+$NetBSD: distinfo,v 1.76 2022/11/25 23:29:47 adam Exp $
BLAKE2s (bash-5.2.tar.gz) = 430755ea2af4903dba2bdbeffd4d861edb9f54c248071362f0d14f15171764cd
SHA512 (bash-5.2.tar.gz) = 5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae
@@ -39,11 +39,12 @@
BLAKE2s (bash52-012) = b980049d0314616909334aa332dbe55e7f2c4be0cab342a2b35342ca98d4c9af
SHA512 (bash52-012) = 8f969cb36ee81ac47a4c3c6ee7fbe62159192fa4f14cb48973eccd55c458e6a093adc3045ee1c379544d8183d77813977a43cad5d225322d8816540a1cb8893b
Size (bash52-012) = 9107 bytes
-SHA1 (patch-af) = e26e3209902247263884cfebc11a2f7e43245062
-SHA1 (patch-ag) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47
-SHA1 (patch-aj) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
+SHA1 (patch-Makefile.in) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
+SHA1 (patch-builtins_printf.def) = e26e3209902247263884cfebc11a2f7e43245062
+SHA1 (patch-builtins_psize.c) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47
SHA1 (patch-builtins_ulimit.def) = 1390069344607204eb3abbd6ddeb148ff590c55e
SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
+SHA1 (patch-examples_loadables_Makefile.in) = 0d27f82399c4ae9fae8ac0f8c48c68a23a3dcbd8
SHA1 (patch-examples_loadables_fdflags.c) = dce409c76b7d6c838eb25c3ccc7a89ee57ca69b8
SHA1 (patch-examples_loadables_getconf.c) = a71df9f54d77ee14de453b67bd4b3658ad7123eb
SHA1 (patch-lib_malloc_malloc.c) = 6e500228972eac0cb4d4defb02e9cf573b7fa207
diff -r 691c395e180b -r eb3371dd9a49 shells/bash/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/bash/patches/patch-Makefile.in Fri Nov 25 23:29:47 2022 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-Makefile.in,v 1.1 2022/11/25 23:29:47 adam Exp $
+
+This patch fixes the build on MirBSD and OpenBSD, where LIBINTL and
+LIBICONV are incorrectly set.
+
+--- Makefile.in.orig 2014-01-25 21:27:30.000000000 +0000
++++ Makefile.in
+@@ -353,7 +353,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
+ INTL_ABSSRC = ${topdir}/$(INTL_LIB)
+ INTL_BUILDDIR = ${LIBBUILD}/intl
+
+-INTL_LIB = @LIBINTL@
++INTL_LIB = @LTLIBINTL@
+ INTL_LIBRARY = $(INTL_LIBDIR)/libintl.a
+ INTL_DEP = @INTL_DEP@
+ INTL_INC = @INTL_INC@
+@@ -361,7 +361,7 @@ INTL_INC = @INTL_INC@
+ LIBINTL_H = @LIBINTL_H@
+
+ # libiconv
+-LIBICONV = @LIBICONV@
++LIBICONV = @LTLIBICONV@
+
+ # tests
+ LIBINTL = @LIBINTL@
diff -r 691c395e180b -r eb3371dd9a49 shells/bash/patches/patch-af
--- a/shells/bash/patches/patch-af Fri Nov 25 22:21:32 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-$NetBSD: patch-af,v 1.8 2016/06/11 12:54:24 rillig Exp $
-
-Fixes PRIdMAX and PRIuMAX on AIX < 5.1.
-
---- builtins/printf.def.orig 2014-01-03 15:35:33.000000000 +0000
-+++ builtins/printf.def
-@@ -95,6 +95,11 @@ $END
- # undef PRIdMAX
- #endif
-
-+#if defined (_AIX) && !defined (_AIX51)
-+ /* AIX defines do not work. Undefine them. */
-+# undef PRIdMAX
-+# undef PRIuMAX
-+#endif
- #if !defined (PRIdMAX)
- # if HAVE_LONG_LONG
- # define PRIdMAX "lld"
-@@ -102,6 +107,13 @@ $END
- # define PRIdMAX "ld"
- # endif
- #endif
-+#if !defined (PRIuMAX) && defined (_AIX)
-+# if HAVE_LONG_LONG
-+# define PRIuMAX "llu"
-+# else
-+# define PRIuMAX "lu"
-+# endif
-+#endif
-
- #if !defined (errno)
- extern int errno;
-@@ -594,7 +606,11 @@ printf_builtin (list)
- p = pp = getintmax ();
- if (p != pp)
- {
-+#if defined (_AIX) && !defined (_AIX51)
-+ f = mklong (start, PRIdMAX, sizeof (intmax_t) - 2);
-+#else
- f = mklong (start, PRIdMAX, sizeof (PRIdMAX) - 2);
-+#endif
- PF (f, pp);
- }
- else
-@@ -621,7 +637,11 @@ printf_builtin (list)
- p = pp = getuintmax ();
- if (p != pp)
- {
-+#if defined (_AIX) && !defined (_AIX51)
-+ f = mklong (start, PRIuMAX, sizeof (uintmax_t) - 2);
-+#else
- f = mklong (start, PRIdMAX, sizeof (PRIdMAX) - 2);
-+#endif
- PF (f, pp);
- }
- else
diff -r 691c395e180b -r eb3371dd9a49 shells/bash/patches/patch-ag
--- a/shells/bash/patches/patch-ag Fri Nov 25 22:21:32 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2016/06/11 12:54:24 rillig Exp $
-
-Use the definition of errno from <errno.h>.
-
---- builtins/psize.c.orig 2008-08-14 19:56:53.000000000 +0000
-+++ builtins/psize.c
-@@ -41,10 +41,6 @@
- #include "../general.h"
- #include "../sig.h"
-
--#ifndef errno
--extern int errno;
--#endif
--
- int nw;
-
- sighandler
diff -r 691c395e180b -r eb3371dd9a49 shells/bash/patches/patch-aj
--- a/shells/bash/patches/patch-aj Fri Nov 25 22:21:32 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2015/03/07 22:40:48 rodent Exp $
-
-This patch fixes the build on MirBSD and OpenBSD, where LIBINTL and
-LIBICONV are incorrectly set.
-
---- Makefile.in.orig 2014-01-25 21:27:30.000000000 +0000
-+++ Makefile.in
-@@ -353,7 +353,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
- INTL_ABSSRC = ${topdir}/$(INTL_LIB)
- INTL_BUILDDIR = ${LIBBUILD}/intl
-
--INTL_LIB = @LIBINTL@
-+INTL_LIB = @LTLIBINTL@
- INTL_LIBRARY = $(INTL_LIBDIR)/libintl.a
- INTL_DEP = @INTL_DEP@
- INTL_INC = @INTL_INC@
-@@ -361,7 +361,7 @@ INTL_INC = @INTL_INC@
- LIBINTL_H = @LIBINTL_H@
-
- # libiconv
--LIBICONV = @LIBICONV@
-+LIBICONV = @LTLIBICONV@
-
- # tests
- LIBINTL = @LIBINTL@
diff -r 691c395e180b -r eb3371dd9a49 shells/bash/patches/patch-builtins_printf.def
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/bash/patches/patch-builtins_printf.def Fri Nov 25 23:29:47 2022 +0000
@@ -0,0 +1,56 @@
+$NetBSD: patch-builtins_printf.def,v 1.1 2022/11/25 23:29:47 adam Exp $
+
+Fixes PRIdMAX and PRIuMAX on AIX < 5.1.
+
+--- builtins/printf.def.orig 2014-01-03 15:35:33.000000000 +0000
++++ builtins/printf.def
+@@ -95,6 +95,11 @@ $END
+ # undef PRIdMAX
+ #endif
+
++#if defined (_AIX) && !defined (_AIX51)
++ /* AIX defines do not work. Undefine them. */
++# undef PRIdMAX
++# undef PRIuMAX
++#endif
+ #if !defined (PRIdMAX)
+ # if HAVE_LONG_LONG
+ # define PRIdMAX "lld"
+@@ -102,6 +107,13 @@ $END
+ # define PRIdMAX "ld"
+ # endif
+ #endif
++#if !defined (PRIuMAX) && defined (_AIX)
++# if HAVE_LONG_LONG
++# define PRIuMAX "llu"
++# else
++# define PRIuMAX "lu"
++# endif
++#endif
+
+ #if !defined (errno)
+ extern int errno;
+@@ -594,7 +606,11 @@ printf_builtin (list)
+ p = pp = getintmax ();
+ if (p != pp)
+ {
++#if defined (_AIX) && !defined (_AIX51)
++ f = mklong (start, PRIdMAX, sizeof (intmax_t) - 2);
++#else
+ f = mklong (start, PRIdMAX, sizeof (PRIdMAX) - 2);
++#endif
+ PF (f, pp);
+ }
+ else
+@@ -621,7 +637,11 @@ printf_builtin (list)
+ p = pp = getuintmax ();
+ if (p != pp)
+ {
++#if defined (_AIX) && !defined (_AIX51)
++ f = mklong (start, PRIuMAX, sizeof (uintmax_t) - 2);
++#else
+ f = mklong (start, PRIdMAX, sizeof (PRIdMAX) - 2);
++#endif
+ PF (f, pp);
+ }
+ else
diff -r 691c395e180b -r eb3371dd9a49 shells/bash/patches/patch-builtins_psize.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/bash/patches/patch-builtins_psize.c Fri Nov 25 23:29:47 2022 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-builtins_psize.c,v 1.1 2022/11/25 23:29:47 adam Exp $
+
+Use the definition of errno from <errno.h>.
+
+--- builtins/psize.c.orig 2008-08-14 19:56:53.000000000 +0000
++++ builtins/psize.c
+@@ -41,10 +41,6 @@
+ #include "../general.h"
+ #include "../sig.h"
+
+-#ifndef errno
+-extern int errno;
+-#endif
+-
+ int nw;
+
+ sighandler
diff -r 691c395e180b -r eb3371dd9a49 shells/bash/patches/patch-examples_loadables_Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/bash/patches/patch-examples_loadables_Makefile.in Fri Nov 25 23:29:47 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-examples_loadables_Makefile.in,v 1.1 2022/11/25 23:29:47 adam Exp $
+
+Correctly install shared objects (e.g. unstripped on some platforms).
+
+--- examples/loadables/Makefile.in.orig 2022-11-25 23:21:05.000000000 +0000
++++ examples/loadables/Makefile.in
+@@ -281,7 +281,7 @@ install-supported: all installdirs insta
+ @echo installing example loadable builtins in $(DESTDIR)${loadablesdir}
+ @for prog in ${ALLPROG}; do \
+ echo $$prog ; \
+- $(INSTALL_PROGRAM) $(INSTALLMODE) $$prog $(DESTDIR)$(loadablesdir)/$$prog ;\
++ ${BSD_INSTALL_LIB} $(INSTALLMODE) $$prog $(DESTDIR)$(loadablesdir)/$$prog ;\
+ done
+
+ uninstall-dev:
Home |
Main Index |
Thread Index |
Old Index