Source: blahtexml Version: 0.9-1.1 User: debian-...@lists.debian.org Usertags: pac-bti Tags: patch
Hi, blahtexml currently hardcodes CFLAGS in the Makefile. Additionally, it does not use CXXFLAGS for C++ code and uses a deprecated debhelper compatibility level (7), which does not set environment variables listed by dpkg-buildflags. Please consider applying the attached patches to ensure the package uses the default build flags set by dpkg-buildflags. This is necessary, among other things, to enable PAC/BTI on arm64: https://wiki.debian.org/ToolChain/PACBTI
>From ab969b5f8620be60c2ad6aef144b99e1d254f5e6 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca <e...@debian.org> Date: Fri, 14 Mar 2025 13:58:22 +0100 Subject: [PATCH 1/2] Do not override CFLAGS, use CXXFLAGS for cpp --- makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/makefile b/makefile index 32490ff..e1c61f0 100644 --- a/makefile +++ b/makefile @@ -93,20 +93,18 @@ $(BINDIR)/InputSymbolTranslation.o: InputSymbolTranslation.cpp InputSymbolTransl $(BINDIR_XMLIN)/InputSymbolTranslation.o: InputSymbolTranslation.cpp InputSymbolTranslation.inc -CFLAGS = -O2 - VPATH = Source:Source/BlahtexCore:Source/BlahtexXMLin INCLUDES=-I. -ISource -ISource/BlahtexCore -ISource/BlahtexXMLin $(BINDIR)/%.o:%.cpp - $(CXX) $(INCLUDES) $(CFLAGS) -c $< -o $@ + $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -o $@ $(BINDIR)/%.o:%.c $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ $(BINDIR_XMLIN)/%.o:%.cpp - $(CXX) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ + $(CXX) $(INCLUDES) $(CXXFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ $(BINDIR_XMLIN)/%.o:%.c $(CC) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ @@ -115,13 +113,13 @@ blahtex-linux: $(BINDIR) $(OBJECTS) $(HEADERS) $(CXX) $(CFLAGS) -o blahtex $(OBJECTS) blahtex-mac: $(BINDIR) $(OBJECTS) $(HEADERS) - $(CXX) $(CFLAGS) -o blahtex -liconv $(OBJECTS) + $(CXX) $(CXXFLAGS) -o blahtex -liconv $(OBJECTS) blahtexml-linux: $(BINDIR_XMLIN) $(OBJECTS_XMLIN) $(HEADERS_XMLIN) - $(CXX) $(CFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c + $(CXX) $(CXXFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c blahtexml-mac: $(BINDIR_XMLIN) $(OBJECTS_XMLIN) $(HEADERS_XMLIN) - $(CXX) $(CFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) -lxerces-c + $(CXX) $(CXXFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) -lxerces-c clean: rm -f blahtex $(OBJECTS) blahtexml $(OBJECTS_XMLIN) -- 2.39.5
>From e41e51b0f3d612fa195aa67d124cfaadeef9aca7 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca <e...@debian.org> Date: Fri, 14 Mar 2025 14:35:57 +0100 Subject: [PATCH 2/2] Set debhelper compatibility level to 13 --- debian/compat | 1 - debian/control | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/control b/debian/control index 76051ce..3bc9f34 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: blahtexml Section: text Priority: extra Maintainer: Abhishek Dasgupta <abh...@gmail.com> -Build-Depends: debhelper (>= 7.0.50), libxerces-c-dev +Build-Depends: debhelper-compat (= 13), libxerces-c-dev Standards-Version: 3.9.2 Homepage: http://gva.noekeon.org/blahtexml/ Vcs-Git: git://github.com/abhidg/pkg-blahtexml.git -- 2.39.5
