* Mon Mar 18 2024 Jean-Philippe Pialasse <jpp@koozali.org> 0.70-6.sme
- patch to make it build for el8/SME11
This commit is contained in:
parent
b20f27b981
commit
d599852d60
140
tai64nunix-0.70-el8-warning-crosscomp.patch
Normal file
140
tai64nunix-0.70-el8-warning-crosscomp.patch
Normal file
@ -0,0 +1,140 @@
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/chkshsgr.c tai64nunix-0.70/chkshsgr.c
|
||||
--- tai64nunix-0.70.old/chkshsgr.c 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/chkshsgr.c 2024-03-18 15:42:35.465000000 -0400
|
||||
@@ -1,8 +1,12 @@
|
||||
#include "exit.h"
|
||||
+#include <sys/types.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <grp.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
-main()
|
||||
+main(int argc, char *argv[])
|
||||
{
|
||||
- short x[4];
|
||||
+ gid_t x[4];
|
||||
|
||||
x[0] = x[1] = 0;
|
||||
if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/conf-cc tai64nunix-0.70/conf-cc
|
||||
--- tai64nunix-0.70.old/conf-cc 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/conf-cc 2024-03-18 15:52:11.585000000 -0400
|
||||
@@ -1,3 +1,3 @@
|
||||
-gcc -O2
|
||||
+${CC} ${CFLAGS}
|
||||
|
||||
This will be used to compile .c files.
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/conf-ld tai64nunix-0.70/conf-ld
|
||||
--- tai64nunix-0.70.old/conf-ld 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/conf-ld 2024-03-18 15:44:11.772000000 -0400
|
||||
@@ -1,3 +1,3 @@
|
||||
-gcc -s
|
||||
+${CC} ${LDFLAGS}
|
||||
|
||||
This will be used to link .o files into an executable.
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/Makefile tai64nunix-0.70/Makefile
|
||||
--- tai64nunix-0.70.old/Makefile 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/Makefile 2024-03-18 15:46:44.954000000 -0400
|
||||
@@ -165,7 +165,7 @@
|
||||
hasshsgr.h: \
|
||||
choose compile load tryshsgr.c hasshsgr.h1 hasshsgr.h2 chkshsgr \
|
||||
warn-shsgr
|
||||
- ./chkshsgr || ( cat warn-shsgr; exit 1 )
|
||||
+ echo "Warning: We can not run test on cross target. - ignoring ./chkshsgr || ( cat warn-shsgr; exit 1 )"
|
||||
./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
|
||||
|
||||
haswaitp.h: \
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/tai64nunix.c tai64nunix-0.70/tai64nunix.c
|
||||
--- tai64nunix-0.70.old/tai64nunix.c 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/tai64nunix.c 2024-03-18 15:22:21.369000000 -0400
|
||||
@@ -25,7 +25,7 @@
|
||||
unsigned long nanosecs;
|
||||
unsigned long u;
|
||||
|
||||
-main()
|
||||
+main(int argc, char *argv[])
|
||||
{
|
||||
char ch;
|
||||
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/trycpp.c tai64nunix-0.70/trycpp.c
|
||||
--- tai64nunix-0.70.old/trycpp.c 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/trycpp.c 2024-03-18 15:24:12.044000000 -0400
|
||||
@@ -1,4 +1,6 @@
|
||||
-main()
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
#ifdef NeXT
|
||||
printf("nextstep\n"); exit(0);
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/trypoll.c tai64nunix-0.70/trypoll.c
|
||||
--- tai64nunix-0.70.old/trypoll.c 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/trypoll.c 2024-03-18 15:25:43.380000000 -0400
|
||||
@@ -1,8 +1,9 @@
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <poll.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
-main()
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
struct pollfd x;
|
||||
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/trysgact.c tai64nunix-0.70/trysgact.c
|
||||
--- tai64nunix-0.70.old/trysgact.c 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/trysgact.c 2024-03-18 15:26:46.030000000 -0400
|
||||
@@ -1,6 +1,7 @@
|
||||
#include <signal.h>
|
||||
|
||||
-main()
|
||||
+void
|
||||
+main(int argc, char *argv[])
|
||||
{
|
||||
struct sigaction sa;
|
||||
sa.sa_handler = 0;
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/tryshsgr.c tai64nunix-0.70/tryshsgr.c
|
||||
--- tai64nunix-0.70.old/tryshsgr.c 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/tryshsgr.c 2024-03-18 15:27:53.809000000 -0400
|
||||
@@ -1,4 +1,5 @@
|
||||
-main()
|
||||
+#include <unistd.h>
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
short x[4];
|
||||
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/tryulong64.c tai64nunix-0.70/tryulong64.c
|
||||
--- tai64nunix-0.70.old/tryulong64.c 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/tryulong64.c 2024-03-18 15:28:33.039000000 -0400
|
||||
@@ -1,4 +1,5 @@
|
||||
-main()
|
||||
+#include <unistd.h>
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
unsigned long u;
|
||||
u = 1;
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/trywaitp.c tai64nunix-0.70/trywaitp.c
|
||||
--- tai64nunix-0.70.old/trywaitp.c 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/trywaitp.c 2024-03-18 15:29:09.672000000 -0400
|
||||
@@ -1,7 +1,8 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
-main()
|
||||
+void
|
||||
+main(int argc, char *argv[])
|
||||
{
|
||||
waitpid(0,0,0);
|
||||
}
|
||||
diff -Nur --no-dereference tai64nunix-0.70.old/x86cpuid.c tai64nunix-0.70/x86cpuid.c
|
||||
--- tai64nunix-0.70.old/x86cpuid.c 2000-04-03 00:15:33.000000000 -0400
|
||||
+++ tai64nunix-0.70/x86cpuid.c 2024-03-18 15:29:43.147000000 -0400
|
||||
@@ -5,7 +5,7 @@
|
||||
exit(1);
|
||||
}
|
||||
|
||||
-main()
|
||||
+int main(int argc, char *argv[])
|
||||
{
|
||||
unsigned long x[4];
|
||||
unsigned long y[4];
|
||||
@ -6,11 +6,12 @@
|
||||
#
|
||||
# $Id: tai64nunix.spec,v 1.1 2016/02/04 18:09:33 vip-ire Exp $
|
||||
#
|
||||
%global debug_package %{nil}
|
||||
Summary: Converts tai64n timestamps to Unix epoch timestamps
|
||||
%define name tai64nunix
|
||||
Name: %{name}
|
||||
%define version 0.70
|
||||
%define release 5
|
||||
%define release 6
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}
|
||||
License: Peter Samuel - based on code by Daniel J. Bernstein
|
||||
@ -18,6 +19,7 @@ Group: Networking/Daemons
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
URL: http://cr.yp.to/daemontools.html
|
||||
Patch0: %{name}-%{version}.patch.2001020600
|
||||
Patch1: %{name}-%{version}-el8-warning-crosscomp.patch
|
||||
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
|
||||
Provides: tai64nunix
|
||||
AutoReqProv: no
|
||||
@ -28,6 +30,9 @@ qmailanalog expects timestamps in Unix epoch format. tai64nunix
|
||||
converts tai64n timestamps to Unix epoch timestamps.
|
||||
|
||||
%changelog
|
||||
* Mon Mar 18 2024 Jean-Philippe Pialasse <jpp@koozali.org> 0.70-6.sme
|
||||
- patch to make it build for el8/SME11
|
||||
|
||||
* Fri Jul 14 2023 BogusDateBot
|
||||
- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
|
||||
by assuming the date is correct and changing the weekday.
|
||||
@ -59,14 +64,15 @@ converts tai64n timestamps to Unix epoch timestamps.
|
||||
# their final installed locations.
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
%patch1 -p1
|
||||
# Create the relative installation directory.
|
||||
|
||||
mkdir -p ./root/usr
|
||||
|
||||
%build
|
||||
echo 'gcc -O2 --include /usr/include/errno.h' > conf-cc
|
||||
make
|
||||
# could be CFLAGS="$RPM_OPT_FLAGS -O2 --include /usr/include/errno.h"
|
||||
# or was -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -O2 --include /usr/include/errno.h
|
||||
make CC="gcc" CFLAGS="$RPM_OPT_FLAGS --include /usr/include/errno.h" LDFLAGS="-s"
|
||||
|
||||
%install
|
||||
make setup
|
||||
|
||||
Loading…
Reference in New Issue
Block a user