Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guile xz libunistring ver. bump

Browse Source
This commit is contained in:
Rmys
2024-10-07 12:58:43 +03:00
parent 6f59a9f637
commit 4e7d028cda
14 changed files with 437 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/devel/autogen/actions.py
+3 -2
View File
@@ -11,10 +11,11 @@ from pisi.actionsapi import get
def setup():
pisitools.cflags.add(" -Wno-implicit-fallthrough -Wno-format-overflow -Wno-format-truncation")
shelltools.system("sed -i 's/ -Werror / /' configure")
#autotools.autoreconf("-vfi")
# autotools.autoreconf("-vfi")
autotools.configure("--prefix=/usr \
--disable-static")
--disable-static --disable-dependency-tracking")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
system/devel/autogen/files/0001-guile-3.0.patch
+38
View File
@@ -0,0 +1,38 @@
--- a/config/guile.m4
+++ b/config/guile.m4
@@ -61,7 +61,7 @@
#
AC_DEFUN([GUILE_PKG],
[PKG_PROG_PKG_CONFIG
- _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
+ _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do
--- a/configure
+++ b/configure
@@ -14799,7 +14799,7 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
- _guile_versions_to_search="2.2 2.0 1.8"
+ _guile_versions_to_search="3.0 2.2 2.0 1.8"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do
--- a/agen5/guile-iface.h
+++ b/agen5/guile-iface.h
@@ -16,6 +16,13 @@
# define AG_SCM_TO_LONG(_v) scm_to_long(_v)
# define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
+#elif GUILE_VERSION < 400000
+# define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p))
+# define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l))
+# define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p))
+# define AG_SCM_TO_LONG(_v) scm_to_long(_v)
+# define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
+
#else
# error unknown GUILE_VERSION
choke me.
system/devel/autogen/files/autogen-5.18.16-configure-c99.patch
+42
View File
@@ -0,0 +1,42 @@
https://bugs.gentoo.org/898590
https://src.fedoraproject.org/rpms/autogen/c/7d157d98e73dcd1602111309a690643faa80e207?branch=rawhide
--- a/config/ag_macros.m4
+++ b/config/ag_macros.m4
@@ -113,7 +113,7 @@ AC_DEFUN([INVOKE_AG_MACROS_LAST],[
fi
AC_CACHE_CHECK([for static inline], [snv_cv_static_inline], [
- AC_TRY_COMPILE([static inline foo(bar) int bar; { return bar; }],
+ AC_TRY_COMPILE([static inline int foo(bar) int bar; { return bar; }],
[return foo(0);],
[snv_cv_static_inline='static inline'],
[snv_cv_static_inline='static'])
@@ -428,7 +428,7 @@ int main (int argc, char ** argv) {
char zRej@<:@@:>@ = reject;
char zAcc@<:@@:>@ = "a-ok-eject";
return strcspn( zAcc, zRej ) - 5;
-}] )]
+}] )],
[ag_cv_run_strcspn=yes],[ag_cv_run_strcspn=no],[ag_cv_run_strcspn=no]
) # end of RUN_IFELSE
]) # end of AC_CACHE_VAL for ag_cv_run_strcspn
--- a/configure
+++ b/configure
@@ -17338,7 +17338,7 @@ int main (int argc, char ** argv) {
char zAcc[] = "a-ok-eject";
return strcspn( zAcc, zRej ) - 5;
}
- ag_cv_run_strcspn=yes
+#error
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
ag_cv_run_strcspn=no
@@ -18406,7 +18405,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-static inline foo(bar) int bar; { return bar; }
+static inline int foo(bar) int bar; { return bar; }
int
main ()
{
system/devel/autogen/files/autogen-5.18.16-no-which.patch
+201
View File
@@ -0,0 +1,201 @@
--- a/autoopts/mk-tpl-config.sh
+++ b/autoopts/mk-tpl-config.sh
@@ -98,7 +98,7 @@ fix_scripts() {
st=`sed 1q $f`
case "$st" in
- *perl ) echo '#!' `which perl`
+ *perl ) echo '#!' `command -v perl`
sed 1d $f
;;
@@ -124,7 +124,7 @@ find_shell_prog() {
case `uname -s` in
SunOS )
while : ; do
- POSIX_SHELL=`which bash`
+ POSIX_SHELL=`command -v bash`
test -x "${POSIX_SHELL}" && break
POSIX_SHELL=/usr/xpg4/bin/sh
test -x "${POSIX_SHELL}" && break
@@ -139,7 +139,7 @@ find_cat_prog() {
do
\unalias -a
unset -f command cat which
- POSIX_CAT=`which cat`
+ POSIX_CAT=`command -v cat`
test -x "$POSIX_CAT" && break
POSIX_CAT=`
PATH=\`command -p getconf CS_PATH\`
--- a/autoopts/test/defs.in
+++ b/autoopts/test/defs.in
@@ -40,7 +40,7 @@ cfg_vals()
if test "X$BASH_VERSION" = X
then
# On Solaris, make certain we do not use /bin/sh
- sh=`which bash`
+ sh=`command -v bash`
test "X$sh" = X && sh=/usr/xpg4/bin/sh
BASH_VERSION=not-good-enough
export BASH_VERSION
--- a/autoopts/tpl/agtexi-cmd.tpl
+++ b/autoopts/tpl/agtexi-cmd.tpl
@@ -779,7 +779,7 @@ DEFINE initialization =][=
=][= # END-BUILDTREE-ISMS
(shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
- test -x \"${CLexe}\" || CLexe=`which columns`")
+ test -x \"${CLexe}\" || CLexe=`command -v columns`")
# END-INSTALL-ONLY-CODE =][=
--- a/autoopts/tpl/cmd-doc.tlib
+++ b/autoopts/tpl/cmd-doc.tlib
@@ -42,7 +42,7 @@
:+][+: # END-BUILDTREE-ISMS
(shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
- test -x \"${CLexe}\" || CLexe=`which columns`")
+ test -x \"${CLexe}\" || CLexe=`command -v columns`")
# END-INSTALL-ONLY-CODE :+][+:
--- a/autoopts/tpl/def2pot.tpl
+++ b/autoopts/tpl/def2pot.tpl
@@ -68,7 +68,7 @@ ENDDEF =][=
=][= # END-BUILDTREE-ISMS
(shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
- test -x \"${CLexe}\" || CLexe=`which columns`")
+ test -x \"${CLexe}\" || CLexe=`command -v columns`")
# END-INSTALL-ONLY-CODE =][= #
--- a/autoopts/tpl/getopt.tpl
+++ b/autoopts/tpl/getopt.tpl
@@ -81,7 +81,7 @@ CASE (suffix) +][+
# END-BUILDTREE-ISMS the following code is for installed version:
agopts=
aocfg=`echo ${AGexe} | sed 's@/[^/]*$@@'`/autoopts-config
- test -x "${aocfg}" || aocfg=`which autoopts-config`
+ test -x "${aocfg}" || aocfg=`command -v autoopts-config`
tarfile=`${aocfg} libsrc`
# END-INSTALL-ONLY-CODE +]
--- a/autoopts/tpl/options.tpl
+++ b/autoopts/tpl/options.tpl
@@ -39,7 +39,7 @@ c
=][= # END-BUILDTREE-ISMS
(shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
- test -x \"${CLexe}\" || CLexe=`which columns`")
+ test -x \"${CLexe}\" || CLexe=`command -v columns`")
# END-INSTALL-ONLY-CODE =][=
--- a/autoopts/tpl/usage.tlib
+++ b/autoopts/tpl/usage.tlib
@@ -34,7 +34,7 @@
=][= # END-BUILDTREE-ISMS
(shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'`
- test -x \"${CLexe}\" || CLexe=`which columns`")
+ test -x \"${CLexe}\" || CLexe=`command -v columns`")
# END-INSTALL-ONLY-CODE =][=
--- a/config/ag_macros.m4
+++ b/config/ag_macros.m4
@@ -505,7 +505,7 @@ AC_DEFUN([AG_ENABLE_DEBUG],[
[Define this if wanting autogen debugging])
AC_DEFINE([DEBUG_ENABLED], [1],
[Define this if debugging is enabled])
- [f=`which dmalloc 2>/dev/null`
+ [f=`command -v dmalloc 2>/dev/null`
test -n "$f" && LIBS="${LIBS} -ldmalloc"]
fi
--- a/config/bootstrap.shlib
+++ b/config/bootstrap.shlib
@@ -47,16 +47,16 @@ case "${SHELL}" in
*[akz]sh) : ;;
*)
while : ; do
- SHELL=`which bash 2>/dev/null`
+ SHELL=`command -v bash 2>/dev/null`
test -x "${SHELL}" && break
- SHELL=`which ksh 2>/dev/null`
+ SHELL=`command -v ksh 2>/dev/null`
test -x "${SHELL}" && break
SHELL=/usr/xpg4/bin/sh
test -x "${SHELL}" && break
- SHELL=`which sh 2>/dev/null`
+ SHELL=`command -v sh 2>/dev/null`
test -x "${SHELL}" && break
die "unable to determine which shell to use"
--- a/config/libopts.m4
+++ b/config/libopts.m4
@@ -108,9 +108,9 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
[while :
do
test -x "$POSIX_SHELL" && break
- POSIX_SHELL=`which bash`
+ POSIX_SHELL=`command -v bash`
test -x "$POSIX_SHELL" && break
- POSIX_SHELL=`which dash`
+ POSIX_SHELL=`command -v dash`
test -x "$POSIX_SHELL" && break
POSIX_SHELL=/usr/xpg4/bin/sh
test -x "$POSIX_SHELL" && break
--- a/config/mk-shdefs.in
+++ b/config/mk-shdefs.in
@@ -109,7 +109,7 @@ configure() {
{
cmd='`set -o | '${AWK}" '/^allexport/ {print \$2}'"\`
cat <<- _EOF_
- #! `which echo` this-file-should-be-sourced,-not-executed
+ #! `command -v echo` this-file-should-be-sourced,-not-executed
# -*- Mode: shell-script -*-
case "$cmd" in
--- a/configure.ac
+++ b/configure.ac
@@ -149,9 +149,9 @@ GDnam=getdefs${ac_exeext}
CLnam=columns${ac_exeext}
if test "X$cross_compiling" = Xyes
then
- AGexe=`which ${AGnam}`
- GDexe=`which ${GDnam}`
- CLexe=`which ${CLnam}`
+ AGexe=`command -v ${AGnam}`
+ GDexe=`command -v ${GDnam}`
+ CLexe=`command -v ${CLnam}`
else
AGexe=${ag_top_builddir}/agen5/${AGnam}
GDexe=${ag_top_builddir}/getdefs/${GDnam}
--- a/doc/mk-agen-texi.sh
+++ b/doc/mk-agen-texi.sh
@@ -65,7 +65,7 @@ set_config_values()
nl='
' ht=' '
. ${top_builddir}/config/shdefs
- : ${MAKE=`which make`}
+ : ${MAKE=`command -v make`}
: ${srcdir=`pwd`}
srcdir=`cd ${srcdir} >/dev/null ; pwd`
INCLUDES="${DEFS} "`
--- a/getdefs/test/defs
+++ b/getdefs/test/defs
@@ -40,7 +40,7 @@ cfg_vals()
if test "X$BASH_VERSION" = X
then
# On Solaris, make certain we do not use /bin/sh
- sh=`which bash`
+ sh=`command -v bash`
test "X$sh" = X && sh=/usr/xpg4/bin/sh
BASH_VERSION=not-good-enough
export BASH_VERSION
system/devel/autogen/files/autogen-5.18.16-rpath.patch
+80
View File
@@ -0,0 +1,80 @@
https://bugs.gentoo.org/676692
'make install' actually installs 'getdefs', 'columns', 'autogen'
and gentoo's 'scanelf' QA checker tool detects it as:
* QA Notice: The following files contain insecure RUNPATHs
* Please file a bug about this at https://bugs.gentoo.org/
* with the maintainer of the package.
* /tmp/portage/sys-devel/autogen-5.18.16/image/usr/bin/getdefs
* RPATH: /tmp/portage/sys-devel/autogen-5.18.16/work/autogen-5.18.16/autoopts/.libs
* /tmp/portage/sys-devel/autogen-5.18.16/image/usr/bin/columns
* RPATH: /tmp/portage/sys-devel/autogen-5.18.16/work/autogen-5.18.16/autoopts/.libs
* /tmp/portage/sys-devel/autogen-5.18.16/image/usr/bin/autogen
* RPATH: /tmp/portage/sys-devel/autogen-5.18.16/work/autogen-5.18.16/autoopts/.libs
--- a/agen5/Makefile.am
+++ b/agen5/Makefile.am
@@ -63,7 +63,7 @@ SNV_LIB = $(top_builddir)/snprintfv/libsnprintfv.la
nodist_autogen_SOURCES = ag.c
autogen_SOURCES = $(gen_csrc)
autogen_LDADD = $(LO_LIB) $(SNV_LIB) $(GUILE_LIBS)
-autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN) -no-install
+autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN)
autogen_CFLAGS = $(GUILE_CFLAGS)
stamp_script = $(srcdir)/mk-stamps.sh
--- a/agen5/Makefile.in
+++ b/agen5/Makefile.in
@@ -482,7 +482,7 @@ SNV_LIB = $(top_builddir)/snprintfv/libsnprintfv.la
nodist_autogen_SOURCES = ag.c
autogen_SOURCES = $(gen_csrc)
autogen_LDADD = $(LO_LIB) $(SNV_LIB) $(GUILE_LIBS)
-autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN) -no-install
+autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN)
autogen_CFLAGS = $(GUILE_CFLAGS)
stamp_script = $(srcdir)/mk-stamps.sh
AM_YFLAGS = -d
--- a/columns/Makefile.am
+++ b/columns/Makefile.am
@@ -20,7 +20,7 @@
## with this program. If not, see <http://www.gnu.org/licenses/>.
bin_PROGRAMS = columns
-columns_LDFLAGS = -no-install
+#columns_LDFLAGS = -no-install
csrc = opts.h columns.c opts.c
nodist_columns_SOURCES = cols.c
--- a/columns/Makefile.in
+++ b/columns/Makefile.in
@@ -389,7 +389,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-columns_LDFLAGS = -no-install
+#columns_LDFLAGS = -no-install
csrc = opts.h columns.c opts.c
nodist_columns_SOURCES = cols.c
LO_LIB = $(top_builddir)/autoopts/libopts.la
--- a/getdefs/Makefile.am
+++ b/getdefs/Makefile.am
@@ -23,7 +23,7 @@
TARG = getdefs
bin_PROGRAMS = getdefs
-getdefs_LDFLAGS = -no-install
+#getdefs_LDFLAGS = -no-install
gdsrcs = getdefs.h proto.h gdemit.c gdinit.c getdefs.c
getdefs_SOURCES = proto.h
BUILT_SOURCES = gd.c
--- a/getdefs/Makefile.in
+++ b/getdefs/Makefile.in
@@ -434,7 +434,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
TARG = getdefs
-getdefs_LDFLAGS = -no-install
+#getdefs_LDFLAGS = -no-install
gdsrcs = getdefs.h proto.h gdemit.c gdinit.c getdefs.c
getdefs_SOURCES = proto.h
BUILT_SOURCES = gd.c
system/devel/autogen/pspec.xml
+11 -2
View File
@@ -21,8 +21,10 @@
<Dependency>which</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">allow-guile-2.2.diff</Patch> -->
<!-- <Patch level="1">x.patch</Patch> -->
<Patch level="1">0001-guile-3.0.patch</Patch>
<Patch level="1">autogen-5.18.16-no-which.patch</Patch>
<Patch level="1">autogen-5.18.16-rpath.patch</Patch>
<Patch level="1">autogen-5.18.16-configure-c99.patch</Patch>
</Patches>
</Source>
@@ -59,6 +61,13 @@
</Package>
<History>
<Update release="11">
<Date>2024-10-05</Date>
<Version>5.18.16</Version>
<Comment>Revuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="10">
<Date>2023-10-15</Date>
<Version>5.18.16</Version>
system/devel/guile/actions.py
+1 -1
View File
@@ -38,6 +38,6 @@ def install():
pisitools.dodir("/etc/env.d")
shelltools.echo("%s/etc/env.d/50guile" % get.installDIR(), 'GUILE_LOAD_PATH="/usr/share/guile/%s"' % major)
pisitools.domove("/usr/lib/libguile-2.2.so.*.scm", "/usr/share/gdb/auto-load")
pisitools.domove("/usr/lib/libguile-3.0.so.*.scm", "/usr/share/gdb/auto-load")
pisitools.dodoc("AUTHORS", "ChangeLog", "HACKING", "NEWS", "README", "THANKS")
system/devel/guile/pspec.xml
+9 -2
View File
@@ -14,7 +14,7 @@
<IsA>library</IsA>
<Summary>GNU Scheme interpreter and library</Summary>
<Description>GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library implementation of the Scheme programming language, written in C. GUILE provides a machine-independent execution platform that can be linked in as a library during the building of extensible programs.</Description>
<Archive sha1sum="6a90d47244952af062996286cf9b8d609b7d0d75" type="tarxz">mirrors://gnu/guile/guile-2.2.7.tar.xz</Archive>
<Archive sha1sum="e95e37f681dae692de52242929cbc7092eef3eb4" type="tarxz">mirrors://gnu/guile/guile-3.0.10.tar.xz</Archive>
<BuildDependencies>
<Dependency>gc-devel</Dependency>
<Dependency>gettext-devel</Dependency>
@@ -47,7 +47,7 @@
<Path fileType="data">/usr/share/guile</Path>
<Path fileType="data">/usr/share/emacs</Path>
<Path fileType="data">/usr/share/gdb/auto-load</Path>
<Path fileType="library">/usr/lib/guile/2.2</Path>
<Path fileType="library">/usr/lib/guile/3.0</Path>
</Files>
</Package>
@@ -69,6 +69,13 @@
</Package>
<History>
<Update release="8">
<Date>2024-10-05</Date>
<Version>3.0.10</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2023-10-15</Date>
<Version>2.2.7</Version>