87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
Index: common/Makefile.am
|
|
===================================================================
|
|
--- common/Makefile.am.orig
|
|
+++ common/Makefile.am
|
|
@@ -31,7 +31,7 @@ CLEANFILES = audit-events.h status-codes
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
|
|
|
|
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
|
|
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) -fPIC
|
|
|
|
include $(top_srcdir)/am/cmacros.am
|
|
|
|
Index: gl/Makefile.am
|
|
===================================================================
|
|
--- gl/Makefile.am.orig
|
|
+++ gl/Makefile.am
|
|
@@ -13,6 +13,8 @@
|
|
|
|
AUTOMAKE_OPTIONS = 1.5 gnits
|
|
|
|
+AM_CFLAGS = -fPIC
|
|
+
|
|
noinst_LIBRARIES = libgnu.a
|
|
|
|
libgnu_a_SOURCES =
|
|
Index: jnlib/Makefile.am
|
|
===================================================================
|
|
--- jnlib/Makefile.am.orig
|
|
+++ jnlib/Makefile.am
|
|
@@ -27,7 +27,7 @@ TESTS = $(module_tests)
|
|
AM_CPPFLAGS = -I$(top_srcdir)/intl
|
|
|
|
# We need libgcrypt because libjnlib-config includes gcrypt.h
|
|
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
|
|
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) -fPIC
|
|
|
|
noinst_LIBRARIES = libjnlib.a
|
|
|
|
Index: tools/Makefile.am
|
|
===================================================================
|
|
--- tools/Makefile.am.orig
|
|
+++ tools/Makefile.am
|
|
@@ -25,14 +25,14 @@ EXTRA_DIST = \
|
|
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
|
|
include $(top_srcdir)/am/cmacros.am
|
|
|
|
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
|
|
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS) -fPIE
|
|
|
|
sbin_SCRIPTS = addgnupghome applygnupgdefaults
|
|
|
|
bin_SCRIPTS = gpgsm-gencert.sh
|
|
if HAVE_USTAR
|
|
-# bin_SCRIPTS += gpg-zip
|
|
-noinst_SCRIPTS = gpg-zip
|
|
+bin_SCRIPTS += gpg-zip
|
|
+#noinst_SCRIPTS = gpg-zip
|
|
endif
|
|
|
|
if BUILD_SYMCRYPTRUN
|
|
@@ -43,14 +43,14 @@ endif
|
|
|
|
bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun}
|
|
if !HAVE_W32_SYSTEM
|
|
-bin_PROGRAMS += watchgnupg gpgparsemail
|
|
+bin_PROGRAMS += watchgnupg gpgparsemail gpgsplit
|
|
endif
|
|
|
|
if !DISABLE_REGEX
|
|
libexec_PROGRAMS = gpg-check-pattern
|
|
endif
|
|
|
|
-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
|
|
+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert
|
|
|
|
common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
|
|
pwquery_libs = ../common/libsimple-pwquery.a
|
|
@@ -59,6 +59,7 @@ gpgsplit_LDADD = $(common_libs) \
|
|
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
|
$(ZLIBS) $(LIBINTL) $(LIBICONV)
|
|
|
|
+gpgsplit_LDFLAGS = -pie
|
|
gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
|
|
|
|
# jnlib/common sucks in gpg-error, will they, nil they (some compilers
|