Blame gnupg-1.4.1-gcc.patch

Brian C. Lane 17fd59f
From e89e07669e5bb46023f08d5c0b69065a931f9d27 Mon Sep 17 00:00:00 2001
Brian C. Lane 17fd59f
From: "Brian C. Lane" <bcl@redhat.com>
Brian C. Lane 17fd59f
Date: Mon, 30 Jan 2012 09:47:40 -0800
Brian C. Lane 17fd59f
Subject: [PATCH] Call gcc directly to build assembly files, so that CFLAGS
Brian C. Lane 17fd59f
 which are needed during preprocessing (-DPIC) get properly
Brian C. Lane 17fd59f
 passed to the preprocessor.
Brian C. Lane 17fd59f
Brian C. Lane 17fd59f
---
Brian C. Lane 17fd59f
 configure.ac    |    1 +
Brian C. Lane 17fd59f
 mpi/Makefile.am |    5 +++++
Brian C. Lane 17fd59f
 2 files changed, 6 insertions(+), 0 deletions(-)
Brian C. Lane 17fd59f
Brian C. Lane 17fd59f
diff --git a/configure.ac b/configure.ac
Brian C. Lane 17fd59f
index 5dc0a52..55d9bc2 100644
Brian C. Lane 17fd59f
--- a/configure.ac
Brian C. Lane 17fd59f
+++ b/configure.ac
Brian C. Lane 17fd59f
@@ -1398,6 +1398,7 @@ fi
Brian C. Lane 17fd59f
 
Brian C. Lane 17fd59f
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
Brian C. Lane 17fd59f
 
Brian C. Lane 17fd59f
+AM_CONDITIONAL(USING_GCC, test x$GCC = xyes)
Brian C. Lane 17fd59f
 
Brian C. Lane 17fd59f
 # add some extra libs here so that previous tests don't fail for
Brian C. Lane 17fd59f
 # mysterious reasons - the final link step should bail out.
Brian C. Lane 17fd59f
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
Brian C. Lane 17fd59f
index 7610e27..27d36b8 100644
Brian C. Lane 17fd59f
--- a/mpi/Makefile.am
Brian C. Lane 17fd59f
+++ b/mpi/Makefile.am
Brian C. Lane 17fd59f
@@ -69,9 +69,14 @@ libmpi_a_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
Brian C. Lane 17fd59f
 
Brian C. Lane 17fd59f
 # cancel the default rules used by libtool which do not really
Brian C. Lane 17fd59f
 # work and add one to cpp .S files
Brian C. Lane 17fd59f
+if USING_GCC
Brian C. Lane 17fd59f
+.S.o:
Brian C. Lane 17fd59f
+	 $(COMPILE) $(AM_CCASFLAGS) -c $<
Brian C. Lane 17fd59f
+else
Brian C. Lane 17fd59f
 .S.o:
Brian C. Lane 17fd59f
 	 $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > _$*.s
Brian C. Lane 17fd59f
 	 $(COMPILE) $(AM_CCASFLAGS) -c _$*.s
Brian C. Lane 17fd59f
 	 mv -f _$*.o $*.o
Brian C. Lane 17fd59f
+endif
Brian C. Lane 17fd59f
 
Brian C. Lane 17fd59f
 .S.lo:
Brian C. Lane 17fd59f
-- 
Brian C. Lane 17fd59f
1.7.6.5
Brian C. Lane 17fd59f