diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-02-24 11:26:08 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-02-24 11:26:08 +0200 |
| commit | 5988231bf78811f0b4d166fcf2ff16b8d8cac2fc (patch) | |
| tree | ebbab6402e31909d9c29832f4224ec6c447b771a | |
| parent | a4336da435598fa7df4c7f88d1e3c18923a91a31 (diff) | |
libsrtp: Don't create a symlink if there is no $(SHAREDLIBVERSION)
Otherwise we create a symlink with the same name as the target, which will
create a symlink pointing to itself. Fixes the Windows build on Windows.
| -rw-r--r-- | recipes/libsrtp.recipe | 1 | ||||
| -rw-r--r-- | recipes/libsrtp/0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/recipes/libsrtp.recipe b/recipes/libsrtp.recipe index adee3fc1..91013a71 100644 --- a/recipes/libsrtp.recipe +++ b/recipes/libsrtp.recipe @@ -10,6 +10,7 @@ class Recipe(recipe.Recipe): stype = SourceType.TARBALL url = 'https://github.com/cisco/%(name)s/archive/v%(version)s.tar.gz' licenses = [License.BSD_like] + patches = ['libsrtp/0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch'] files_libs = ['libsrtp'] files_devel = ['include/srtp', 'lib/pkgconfig/libsrtp.pc'] diff --git a/recipes/libsrtp/0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch b/recipes/libsrtp/0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch new file mode 100644 index 00000000..e0c4fa97 --- /dev/null +++ b/recipes/libsrtp/0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch @@ -0,0 +1,29 @@ +From e01dd7b69e66d68373fab75b54220957609f248a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Wed, 24 Feb 2016 11:23:28 +0200 +Subject: [PATCH] Don't create a symlink if there is no $(SHAREDLIBVERSION) + +Otherwise we create a symlink with the same name as the target, which will +create a symlink pointing to itself. +--- + Makefile.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 8ff7305..5f9baa9 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -250,7 +250,9 @@ install: + $(INSTALL) -d $(DESTDIR)$(SHAREDLIB_DIR); \ + cp libsrtp2.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \ + cp libsrtp2.$(SHAREDLIBSUFFIXNOVER) $(DESTDIR)$(SHAREDLIB_DIR)/; \ +- ln -sfn libsrtp2.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp2.$(SHAREDLIBSUFFIXNOVER); \ ++ if [ -n "$(SHAREDLIBVERSION)" ]; then \ ++ ln -sfn libsrtp2.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp2.$(SHAREDLIBSUFFIXNOVER); \ ++ fi; \ + fi + if [ "$(pkgconfig_DATA)" != "" ]; then \ + $(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \ +-- +2.7.0 + |