guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] 01/01: build: Better handle substitutions in 'guile-2.0.


From: Ludovic Courtès
Subject: [Guile-commits] 01/01: build: Better handle substitutions in 'guile-2.0.pc' & co.
Date: Sat, 06 Dec 2014 14:57:49 +0000

civodul pushed a commit to branch stable-2.0
in repository guile.

commit 47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4
Author: Ludovic Courtès <address@hidden>
Date:   Sat Dec 6 15:57:23 2014 +0100

    build: Better handle substitutions in 'guile-2.0.pc' & co.
    
    * meta/Makefile.am (dependency_substitutions): Use '|' as the separate
      instead of ','.  See <http://hydra.nixos.org/build/17684751>.
---
 meta/Makefile.am |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/meta/Makefile.am b/meta/Makefile.am
index b48c8ec..0421277 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -74,22 +74,24 @@ substitute =                                                
                        \
         -e "s,address@hidden@],$$installed_guile,g"
 
 # Substitutions for dependencies that appear in 'guile-2.0.pc'.
+# Some of these may include things like "-Wl,-rpath", which is why we do
+# not use a comma to separate the 's' arguments.
 dependency_substitutions =                             \
-  -e "s,address@hidden@],$(BDW_GC_CFLAGS),g"           \
-  -e "s,address@hidden@],$(BDW_GC_LIBS),g"             \
-  -e "s,address@hidden@],$(LIB_CLOCK_GETTIME),g"       \
-  -e "s,address@hidden@],$(LIBGMP),g"                  \
-  -e "s,address@hidden@],$(LIBLTDL),g"                 \
-  -e "s,address@hidden@],$(LIBFFI_LIBS),g"             \
-  -e "s,address@hidden@],$(LIBUNISTRING),g"            \
-  -e "s,address@hidden@],$(LIBICONV),g"                        \
-  -e "s,address@hidden@],$(LIBINTL),g"                 \
-  -e "s,address@hidden@],$(LIBSOCKET),g"                       \
-  -e "s,address@hidden@],$(SERVENT_LIB),g"             \
-  -e "s,address@hidden@],$(HOSTENT_LIB),g"             \
-  -e "s,address@hidden@],$(GETADDRINFO_LIB),g" \
-  -e "s,address@hidden@],$(INET_NTOP_LIB),g"           \
-  -e "s,address@hidden@],$(INET_PTON_LIB),g"
+  -e "s|address@hidden@]|$(BDW_GC_CFLAGS)|g"           \
+  -e "s|address@hidden@]|$(BDW_GC_LIBS)|g"             \
+  -e "s|address@hidden@]|$(LIB_CLOCK_GETTIME)|g"       \
+  -e "s|address@hidden@]|$(LIBGMP)|g"                  \
+  -e "s|address@hidden@]|$(LIBLTDL)|g"                 \
+  -e "s|address@hidden@]|$(LIBFFI_LIBS)|g"             \
+  -e "s|address@hidden@]|$(LIBUNISTRING)|g"            \
+  -e "s|address@hidden@]|$(LIBICONV)|g"                        \
+  -e "s|address@hidden@]|$(LIBINTL)|g"                 \
+  -e "s|address@hidden@]|$(LIBSOCKET)|g"                       \
+  -e "s|address@hidden@]|$(SERVENT_LIB)|g"             \
+  -e "s|address@hidden@]|$(HOSTENT_LIB)|g"             \
+  -e "s|address@hidden@]|$(GETADDRINFO_LIB)|g" \
+  -e "s|address@hidden@]|$(INET_NTOP_LIB)|g"           \
+  -e "s|address@hidden@]|$(INET_PTON_LIB)|g"
 
 guile-2.0.pc: guile-2.0.pc.in
        $(substitute) < "$<" > "address@hidden"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]