Gentoo Archives: gentoo-commits

From: "Keri Harris (keri)" <keri@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/yap/files: yap-6.2.0-ld-library-path.patch
Date: Sat, 30 Oct 2010 03:52:23
Message-Id: 20101030035212.97B9820054@flycatcher.gentoo.org
1 keri 10/10/30 03:52:12
2
3 Added: yap-6.2.0-ld-library-path.patch
4 Log:
5 Add YAPLIBDIR to LD_LIBRARY_PATH when bootstrapping chr
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-lang/yap/files/yap-6.2.0-ld-library-path.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch?rev=1.1&content-type=text/plain
13
14 Index: yap-6.2.0-ld-library-path.patch
15 ===================================================================
16 --- yap-6.orig/configure.in 2010-10-18 21:48:20.000000000 +1300
17 +++ yap-6/configure.in 2010-10-30 10:02:49.000000000 +1300
18 @@ -924,7 +924,7 @@
19 then
20 YAPLIB_LD="\$(CC) -shared"
21 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
22 - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
23 + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
24 PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
25 else
26 YAPLIB_LD="\$(CC)"
27 @@ -946,7 +946,7 @@
28 DYNYAPLIB=libYap."$SO"
29 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
30 PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
31 - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
32 + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
33 ;;
34 *hpux*)
35 #do not use the first memory quadrant
36 @@ -985,7 +985,7 @@
37 DYNYAPLIB=libYap."$SO"
38 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
39 PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
40 - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
41 + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
42 ;;
43 *aix*)
44 # To actually use dlls in AIX I'd need to build YAP as a DLL first.
45 @@ -998,7 +998,7 @@
46 DYNYAPLIB=libYap."$SO"
47 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)"
48 PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
49 - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
50 + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
51 ;;
52 *osf*)
53 if ${use_condor} = no
54 @@ -1016,7 +1016,7 @@
55 DYNYAPLIB=libYap."$SO"
56 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
57 PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
58 - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
59 + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
60 ;;
61 *irix6*)
62 SHLIB_CFLAGS="$CFLAGS"
63 @@ -1030,7 +1030,7 @@
64 DYNYAPLIB=libYap."$SO"
65 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
66 PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
67 - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
68 + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
69 ;;
70 *darwin*)
71 if test ${use_dlcompat} = yes
72 @@ -1051,7 +1051,7 @@
73 SHLIB_LD="$CC -dynamiclib"
74 SHLIB_CXX_LD="$CXX -dynamiclib"
75 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(YAPLIBDIR)/\$@"
76 - INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
77 + INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
78 else
79 SHLIB_LD="$CC -dynamiclib -Wl,-undefined,dynamic_lookup"
80 SHLIB_CXX_LD="$CXX -dynamiclib -Wl,-undefined,dynamic_lookup"
81 @@ -1091,7 +1091,7 @@
82 DYNYAPLIB=libYap."$SO"
83 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)"
84 PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
85 - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
86 + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
87 ;;
88 *solaris*)
89 #an elf system
90 @@ -1110,7 +1110,7 @@
91 YAPLIB_LD="\$(CC)"
92 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
93 PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
94 - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
95 + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
96 else
97 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
98 PRE_INSTALL_ENV=""
99 @@ -1165,7 +1165,7 @@
100 DYNYAPLIB=libYap."$SO"
101 EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
102 PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
103 - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
104 + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
105 ;;
106 esac