SHA256
1
0
forked from pool/par_text

Accepting request 986711 from home:mcepl:branches:Base:System

Fix calling of `make`.

OBS-URL: https://build.opensuse.org/request/show/986711
OBS-URL: https://build.opensuse.org/package/show/Base:System/par_text?expand=0&rev=8
This commit is contained in:
Matej Cepl 2022-07-04 18:04:35 +00:00 committed by Git OBS Bridge
parent af50606add
commit 56678181e5
2 changed files with 19 additions and 6 deletions

View File

@ -6,11 +6,11 @@
errmsg.c | 12 + errmsg.c | 12 +
errmsg.h | 12 + errmsg.h | 12 +
par.c | 444 ++++++++++++++++++++++++++++++---------------------------- par.c | 444 ++++++++++++++++++++++++++++++----------------------------
protoMakefile | 2 protoMakefile | 8 -
reformat.c | 168 +++++++++++++-------- reformat.c | 168 +++++++++++++--------
reformat.h | 6 reformat.h | 6
releasenotes | 16 ++ releasenotes | 16 ++
11 files changed, 419 insertions(+), 324 deletions(-) 12 files changed, 423 insertions(+), 328 deletions(-)
--- a/buffer.c --- a/buffer.c
+++ b/buffer.c +++ b/buffer.c
@ -1244,15 +1244,28 @@
return *errmsg ? EXIT_FAILURE : EXIT_SUCCESS; return *errmsg ? EXIT_FAILURE : EXIT_SUCCESS;
--- a/protoMakefile --- a/protoMakefile
+++ b/protoMakefile +++ b/protoMakefile
@@ -47,7 +47,7 @@ @@ -45,9 +45,9 @@
# Example (for Solaris 2.x with SPARCompiler C):
# CC = cc -c -O -s -Xc -DDONTFREE
CPPFLAGS = -CPPFLAGS =
CFLAGS = -CFLAGS =
-CC = cc $(CPPFLAGS) $(CFLAGS) -c -CC = cc $(CPPFLAGS) $(CFLAGS) -c
+CPPFLAGS ?=
+CFLAGS ?=
+CC = cc -std=c99 $(CPPFLAGS) $(CFLAGS) -c +CC = cc -std=c99 $(CPPFLAGS) $(CFLAGS) -c
# Define LINK1 and LINK2 so that the command # Define LINK1 and LINK2 so that the command
# #
@@ -62,7 +62,7 @@ CC = cc $(CPPFLAGS) $(CFLAGS) -c
# LINK2 = -o
LINK1 = cc
-LINK2 = -o
+LINK2 = $(CFLAGS) $(CPPFLAGS) -o
# Define RM so that the command
#
--- a/reformat.c --- a/reformat.c
+++ b/reformat.c +++ b/reformat.c
@@ -3,6 +3,7 @@ reformat.c @@ -3,6 +3,7 @@ reformat.c

View File

@ -57,7 +57,7 @@ end in the same column.
%autosetup -p1 -n %{upname}-%{version} %autosetup -p1 -n %{upname}-%{version}
%build %build
make -f protoMakefile CC="cc -c" LINK1="cc" LINK2="-o" RM="rm" JUNK="" %{?_smp_mflags} CFLAGS="%{optflags}"$* make -f protoMakefile %{?_smp_mflags} CFLAGS="%{optflags}" $*
%install %install
install -D -t %{buildroot}/%{_bindir} par install -D -t %{buildroot}/%{_bindir} par