From e602a1bd6ad19aef159c106b47eaebb5afe2359d Mon Sep 17 00:00:00 2001 From: Anton Lokhmotov Date: Fri, 12 Feb 2021 19:22:31 +0000 Subject: [PATCH 1/3] Add post-install symbolic linking: lib64->lib. --- .../scripts.linux/post-install2.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 package/lib-protobuf-trunk-host/scripts.linux/post-install2.sh diff --git a/package/lib-protobuf-trunk-host/scripts.linux/post-install2.sh b/package/lib-protobuf-trunk-host/scripts.linux/post-install2.sh new file mode 100644 index 00000000..9c4315de --- /dev/null +++ b/package/lib-protobuf-trunk-host/scripts.linux/post-install2.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Make sure we can reach our libraries via lib/ even if they were originally put into lib64/ + +if [ -d "$INSTALL_DIR/install/lib64" ]; then + + if ! [ -d "$INSTALL_DIR/install/lib" ]; then + mkdir ${INSTALL_DIR}/install/lib + fi + + cp -r ${INSTALL_DIR}/install/lib64/* ${INSTALL_DIR}/install/lib +fi From 9f9caeccf371a8ae3dfd7a461cff5a7aa3d8a33c Mon Sep 17 00:00:00 2001 From: Anton Lokhmotov Date: Fri, 12 Feb 2021 19:24:04 +0000 Subject: [PATCH 2/3] Add variations: vmaster, v3.{12..14}. --- package/lib-protobuf-trunk-host/.cm/meta.json | 56 +++++++++++++++++-- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/package/lib-protobuf-trunk-host/.cm/meta.json b/package/lib-protobuf-trunk-host/.cm/meta.json index 0d074471..e717e166 100644 --- a/package/lib-protobuf-trunk-host/.cm/meta.json +++ b/package/lib-protobuf-trunk-host/.cm/meta.json @@ -17,7 +17,7 @@ "PACKAGE_URL": "https://github.com/google/protobuf" }, "use_git_revision": "yes", - "version": "0" + "no_ver_in_suggested_path": "yes" }, "deps": { "cmake": { @@ -50,11 +50,59 @@ "process_script": "install", "soft_uoa": "57c5f409aaf1ceed", "suggested_path": "lib-protobuf-host", + "variations": { + "vtrunk": { + "extra_env": { + "PACKAGE_GIT_CHECKOUT": "master", + "PACKAGE_VERSION": "master" + } + }, + "vmaster": { + "extra_env": { + "PACKAGE_GIT_CHECKOUT": "master", + "PACKAGE_VERSION": "master" + } + }, + "v3.14": { + "extra_env": { + "PACKAGE_GIT_CHECKOUT": "v3.14.0", + "PACKAGE_VERSION": "3.14.0" + } + }, + "v3.14.0": { + "extra_env": { + "PACKAGE_GIT_CHECKOUT": "v3.14.0", + "PACKAGE_VERSION": "3.14.0" + } + }, + "v3.13": { + "extra_env": { + "PACKAGE_GIT_CHECKOUT": "v3.13.0", + "PACKAGE_VERSION": "3.13.0" + } + }, + "v3.13.0": { + "extra_env": { + "PACKAGE_GIT_CHECKOUT": "v3.13.0", + "PACKAGE_VERSION": "3.13.0" + } + }, + "v3.12": { + "extra_env": { + "PACKAGE_GIT_CHECKOUT": "v3.12.4", + "PACKAGE_VERSION": "3.12.4" + } + }, + "v3.12.4": { + "extra_env": { + "PACKAGE_GIT_CHECKOUT": "v3.12.4", + "PACKAGE_VERSION": "3.12.4" + } + } + }, "tags": [ "lib", - "protobuf-host", - "vtrunk", - "vmaster" + "protobuf-host" ], "use_preprocess_scripts_from_another_entry": { "data_uoa": "fd44428fbc77f77f", From 38d117bccb4d2fb6558ce5b69390ceefe9a0c4d2 Mon Sep 17 00:00:00 2001 From: Anton Lokhmotov Date: Fri, 12 Feb 2021 19:25:46 +0000 Subject: [PATCH 3/3] Rename package:lib-protobuf-{trunk-,}host. --- ...lias-a-lib-protobuf-trunk-host => alias-a-lib-protobuf-host} | 0 package/.cm/alias-u-4a65b9177fe4603f | 2 +- .../.cm/desc.json | 0 .../.cm/info.json | 2 +- .../.cm/meta.json | 0 .../{lib-protobuf-trunk-host => lib-protobuf-host}/README.txt | 0 .../scripts.linux/post-install2.sh | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename package/.cm/{alias-a-lib-protobuf-trunk-host => alias-a-lib-protobuf-host} (100%) rename package/{lib-protobuf-trunk-host => lib-protobuf-host}/.cm/desc.json (100%) rename package/{lib-protobuf-trunk-host => lib-protobuf-host}/.cm/info.json (92%) rename package/{lib-protobuf-trunk-host => lib-protobuf-host}/.cm/meta.json (100%) rename package/{lib-protobuf-trunk-host => lib-protobuf-host}/README.txt (100%) rename package/{lib-protobuf-trunk-host => lib-protobuf-host}/scripts.linux/post-install2.sh (100%) diff --git a/package/.cm/alias-a-lib-protobuf-trunk-host b/package/.cm/alias-a-lib-protobuf-host similarity index 100% rename from package/.cm/alias-a-lib-protobuf-trunk-host rename to package/.cm/alias-a-lib-protobuf-host diff --git a/package/.cm/alias-u-4a65b9177fe4603f b/package/.cm/alias-u-4a65b9177fe4603f index e4bdfab1..8236f794 100644 --- a/package/.cm/alias-u-4a65b9177fe4603f +++ b/package/.cm/alias-u-4a65b9177fe4603f @@ -1 +1 @@ -lib-protobuf-trunk-host +lib-protobuf-host diff --git a/package/lib-protobuf-trunk-host/.cm/desc.json b/package/lib-protobuf-host/.cm/desc.json similarity index 100% rename from package/lib-protobuf-trunk-host/.cm/desc.json rename to package/lib-protobuf-host/.cm/desc.json diff --git a/package/lib-protobuf-trunk-host/.cm/info.json b/package/lib-protobuf-host/.cm/info.json similarity index 92% rename from package/lib-protobuf-trunk-host/.cm/info.json rename to package/lib-protobuf-host/.cm/info.json index d17e816c..46136f66 100644 --- a/package/lib-protobuf-trunk-host/.cm/info.json +++ b/package/lib-protobuf-host/.cm/info.json @@ -17,5 +17,5 @@ "2" ] }, - "data_name": "lib-protobuf-trunk-host" + "data_name": "lib-protobuf-host" } diff --git a/package/lib-protobuf-trunk-host/.cm/meta.json b/package/lib-protobuf-host/.cm/meta.json similarity index 100% rename from package/lib-protobuf-trunk-host/.cm/meta.json rename to package/lib-protobuf-host/.cm/meta.json diff --git a/package/lib-protobuf-trunk-host/README.txt b/package/lib-protobuf-host/README.txt similarity index 100% rename from package/lib-protobuf-trunk-host/README.txt rename to package/lib-protobuf-host/README.txt diff --git a/package/lib-protobuf-trunk-host/scripts.linux/post-install2.sh b/package/lib-protobuf-host/scripts.linux/post-install2.sh similarity index 100% rename from package/lib-protobuf-trunk-host/scripts.linux/post-install2.sh rename to package/lib-protobuf-host/scripts.linux/post-install2.sh