From 8a9ff3b41f55d262696b75dec8443c5188a9da7b Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 16 Nov 2009 18:42:35 +0000
Subject: * configure.ac: Add libelf to host_libs.  Enable in-tree configury of
 ppl and cloog.  Fix in-tree configury of libelf, skip tests. Fix portability
 of test of C++ as bootstrap language.  Add ppl/src/ppl-config.o to the
 bootstrap compare exclusion list. * configure: Rebuild. * Makefile.def: Drop
 host and target settings from gmp, mpfr, ppl, and cloog.  Fix in-tree ppl
 configuration.  Introduce libelf in-tree building. * Makefile.tpl
 (POSTSTAGE1_CXX_EXPORT): New. (POSTSTAGE1_HOST_EXPORTS): Use it.
 (STAGE[+id+]_CXXFLAGS): New. (BASE_FLAGS_TO_PASS): Pass it down.
 (configure-stage[+id+]-[+prefix+][+module+]): Use it.  Add extra_exports.
 (all-stage[+id+]-[+prefix+][+module+]): Likewise.
 (configure-[+prefix+][+module+], all-[+prefix+][+module+]): Add
 extra_exports. * Makefile.in: Rebuild. * configure.ac (FLAGS_FOR_TARGET): 
 Add -L and -isystem paths for *-w64-mingw* and x86_64-*mingw*. * configure:
 Regenerated. * configure.ac: Disable target-winsup & co for x86_64-*-mingw*
 and *-w64-mingw* targets. * configure: Regenerated. * configure.ac (CLooG
 test): Use = with test. * configure: Regenerate. * configure.ac: Do not set
 LIBS for ppl/cloog checks.  Disable cloog if the ppl version check failed. 
 Move flags saving before setting in libelf check. * configure: Regenerate. *
 configure.ac: Adjust the ppl and cloog configure to work as documented. 
 Disable cloog if ppl was disabled.  Omit the version checks if they were
 disabled. * configure: Re-generate.

---
 Makefile.def | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'Makefile.def')

diff --git a/Makefile.def b/Makefile.def
index 5541a67433..496213f2f7 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -62,27 +62,24 @@ host_modules= { module= gawk; };
 host_modules= { module= gettext; };
 host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
 		extra_configure_flags='--disable-shared';
-		no_install= true; 
-	        host="none-${host_vendor}-${host_os}";
-		target="none-${host_vendor}-${host_os}"; };
+		no_install= true; };
 host_modules= { module= mpfr; lib_path=.libs; bootstrap=true;
 		extra_configure_flags='--disable-shared @extra_mpfr_configure_flags@';
-		no_install= true; 
-	        host="none-${host_vendor}-${host_os}";
-		target="none-${host_vendor}-${host_os}"; };
+		no_install= true; };
 host_modules= { module= mpc; lib_path=.libs; bootstrap=true;
 		extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@';
 		no_install= true; };
-host_modules= { module= ppl; lib_path=.libs; bootstrap=true;
+host_modules= { module= ppl; lib_path=src/.libs; bootstrap=true;
 		extra_configure_flags='--disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/';
-		no_install= true; 
-	        host="none-${host_vendor}-${host_os}";
-		target="none-${host_vendor}-${host_os}"; };
+		no_install= true; };
 host_modules= { module= cloog; lib_path=.libs; bootstrap=true;
-		extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp';
-		no_install= true; 
-	        host="none-${host_vendor}-${host_os}";
-		target="none-${host_vendor}-${host_os}"; };
+		extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl';
+		extra_exports='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS; ';
+		extra_make_flags='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"';
+		no_install= true; };
+host_modules= { module= libelf; lib_path=.libs; bootstrap=true;
+		extra_configure_flags='--disable-shared';
+		no_install= true; };
 host_modules= { module= gnuserv; };
 host_modules= { module= gold; bootstrap=true; };
 host_modules= { module= gprof; };
@@ -326,6 +323,7 @@ dependencies = { module=all-gcc; on=all-mpfr; };
 dependencies = { module=all-gcc; on=all-mpc; };
 dependencies = { module=all-gcc; on=all-ppl; };
 dependencies = { module=all-gcc; on=all-cloog; };
+dependencies = { module=all-gcc; on=all-libelf; };
 dependencies = { module=all-gcc; on=all-build-texinfo; };
 dependencies = { module=all-gcc; on=all-build-bison; };
 dependencies = { module=all-gcc; on=all-build-byacc; };
-- 
cgit v1.2.1

