From e12be9ad65952b1a851b28b1e64c0714f2fa2676 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Wed, 24 Jul 2019 20:19:03 +0000 Subject: [PATCH] Patch a Makefile to reorder CPPFLAGS so it uses local headers instead of installed headers. --- .../files/patch-plugins_tools_eid-viewer_Makefile.am | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/security/beid/files/patch-plugins_tools_eid-viewer_Makefile.am b/security/beid/files/patch-plugins_tools_eid-viewer_Makefile.am index 8d8b4e351adf..d90159bf3a77 100644 --- a/security/beid/files/patch-plugins_tools_eid-viewer_Makefile.am +++ b/security/beid/files/patch-plugins_tools_eid-viewer_Makefile.am @@ -1,5 +1,14 @@ --- plugins_tools/eid-viewer/Makefile.am.orig 2019-07-11 14:08:46 UTC +++ plugins_tools/eid-viewer/Makefile.am +@@ -121,7 +121,7 @@ dist_eidvinclude_HEADERS = \ + eid_viewer_LDADD = @GTK_LIBS@ @GIO_LIBS@ @SSL_LIBS@ @XML2_LIBS@ @CURL_LIBS@ @libproxy_LIBS@ $(top_builddir)/plugins_tools/util/liblabels.la libeidviewer.la + libeidviewer_la_LIBADD = $(top_builddir)/plugins_tools/util/liblabels.la $(top_builddir)/cardcomm/pkcs11/src/libbeidpkcs11.la @SSL_LIBS@ @XML2_LIBS@ + libeidviewer_la_LDFLAGS = -version-info 1:0:1 +-AM_CFLAGS = @GTK_CFLAGS@ -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/rsaref220 -I$(top_srcdir)/plugins_tools/util @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden ++AM_CPPFLAGS = -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/rsaref220 -I$(top_srcdir)/plugins_tools/util @GTK_CFLAGS@ @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden + AM_CXXFLAGS = $(AM_CFLAGS) -std=c++98 + SUBDIRS = . gtk/po test + @@ -200,7 +200,9 @@ dist_trust_DATA = \ certs/belgiumrca4.pem