aboutsummaryrefslogtreecommitdiffstats
path: root/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch')
-rw-r--r--testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch b/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch
new file mode 100644
index 0000000000..a4d5562d19
--- /dev/null
+++ b/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch
@@ -0,0 +1,30 @@
+From ff045066c141efc56697ea0ca0a29f8960267bd3 Mon Sep 17 00:00:00 2001
+From: Levente Polyak <levente@leventepolyak.net>
+Date: Wed, 30 May 2018 16:57:45 +0200
+Subject: [PATCH 3/3] make: don't dist .${LIBVERSION} into /usr/lib (#10164)
+
+Not exlucidng ^libr.{so,dynlin}$ doesn't do any good and will purely
+result in distributing a .${LIBVERSION} into $DESTDIR
+f.e. /usr/lib/.2.6.0
+
+Introduced by: 8bab02
+---
+ libr/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libr/Makefile b/libr/Makefile
+index 0d0257708..7e75a3a1e 100644
+--- a/libr/Makefile
++++ b/libr/Makefile
+@@ -171,7 +171,7 @@ install: install-includes install-pkgconfig
+ # TODO :Use INSTALL_DATA_DIR instead of mkdir
+ # libraries
+ @${INSTALL_DIR} "${DESTDIR}${LIBDIR}"
+- @$(foreach lib,$(shell find * -type f -iname "*.${EXT_SO}" | grep -v '(lib|parse)/t/' | grep lib | grep -v /bin/ | grep -v /p/), \
++ @$(foreach lib,$(shell find * -type f -iname "*.${EXT_SO}" | grep -vE '^libr\.${EXT_SO}$$' | grep -v '(lib|parse)/t/' | grep lib | grep -v /bin/ | grep -v /p/), \
+ echo " ${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
+ rm -f "${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
+ ${INSTALL_LIB} "$(lib)" "${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
+--
+2.17.1
+