From 09e047938a7dd8ef5929e0c24ab9e66c728eb281 Mon Sep 17 00:00:00 2001
From: Vincent Mihalkovic <vmihalko@redhat.com>
Date: Feb 23 2022 11:28:11 +0000
Subject: fix FTBFS (fedora-36)


---

diff --git a/ksh-1.0.0-beta.1-fix-build.patch b/ksh-1.0.0-beta.1-fix-build.patch
new file mode 100644
index 0000000..b87b1c6
--- /dev/null
+++ b/ksh-1.0.0-beta.1-fix-build.patch
@@ -0,0 +1,62 @@
+diff --git a/src/cmd/builtin/Mamfile b/src/cmd/builtin/Mamfile
+index 34d463a..c69686e 100644
+--- a/src/cmd/builtin/Mamfile
++++ b/src/cmd/builtin/Mamfile
+@@ -53,7 +53,7 @@ make install
+			exec - ${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""builtin"\" -D_PACKAGE_ast -DCMD_STANDALONE=b_pty -c pty.c
+		done pty.o generated
+		bind -lutil dontcare
+-		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd}
++		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o -lm ${mam_libutil} ${mam_libast} ${mam_libcmd}
+	done pty generated
+	make ${INSTALLROOT}/bin
+		exec - if silent test ! -d ${INSTALLROOT}/bin
+diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile
+index 873858a..148eea6 100644
+--- a/src/cmd/ksh93/Mamfile
++++ b/src/cmd/ksh93/Mamfile
+@@ -67,7 +67,7 @@ make install
+					bind -ldll
+					bind -lcmd
+					bind -last
+-					bind -lm dontcare
++					bind -lm
+					bind -lnsl dontcare
+					exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run features/externs
+				done FEATURE/externs generated
+@@ -1226,7 +1226,7 @@ make install
+							make data/math.tab implicit
+							done data/math.tab
+						done features/math.sh dontcare
+-						exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab
++						exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} -lm : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab
+						make ${PACKAGE_ast_INCLUDE}/ast_standards.h implicit
+						done ${PACKAGE_ast_INCLUDE}/ast_standards.h dontcare
+						make ${INSTALLROOT}/src/lib/libast/FEATURE/float implicit
+@@ -1393,7 +1393,7 @@ make install
+		prev +li
+		prev ${mam_libsocket}
+		prev ${mam_libsecdb}
+-		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast}
++		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o -lm ${mam_libshell} ${mam_libnsl} ${mam_libast}
+	done ksh generated
+	make shcomp
+		make shcomp.o
+@@ -1415,7 +1415,7 @@ make install
+		prev +li
+		prev ${mam_libsocket}
+		prev ${mam_libsecdb}
+-		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libast}
++		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o -lm ${mam_libshell} ${mam_libnsl} ${mam_libast}
+	done shcomp generated
+	make suid_exec
+		make suid_exec.o
+@@ -1436,7 +1436,7 @@ make install
+		prev +li
+		prev ${mam_libsocket}
+		prev ${mam_libsecdb}
+-		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libnsl} ${mam_libast}
++		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o -lm ${mam_libast} ${mam_libnsl} ${mam_libast}
+	done suid_exec generated
+	make shell
+		prev libshell.a archive
diff --git a/ksh.spec b/ksh.spec
index 31aa4a5..8745460 100644
--- a/ksh.spec
+++ b/ksh.spec
@@ -8,7 +8,7 @@ URL:          http://www.kornshell.com/
 License:      EPL-1.0
 Epoch:        3
 Version:      %{verBetaPrefix}~beta.%{verBetaSuffix}
-Release:      2%{?dist}
+Release:      3%{?dist}
 Source0:      https://github.com/ksh93/%{name}/archive/v%{verBetaFull}/%{name}-%{verBetaFull}.tar.gz
 Source1:      kshcomp.conf
 Source2:      kshrc.rhs
@@ -16,6 +16,8 @@ Source3:      dotkshrc
 
 # temporary commenting out failing tests
 Patch1:       %{name}-%{verBetaFull}-regre-tests.patch
+# in some build commands relocate "-lm" flag
+Patch2:       %{name}-%{verBetaFull}-fix-build.patch
 
 Conflicts:    pdksh
 Requires: coreutils, diffutils
@@ -141,6 +143,9 @@ fi
 %config(noreplace) %{_sysconfdir}/binfmt.d/kshcomp.conf
 
 %changelog
+* Wed Feb 23 2022 Vincent Mihalkovic <vmihalko@redhat.com> - 3:1.0.0~BETA.1-3
+- fix FTBFS in Fedora-36 (#2045778)
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3:1.0.0~beta.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild