From 5db028aee0a3c793bac7ccec31ed8b3996680f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Mon, 30 Mar 2020 16:28:31 +0200 Subject: [PATCH] Add --tag=CC to libtool invocations Otherwise the build fails with clang --- ttmkfdir-3.0.9-tag.patch | 15 +++++++++++++++ ttmkfdir.spec | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ttmkfdir-3.0.9-tag.patch diff --git a/ttmkfdir-3.0.9-tag.patch b/ttmkfdir-3.0.9-tag.patch new file mode 100644 index 0000000..243d0fe --- /dev/null +++ b/ttmkfdir-3.0.9-tag.patch @@ -0,0 +1,15 @@ +--- ttmkfdir-3.0.9.old/Makefile 2020-03-25 16:06:55.999792212 +0100 ++++ ttmkfdir-3.0.9/Makefile 2020-03-25 17:04:16.179479496 +0100 +@@ -40,10 +40,10 @@ + all: ttmkfdir + + .cpp.o: +- libtool --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^ ++ libtool --tag=CC --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^ + + ttmkfdir: ttmkfdir.o directory.o commandline.o ttf.o encoding.o parser.o builtin.o +- libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS) ++ libtool --tag=CC --mode=link $(CXX) -o $@ $^ $(LDFLAGS) + + parser.cpp: encoding.l + flex -i -8 -o$@ $< diff --git a/ttmkfdir.spec b/ttmkfdir.spec index 06b3ab4..8ae5c71 100644 --- a/ttmkfdir.spec +++ b/ttmkfdir.spec @@ -1,7 +1,7 @@ Summary: Utility to create fonts.scale files for truetype fonts Name: ttmkfdir Version: 3.0.9 -Release: 60%{?dist} +Release: 61%{?dist} # Only licensing attribution is in README, no version. License: LGPLv2+ # This is a Red Hat maintained package which is specific to @@ -20,6 +20,7 @@ Patch8: ttmkfdir-3.0.9-font-scale.patch Patch9: ttmkfdir-3.0.9-bug434301.patch Patch10:ttmkfdir-3.0.9-freetype-header-fix2.patch Patch11:ttmkfdir-3.0.9-fedora-ldflags.patch +Patch12:ttmkfdir-3.0.9-tag.patch Source10: ttmkfdir.1 BuildRequires: freetype-devel >= 2.0 @@ -52,6 +53,7 @@ cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/ %changelog * Mon Mar 30 2020 Timm Baeder - 3.0.9-60 - Pass -pie separately to %%{make_build} +- Pass --tag=CC to libtool invocations * Mon Mar 16 2020 Tom Stellard - 3.0.9-59 - Use make_build and make_install macros