From 31ab35f5ae89528adc990ff44eff85a85a9a214d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 25 Nov 2020 15:04:17 +0100 Subject: [PATCH] Eliminate patching to set LDFLAGS --- byaccj.spec | 5 +---- honor-ldflags.patch | 12 ------------ 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 honor-ldflags.patch diff --git a/byaccj.spec b/byaccj.spec index 4d48a36..2b6794b 100644 --- a/byaccj.spec +++ b/byaccj.spec @@ -8,8 +8,6 @@ URL: http://byaccj.sourceforge.net/ Source0: http://sourceforge.net/projects/byaccj/files/byaccj/1.15/byaccj1.15_src.tar.gz -Patch0: honor-ldflags.patch - BuildRequires: gcc BuildRequires: make @@ -27,9 +25,8 @@ Java now! %prep %setup -q -n %{name}%{version} -%patch0 -p1 chmod -c -x src/* docs/* -sed -i -e 's|-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4||g' src/Makefile +sed -i -e 's|-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4|$(LDFLAGS)|g' src/Makefile %build diff --git a/honor-ldflags.patch b/honor-ldflags.patch deleted file mode 100644 index 4a8402f..0000000 --- a/honor-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN byaccj1.15.orig/src/Makefile byaccj1.15/src/Makefile ---- byaccj1.15.orig/src/Makefile 2020-11-23 15:20:38.376711773 +0100 -+++ byaccj1.15/src/Makefile 2020-11-23 15:20:58.680671903 +0100 -@@ -75,7 +75,7 @@ - $(CC) -c $(CFLAGS) $(INC) $< -o $@ - - yacc: $(OBJ) -- $(CC) -o yacc $(OBJ) -+ $(CC) -o yacc $(LDFLAGS) $(OBJ) - @echo "done" - - clean: