diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2021-02-17 19:49:31 -0500 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2021-02-17 20:09:46 -0500 |
| commit | 7703bea34d8ec85f3546553277e075fd139300da (patch) | |
| tree | af842a9d5e9978d31c3208ca242ff2a827d75f54 | |
| parent | e915926d0bb1d51f5e88b296a4adf48ea1bb72d5 (diff) | |
drop pkgconfig.patch, merged upstream
| -rw-r--r-- | debian/patches/pkgconfig.patch | 32 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 33 deletions
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch deleted file mode 100644 index 078e9a3..0000000 --- a/debian/patches/pkgconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Reinhard Tartler <siretart@tauware.de> -Subject: Use pkg-config to locate libxml2 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949053 - -diff --git a/AspectC++/ACModel/Makefile b/AspectC++/ACModel/Makefile -index 8f6a160..edb05d0 100644 ---- a/AspectC++/ACModel/Makefile -+++ b/AspectC++/ACModel/Makefile -@@ -16,7 +16,7 @@ include $(PUMA)/vars.mk - ifeq ($(_TARGET),win32) - LIBXML2_INC := `mingw32-xml2-config --cflags` - else -- LIBXML2_INC := `xml2-config --cflags` -+ LIBXML2_INC := `pkg-config --cflags libxml-2.0` - endif - - CPPFLAGS += -I$(PUMA)/extern $(LIBXML2_INC) -diff --git a/AspectC++/Makefile b/AspectC++/Makefile -index 44bf49a..3e54764 100644 ---- a/AspectC++/Makefile -+++ b/AspectC++/Makefile -@@ -26,8 +26,8 @@ ifneq ($(filter win%,$(TARGET)),) - endif - - # libxml2 settings --LIBXML2_INC := `xml2-config --cflags` --LIBXML2_LIB := `xml2-config --libs` -+LIBXML2_INC := `pkg-config --cflags libxml-2.0` -+LIBXML2_LIB := `pkg-config --libs libxml-2.0` - - # Check Clang version and define all necessary symbols (LLVM_*) - ifneq ($(MAKECMDGOALS),clean) diff --git a/debian/patches/series b/debian/patches/series index d93ba03..a79c6d2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ clang-gcc14-workaround.patch float128.patch -pkgconfig.patch |