|
 |
ca265e |
diff -up ./esc/configure.ac.fix12 ./esc/configure.ac
|
|
|
ca265e |
--- ./esc/configure.ac.fix12 2021-09-27 14:53:49.932567105 -0700
|
|
|
ca265e |
+++ ./esc/configure.ac 2021-09-27 15:31:30.949185258 -0700
|
|
|
ca265e |
@@ -47,6 +47,30 @@ PKG_CHECK_MODULES([DBUS],[dbus-1])
|
|
|
ca265e |
AC_PROG_CC_STDC
|
|
|
ca265e |
|
|
|
ca265e |
# Compiler flags
|
|
|
ca265e |
+
|
|
|
ca265e |
+AC_CANONICAL_HOST
|
|
|
ca265e |
+ARCH_CPPFLAGS=""
|
|
|
ca265e |
+ARCH_CFLAGS=""
|
|
|
ca265e |
+
|
|
|
ca265e |
+AS_CASE([$host_os],
|
|
|
ca265e |
+ [linux*],
|
|
|
ca265e |
+ [
|
|
|
ca265e |
+ AS_CASE([$host_cpu],
|
|
|
ca265e |
+ [x86_64],
|
|
|
ca265e |
+ [
|
|
|
ca265e |
+ ARCH_CPPFLAGS="-fcf-protection=full"
|
|
|
ca265e |
+ ARCH_CFLAGS="-fcf-protection=full"
|
|
|
ca265e |
+ ],
|
|
|
ca265e |
+ [i?86],
|
|
|
ca265e |
+ [
|
|
|
ca265e |
+ ARCH_CPPFLAGS="-fcf-protection=full"
|
|
|
ca265e |
+ ARCH_CFLAGS="-fcf-protection=full"
|
|
|
ca265e |
+ ])
|
|
|
ca265e |
+ ])
|
|
|
ca265e |
+AC_SUBST(ARCH_CPPFLAGS)
|
|
|
ca265e |
+AC_SUBST(ARCH_CFLAGS)
|
|
|
ca265e |
+
|
|
|
ca265e |
+
|
|
|
ca265e |
ESC_CFLAGS="$GOBJECT_CFLAGS"
|
|
|
ca265e |
ESC_LIBS="$GOBJECT_LIBS $NSS_LIBS"
|
|
|
ca265e |
|
|
|
ca265e |
diff -up ./esc/src/lib/coolkey/Makefile.am.fix12 ./esc/src/lib/coolkey/Makefile.am
|
|
|
ca265e |
--- ./esc/src/lib/coolkey/Makefile.am.fix12 2021-09-27 15:26:24.130634037 -0700
|
|
|
ca265e |
+++ ./esc/src/lib/coolkey/Makefile.am 2021-09-27 15:27:24.332545740 -0700
|
|
|
ca265e |
@@ -24,7 +24,7 @@ EXTRA_DIST =
|
|
|
ca265e |
DISTCLEANFILES =
|
|
|
ca265e |
lib_LTLIBRARIES =
|
|
|
ca265e |
bin_PROGRAMS =
|
|
|
ca265e |
-COOLKEY_CFLAGS=-D_FORTIFY_SOURCE=2 -fcf-protection=full
|
|
|
ca265e |
+COOLKEY_CFLAGS=-D_FORTIFY_SOURCE=2 $(ARCH_CFLAGS)
|
|
|
ca265e |
|
|
|
ca265e |
AM_CPPFLAGS += \
|
|
|
ca265e |
$(COOLKEY_CFLAGS) \
|
|
|
ca265e |
diff -up ./esc/src/lib/coolkey-mgr/Makefile.am.fix12 ./esc/src/lib/coolkey-mgr/Makefile.am
|
|
|
ca265e |
--- ./esc/src/lib/coolkey-mgr/Makefile.am.fix12 2021-09-27 15:34:18.400943562 -0700
|
|
|
ca265e |
+++ ./esc/src/lib/coolkey-mgr/Makefile.am 2021-09-27 15:34:51.020896480 -0700
|
|
|
ca265e |
@@ -24,7 +24,7 @@ EXTRA_DIST =
|
|
|
ca265e |
DISTCLEANFILES =
|
|
|
ca265e |
lib_LTLIBRARIES =
|
|
|
ca265e |
bin_PROGRAMS =
|
|
|
ca265e |
-COOLKEY_MGR_CFLAGS=-fcf-protection=full
|
|
|
ca265e |
+COOLKEY_MGR_CFLAGS=$(ARCH_CFLAGS)
|
|
|
ca265e |
|
|
|
ca265e |
OTHER_CPPFLAGS = -I ../coolkey $(PCSC_CFLAGS) $(COOLKEY_MGR_CFLAGS)
|
|
|
ca265e |
OTHER_LIBS = -L../coolkey/.libs -lCoolkey-1.0 -L../nss-http-client/.libs -lNssHttpClient-1.0 $(DBUS_LIBS)
|
|
|
ca265e |
diff -up ./esc/src/lib/nss-http-client/Makefile.am.fix12 ./esc/src/lib/nss-http-client/Makefile.am
|
|
|
ca265e |
--- ./esc/src/lib/nss-http-client/Makefile.am.fix12 2021-09-27 15:33:16.482032935 -0700
|
|
|
ca265e |
+++ ./esc/src/lib/nss-http-client/Makefile.am 2021-09-27 15:34:04.524963592 -0700
|
|
|
ca265e |
@@ -24,7 +24,7 @@ EXTRA_DIST =
|
|
|
ca265e |
DISTCLEANFILES =
|
|
|
ca265e |
lib_LTLIBRARIES =
|
|
|
ca265e |
bin_PROGRAMS =
|
|
|
ca265e |
-NSS_HTTP_CLIENT_CFLAGS=-D_FORTIFY_SOURCE=2 -fcf-protection=full
|
|
|
ca265e |
+NSS_HTTP_CLIENT_CFLAGS=-D_FORTIFY_SOURCE=2 $(ARCH_CFLAGS)
|
|
|
ca265e |
AM_CPPFLAGS += \
|
|
|
ca265e |
$(NSS_HTTP_CLIENT_CFLAGS) \
|
|
|
ca265e |
$(NULL)
|