Skip to content

Updated dependencies (master) #1703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
From 17acc166dc4819b2602553795e1ea11291c7a12d Mon Sep 17 00:00:00 2001
From: Craig Comstock <[email protected]>
Date: Tue, 22 Apr 2025 11:41:02 -0500
Subject: [PATCH] Adjusted configure script for cross-compiling with macro
strcasecmp.m4 fixed uptsream in gnulib

diffutils issue: https://lists.gnu.org/archive/html/bug-diffutils/2025-04/msg00003.html
gnulib fix: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d9083a4cc638cf9c7dfc3cc534a7c6b4debf50ab

configure script adjusted manually

Ticket: none
Changelog: none
---
configure | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 26a74d5..0a25163 100755
--- a/configure
+++ b/configure
@@ -46249,12 +46249,9 @@ else case e in #(
esac
if test "$cross_compiling" = yes
then :
- { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See 'config.log' for more details" "$LINENO" 5; }
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ :
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

#include <stdio.h>
@@ -46277,16 +46274,13 @@ _ACEOF
if ac_fn_c_try_run "$LINENO"
then :
gl_cv_func_strcasecmp_works=yes
-else case e in #(
- e) if test $? = 1; then
+else $as_nop
+ if test $? = 1; then
gl_cv_func_strcasecmp_works=no
fi
- ;;
-esac
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi

;;
--
2.39.5

2 changes: 1 addition & 1 deletion deps-packaging/diffutils/cfbuild-diffutils-aix.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define diffutils_version 3.11
%define diffutils_version 3.12

Summary: CFEngine Build Automation -- diffutils
Name: cfbuild-diffutils
Expand Down
5 changes: 4 additions & 1 deletion deps-packaging/diffutils/cfbuild-diffutils.spec
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
%define diffutils_version 3.11
%define diffutils_version 3.12

Summary: CFEngine Build Automation -- diffutils
Name: cfbuild-diffutils
Version: %{version}
Release: 1
Source0: diffutils-%{diffutils_version}.tar.xz
Patch0: 0001-Adjusted-configure-script-for-cross-compiling-with-m.patch
License: GPL3
Group: Other
Url: https://cfengine.com
Expand All @@ -19,6 +20,8 @@ mkdir -p %{_builddir}
export PATH=/opt/freeware/bin:$PATH # to use newer version of tar on aix platform
%setup -q -n diffutils-%{diffutils_version}

%patch0 -p1

./configure --prefix=%{prefix}

%build
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/diffutils/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a73ef05fe37dd585f7d87068e4a0639760419f810138bd75c61ddaa1f9e2131e diffutils-3.11.tar.xz
7c8b7f9fc8609141fdea9cece85249d308624391ff61dedaf528fcb337727dfd diffutils-3.12.tar.xz
2 changes: 2 additions & 0 deletions deps-packaging/diffutils/mingw/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ build: build-stamp
build-stamp:
dh_testdir

patch -p1 < 0001-Adjusted-configure-script-for-cross-compiling-with-m.patch

./configure --host=\$(DEB_HOST_GNU_TYPE) --prefix=\$(PREFIX) LDFLAGS="-pthread"
make -C lib
make -C src
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/cfbuild-libxml2.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define libxml_version 2.14.1
%define libxml_version 2.14.2

Summary: CFEngine Build Automation -- libxml2
Name: cfbuild-libxml2
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
310df85878b65fa717e5e28e0d9e8f6205fd29d883929303a70a4f2fc4f6f1f2 libxml2-2.14.1.tar.xz
353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6 libxml2-2.14.2.tar.xz
2 changes: 1 addition & 1 deletion deps-packaging/php/cfbuild-php.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define php_version 8.4.5
%define php_version 8.4.6

Summary: CFEngine Build Automation -- php
Name: cfbuild-php
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/php/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f05530d350f1ffe279e097c2af7a8d78cab046ef99d91f6b3151b06f0ab05d05 php-8.4.5.tar.gz
49be0f2f45c9b07c9b921d023bf28b1fc781700c829869725681300e72e3faa8 php-8.4.6.tar.gz
Loading