From 23d7bf5f4f16d13279127b3711ecc6bf279598ad Mon Sep 17 00:00:00 2001 From: Reto Achermann Date: Thu, 2 Jun 2016 13:08:28 +0200 Subject: [PATCH] libgmp: remove dependency to libbarrelfish Signed-off-by: Reto Achermann --- lib/gmp/Hakefile | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/gmp/Hakefile b/lib/gmp/Hakefile index 90bb7bf..c77e6b5 100644 --- a/lib/gmp/Hakefile +++ b/lib/gmp/Hakefile @@ -31,11 +31,14 @@ let gmp_url = "https://gmplib.org/download/gmp/gmp-6.1.0.tar.bz2" -- would not find its headers. commonLinkFlags arch = - [ Str "-nostdlib", NStr "-L", makeAbs $ NoDep BuildTree arch "/lib/" ] - ++ [ Str "-Wl,--start-group" ] - ++ (map makeAbs (optLibs (options arch))) - ++ (map makeAbs (extraLink arch)) - ++ [ + [ Str "-nostdlib", NStr "-L", makeAbs $ NoDep BuildTree arch "/lib/" ] ++ + [ Str "-Wl,--start-group" ] +-- The following line seems to add libbarrelfish as an dependency which +-- +-- ++ (map makeAbs (optLibs (options arch))) +-- ++ (map makeAbs (extraLink arch)) + ++ + [ Str "-Wl,--end-group", -- Enable the following flags for ld debugging -- Str "-Wl,-verbose=2", @@ -102,6 +105,7 @@ in [ ] ++ (getExternalDependency gmp_url gmp_archive) ++ Target arch "configure" ] ), + -- run configure Rule ( [ -- this is tricky as configure produces Makefile in . @@ -143,10 +147,10 @@ in [ ] ++ (getExternalDependency gmp_url gmp_archive) ++ Str "sed -i.orig s/HAVE_OBSTACK_VPRINTF/HAVE_OBSTACK_VPRINTF_nope/g", Out arch "config.h" ] - ++ - (map toDep (optLibs (options arch))) - ++ - (map toDep (extraLink arch)) +-- ++ +-- (map toDep (optLibs (options arch))) +-- ++ +-- (map toDep (extraLink arch)) ), -- run make Rule ( [ -- 1.7.2.5