diff options
author | Florian Schmaus <flow@gentoo.org> | 2024-03-01 11:01:19 +0100 |
---|---|---|
committer | Florian Schmaus <flow@gentoo.org> | 2024-03-01 11:05:46 +0100 |
commit | 8bd21b6cd5175237fccca706003f223b21b57af6 (patch) | |
tree | ac43b6035c4ec7296f24df9f722b827f81413cdc /dev-texlive/texlive-humanities/files/texlive-humanities-2023-opbible-improve-Makefile-respect-user-flags.patch | |
parent | dev-texlive/texlive-binextra: new package, add 2023_p69527 (diff) | |
download | gentoo-8bd21b6cd5175237fccca706003f223b21b57af6.tar.gz gentoo-8bd21b6cd5175237fccca706003f223b21b57af6.tar.bz2 gentoo-8bd21b6cd5175237fccca706003f223b21b57af6.zip |
dev-texlive/texlive-humanities: add 2023_p68465
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'dev-texlive/texlive-humanities/files/texlive-humanities-2023-opbible-improve-Makefile-respect-user-flags.patch')
-rw-r--r-- | dev-texlive/texlive-humanities/files/texlive-humanities-2023-opbible-improve-Makefile-respect-user-flags.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/dev-texlive/texlive-humanities/files/texlive-humanities-2023-opbible-improve-Makefile-respect-user-flags.patch b/dev-texlive/texlive-humanities/files/texlive-humanities-2023-opbible-improve-Makefile-respect-user-flags.patch new file mode 100644 index 000000000000..1cc275440736 --- /dev/null +++ b/dev-texlive/texlive-humanities/files/texlive-humanities-2023-opbible-improve-Makefile-respect-user-flags.patch @@ -0,0 +1,62 @@ +From 2352b7c243be8b816511ff45377da26f7228fa72 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Wed, 28 Feb 2024 20:03:49 +0100 +Subject: [PATCH] opbible: improve Makefile, respect user's CXX, C(P|XX)FLAGS, + and LDFLAGS + +Make the Makefile respect the user's CXX, C(P|XX)FLAGS, and LDFLAGS by +either using GNU Make's implicit rules or by appending instead of +overriding the CXXFLAGS variable. This also has the nice advantage +that the Makefile becomes more idiomatic and shorter. + +The Makefile not respecting user variables was initially report by +Gentoo's CI and the following two downstream bugs: +- https://bugs.gentoo.org/925710 +- https://bugs.gentoo.org/925711 + +Also use pkg-config to determine sword's flags and libraries. +--- a/txs-gen/Makefile ++++ b/txs-gen/Makefile +@@ -5,35 +5,19 @@ + + ## definitions + +-CXX = g++ +-LD = g++ +-LIBS = -lsword +-LDFLAGS = $(LIBS) +-CXXFLAGS = -I/usr/include/sword ++LDLIBS = $(shell pkg-config --libs sword) + +-target = mod2tex +-objects = mod2tex.o ++CXXFLAGS += $(shell pkg-config --cflags sword) + + ## static rules + + .PHONY : all + +-all : $(target) +- +-$(target) : $(objects) +- $(LD) -o $@ $< $(LDFLAGS) +- +-$(objects) : %.o: %.cpp +- $(CXX) -c $(CXXFLAGS) -o $@ $< ++all : mod2tex + + .PHONY : clean + + clean : +- -rm -f *~ $(objects) $(target) +- +-## pattern rules +- +-%.o : %.cpp +- $(CXX) -c $(CFLAGS) $(CXXFLAGS) -o $@ $< ++ -rm -f *~ mod2tex + + ### Makefile ends here +-- +2.43.0 + |