| 1 |
commit: cd03bb12fa2799c76987346f6834b78fda9285a7 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 29 16:33:42 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 29 16:33:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eselect.git/commit/?id=cd03bb12 |
| 7 |
|
| 8 |
New get_libdir function. |
| 9 |
|
| 10 |
* libs/multilib.bash.in (get_libdir): New function. |
| 11 |
* doc/developer-guide.txt: Describe it. |
| 12 |
* libs/Makefile.am (dosed): Substitute @libdir@. |
| 13 |
* misc/eselect-mode.el (eselect-mode-keywords-multilib): |
| 14 |
Add get_libdir. |
| 15 |
|
| 16 |
ChangeLog | 8 ++++++++ |
| 17 |
doc/developer-guide.txt | 6 ++++++ |
| 18 |
libs/Makefile.am | 3 ++- |
| 19 |
libs/multilib.bash.in | 7 +++++++ |
| 20 |
misc/eselect-mode.el | 2 +- |
| 21 |
5 files changed, 24 insertions(+), 2 deletions(-) |
| 22 |
|
| 23 |
diff --git a/ChangeLog b/ChangeLog |
| 24 |
index d94fe63..4f6510e 100644 |
| 25 |
--- a/ChangeLog |
| 26 |
+++ b/ChangeLog |
| 27 |
@@ -1,3 +1,11 @@ |
| 28 |
+2018-05-29 Ulrich Müller <ulm@g.o> |
| 29 |
+ |
| 30 |
+ * libs/multilib.bash.in (get_libdir): New function. |
| 31 |
+ * doc/developer-guide.txt: Describe it. |
| 32 |
+ * libs/Makefile.am (dosed): Substitute @libdir@. |
| 33 |
+ * misc/eselect-mode.el (eselect-mode-keywords-multilib): |
| 34 |
+ Add get_libdir. |
| 35 |
+ |
| 36 |
2018-01-24 Ulrich Müller <ulm@g.o> |
| 37 |
|
| 38 |
* configure.ac: Update version to 1.4.12. |
| 39 |
|
| 40 |
diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt |
| 41 |
index ddef9f7..408b2a7 100644 |
| 42 |
--- a/doc/developer-guide.txt |
| 43 |
+++ b/doc/developer-guide.txt |
| 44 |
@@ -473,6 +473,12 @@ used architecture. By default it uses /etc/ld.so.conf to obtain all |
| 45 |
valid libdirs. If this fails due to a missing or broken file, this |
| 46 |
function uses ``uname`` to determine the architecture. |
| 47 |
|
| 48 |
+The ``get_libdir`` function |
| 49 |
+,,,,,,,,,,,,,,,,,,,,,,,,,,, |
| 50 |
+ |
| 51 |
+The ``get_libdir`` function prints the basename of the libdir path that |
| 52 |
+was passed to eselect's configure. |
| 53 |
+ |
| 54 |
Package-manager functions |
| 55 |
------------------------- |
| 56 |
|
| 57 |
|
| 58 |
diff --git a/libs/Makefile.am b/libs/Makefile.am |
| 59 |
index 027ef73..6ebd08e 100644 |
| 60 |
--- a/libs/Makefile.am |
| 61 |
+++ b/libs/Makefile.am |
| 62 |
@@ -30,7 +30,8 @@ dosed = @SED@ \ |
| 63 |
-e 's%\@SED\@%@SED@%g' \ |
| 64 |
-e 's%\@PORTAGEQ\@%@PORTAGEQ@%g' \ |
| 65 |
-e 's%\@ENV_UPDATE\@%@ENV_UPDATE@%g' \ |
| 66 |
- -e 's%\@CANONICALISE\@%@CANONICALISE@%g' |
| 67 |
+ -e 's%\@CANONICALISE\@%@CANONICALISE@%g' \ |
| 68 |
+ -e 's%\@libdir\@%@libdir@%g' |
| 69 |
|
| 70 |
%.bash : %.bash.in |
| 71 |
@$(dosed) $< > $@ |
| 72 |
|
| 73 |
diff --git a/libs/multilib.bash.in b/libs/multilib.bash.in |
| 74 |
index 4225adb..e84670e 100644 |
| 75 |
--- a/libs/multilib.bash.in |
| 76 |
+++ b/libs/multilib.bash.in |
| 77 |
@@ -28,3 +28,10 @@ list_libdirs() { |
| 78 |
done |
| 79 |
echo "${libdirs[@]}" |
| 80 |
} |
| 81 |
+ |
| 82 |
+# get_libdir |
| 83 |
+# Print the basename of the libdir path |
| 84 |
+get_libdir() { |
| 85 |
+ local libdir="@libdir@" |
| 86 |
+ echo "${libdir##*/}" |
| 87 |
+} |
| 88 |
|
| 89 |
diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el |
| 90 |
index b51b60b..762137a 100644 |
| 91 |
--- a/misc/eselect-mode.el |
| 92 |
+++ b/misc/eselect-mode.el |
| 93 |
@@ -61,7 +61,7 @@ |
| 94 |
font-lock-type-face)) |
| 95 |
|
| 96 |
(defvar eselect-mode-keywords-multilib |
| 97 |
- '(("list_libdirs") |
| 98 |
+ '(("list_libdirs" "get_libdir") |
| 99 |
font-lock-type-face)) |
| 100 |
|
| 101 |
(defvar eselect-mode-keywords-package-manager |
Archives