[pacman-dev] [PATCH] Add LIBARCHIVE_CFLAGS to AM_CFLAGS
Should this get munged during submission, also available from: https://gist.githubusercontent.com/charles-dyfis-net/cdf720fe2a4df1ff97da/ra...
From 579787b51f8195801321ea23f2d92d531efac2f1 Mon Sep 17 00:00:00 2001 From: Charles Duffy <chaduffy@cisco.com> Date: Tue, 7 Apr 2015 15:15:31 -0500 Subject: [PATCH] Add LIBARCHIVE_CFLAGS to AM_CFLAGS
Fixes build if libarchive headers are not present in a location not already in the include path. Signed-off-by: Charles Duffy <chaduffy@cisco.com> --- src/pacman/Makefile.am | 2 +- src/util/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 5f10308..5f407c7 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -19,7 +19,7 @@ AM_CPPFLAGS = \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) $(LIBARCHIVE_CFLAGS) if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 936d7ff..3954c03 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -15,7 +15,7 @@ AM_CPPFLAGS = \ -DGPGDIR=\"$(gpgdir)\" \ -DCACHEDIR=\"$(cachedir)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) $(LIBARCHIVE_CFLAGS) cleanupdelta_SOURCES = cleanupdelta.c cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la -- 2.3.5
With commit 097d5a478b32, including alpm.h also drags in archive.h. Ensure the tools we build that depend on ALPM also include the necessary flags to find libarchive headers if they are not installed in a standard location. Signed-off-by: Dan McGee <dan@archlinux.org> --- I made this same patch a few days ago, if it matters. Here it is, sent via the normal git tools so it isn't munged. https://www.archlinux.org/pacman/submitting-patches.html src/pacman/Makefile.am | 3 ++- src/util/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 5f10308..dc127a2 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -19,7 +19,8 @@ AM_CPPFLAGS = \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 936d7ff..6a89ea6 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -15,7 +15,8 @@ AM_CPPFLAGS = \ -DGPGDIR=\"$(gpgdir)\" \ -DCACHEDIR=\"$(cachedir)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) cleanupdelta_SOURCES = cleanupdelta.c cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la -- 2.3.5
On 08/04/15 06:29, Dan McGee wrote:
With commit 097d5a478b32, including alpm.h also drags in archive.h. Ensure the tools we build that depend on ALPM also include the necessary flags to find libarchive headers if they are not installed in a standard location.
Signed-off-by: Dan McGee <dan@archlinux.org> ---
I made this same patch a few days ago, if it matters. Here it is, sent via the normal git tools so it isn't munged.
Charles got here first, so the commit goes to him! Dan has enough commits already. I did take this commit message. A
participants (3)
-
Allan McRae
-
Charles Duffy
-
Dan McGee