Skip to content

Update protobuf-host package to use variations #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
psyhtest wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update protobuf-host package to use variations #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e602a1b
Add post-install symbolic linking: lib64->lib.
psyhtest Feb 12, 2021
9f9caec
Add variations: vmaster, v3.{12..14}.
psyhtest Feb 12, 2021
38d117b
Rename package:lib-protobuf-{trunk-,}host.
psyhtest Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 package/.cm/alias-a-lib-protobuf-trunk-host → package/.cm/alias-a-lib-protobuf-host
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion package/.cm/alias-u-4a65b9177fe4603f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lib-protobuf-trunk-host
lib-protobuf-host
0 ...age/lib-protobuf-trunk-host/.cm/desc.json → package/lib-protobuf-host/.cm/desc.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...age/lib-protobuf-trunk-host/.cm/info.json → package/lib-protobuf-host/.cm/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
"2"
]
},
"data_name": "lib-protobuf-trunk-host"
"data_name": "lib-protobuf-host"
}
56 changes: 52 additions & 4 deletions ...age/lib-protobuf-trunk-host/.cm/meta.json → package/lib-protobuf-host/.cm/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down
0 package/lib-protobuf-trunk-host/README.txt → package/lib-protobuf-host/README.txt
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions package/lib-protobuf-host/scripts.linux/post-install2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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