| 1 |
commit: ae706e6aa468e81c88198f805c9a441b42f3d838 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 2 10:25:22 2022 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 2 10:25:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae706e6a |
| 7 |
|
| 8 |
sci-libs/linux-gpib-modules: Fix build if modules dir does not exist yet |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/linux-gpib-modules-4.3.4-depmod.patch | 21 +++++++++++++++++++++ |
| 13 |
.../linux-gpib-modules-4.3.4-r1.ebuild | 3 +++ |
| 14 |
2 files changed, 24 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000000..e858b974324c |
| 19 |
--- /dev/null |
| 20 |
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch |
| 21 |
@@ -0,0 +1,21 @@ |
| 22 |
+Depmod fails here since we're still in DESTDIR and the actual target path may |
| 23 |
+not exist... |
| 24 |
+ |
| 25 |
+ |
| 26 |
+diff -ruN linux-gpib-kernel-4.3.4.orig/Makefile linux-gpib-kernel-4.3.4/Makefile |
| 27 |
+--- linux-gpib-kernel-4.3.4.orig/Makefile 2020-12-29 10:42:34.000000000 +0100 |
| 28 |
++++ linux-gpib-kernel-4.3.4/Makefile 2022-08-02 12:21:38.097344102 +0200 |
| 29 |
+@@ -20,13 +20,9 @@ |
| 30 |
+ M="$(GPIB_SRCDIR)/drivers/gpib" \ |
| 31 |
+ GPIB_TOP_DIR=$(GPIB_SRCDIR) |
| 32 |
+ |
| 33 |
+-#We run depmod explicitly because the depmod.sh script run |
| 34 |
+-#by modules_install fails on Debian due to it failing to find |
| 35 |
+-#the System.map file. |
| 36 |
+ install: |
| 37 |
+ $(MAKE) -C $(LINUX_SRCDIR) V=$(VERBOSE) modules_install\ |
| 38 |
+ M="$(GPIB_SRCDIR)/drivers/gpib" \ |
| 39 |
+ GPIB_TOP_DIR=$(GPIB_SRCDIR) \ |
| 40 |
+ INSTALL_MOD_DIR=gpib |
| 41 |
+- /sbin/depmod -A |
| 42 |
+ |
| 43 |
|
| 44 |
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild |
| 45 |
index deba2dcfbbd1..40897bc634f4 100644 |
| 46 |
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild |
| 47 |
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild |
| 48 |
@@ -25,6 +25,9 @@ BDEPEND="virtual/pkgconfig" |
| 49 |
PATCHES=( |
| 50 |
# https://sourceforge.net/p/linux-gpib/code/1998/ |
| 51 |
"${FILESDIR}/${P}-kernel-5.17.patch" |
| 52 |
+ |
| 53 |
+ # don't fix debian bugs if they break gentoo |
| 54 |
+ "${FILESDIR}/${P}-depmod.patch" |
| 55 |
) |
| 56 |
|
| 57 |
pkg_setup() { |
Archives