Skip to content

Commit

Permalink
Upgrade M4 third-party source code
Browse files Browse the repository at this point in the history
A while back I discovered issues with M4 third-party
package and reported it to M4 folks.   Fixes were
made in the m4-1.4.19 package version. These
changes remove the patches and picks up the latest
version of M4 with the fixes.
  • Loading branch information
cbouchar committed Dec 5, 2022
1 parent b10ccea commit 3571686
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 189 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
/third-party/json-c-0.13.1/
/third-party/openssl-1.1.1k.tar.gz
/third-party/openssl-1.1.1k
/third-party/m4-1.4.18.tar.xz
/third-party/m4-1.4.18/
/third-party/m4-1.4.19.tar.xz
/third-party/m4-1.4.19/
/third-party/tarballs
/third-party/tree/
/src/rhts-report-result
Expand Down
3 changes: 1 addition & 2 deletions restraint.spec
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Source111: libsoup-2.52.2.tar.xz
Source112: json-c-0.13.1.tar.gz
Source114: openssl-1.1.1k.tar.gz
Source115: autoconf-2.69.tar.gz
Source116: m4-1.4.18.tar.xz
Source116: m4-1.4.19.tar.xz
%endif

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Expand Down Expand Up @@ -170,7 +170,6 @@ export CFLAGS="$RPM_OPT_FLAGS -march=i486"
%if 0%{?with_static:1}
pushd third-party
%if ( 0%{?fedora} && 0%{?fedora} < 35 ) || ( 0%{?rhel} && 0%{?rhel} < 9 )
rm m4-1.4.18-glibc-sigstksz.patch
rm glib_new_close_range_arg.patch
%endif
%if 0%{?fedora} || 0%{?rhel} >= 8
Expand Down
6 changes: 1 addition & 5 deletions third-party/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SQLITE = sqlite-autoconf-3310100
INTLTOOL = intltool-0.51.0
LIBJSONC = json-c-0.13.1
AUTOCONF = autoconf-2.69
M4 = m4-1.4.18
M4 = m4-1.4.19

arch := $(shell uname -m)

Expand Down Expand Up @@ -258,10 +258,6 @@ $(AUTOCONF)/.patches-done: $(AUTOCONF)
touch $@

$(M4)/.patches-done: $(M4)
patch -d$(M4) -p1 < m4-1.4.18-glibc-change-work-around.patch
if [ -e m4-1.4.18-glibc-sigstksz.patch ]; then\
patch -d$(M4) -p1 < m4-1.4.18-glibc-sigstksz.patch;\
fi
touch $@

.PHONY: clean
Expand Down
115 changes: 0 additions & 115 deletions third-party/m4-1.4.18-glibc-change-work-around.patch

This file was deleted.

65 changes: 0 additions & 65 deletions third-party/m4-1.4.18-glibc-sigstksz.patch

This file was deleted.

0 comments on commit 3571686

Please sign in to comment.