summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-04-05 14:47:39 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2019-04-05 14:47:39 (GMT)
commit5857b179283711cdfc80afb5048e22fd105449f3 (patch)
treecfbfeb76757de1327b97d8cbb17c526840575ce9
parentfe7b3cd7cad992ade9d8010751d68760f5663a03 (diff)
Release version 1.1.1+1
Add ignore=untracked configuration option for upstream submodule. Update README-DEV.
-rw-r--r--.gitmodules1
-rw-r--r--README-DEV9
-rw-r--r--libcrypto/manifest2
-rw-r--r--libssl/manifest2
-rw-r--r--openssl/manifest2
5 files changed, 13 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index e5b3e11..4817719 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
[submodule "upstream"]
path = upstream
url = https://github.com/openssl/openssl.git
+ ignore = untracked
diff --git a/README-DEV b/README-DEV
index 1c289d5..186e461 100644
--- a/README-DEV
+++ b/README-DEV
@@ -12,6 +12,15 @@ and subdirectories into the build2 package subdirectories. Then, when required,
we "overlay" the upstream with our own headers, placing them into the
library/program directories and their downstream/ subdirectories.
+Note that symlinking upstream submodule subdirectories into a build2 package
+subdirectory results in creating intermediate build files (.d, .o, etc) inside
+upstream directory while building the package in source tree. That's why we
+need to make sure that packages do not share upstream source files via
+subdirectory symlinks, not to also share the related intermediate files. If
+several packages need to compile the same upstream source file, then only one
+of them can symlink it via the parent directory while others must symlink it
+directly.
+
Normally, when packaging a project, we need to replace some auto-generated
headers with our own implementations and deduce compilation/linking options.
For autoconf/cmake-based projects we rely on the Makefile.am, CMakeList.txt
diff --git a/libcrypto/manifest b/libcrypto/manifest
index 70e77f7..b00cac0 100644
--- a/libcrypto/manifest
+++ b/libcrypto/manifest
@@ -3,7 +3,7 @@ name: libcrypto
# Note: remember to update summary and doc-url below!
#
-version: 1.1.1
+version: 1.1.1+1
project: openssl
summary: C library providing general cryptography and X.509 support, version 1.1.1a
diff --git a/libssl/manifest b/libssl/manifest
index 6cf7bcd..11dd181 100644
--- a/libssl/manifest
+++ b/libssl/manifest
@@ -3,7 +3,7 @@ name: libssl
# Note: remember to update summary and doc-url below!
#
-version: 1.1.1
+version: 1.1.1+1
project: openssl
summary: C library providing SSLv3 and TLS implementations, version 1.1.1a
diff --git a/openssl/manifest b/openssl/manifest
index d0e4e0b..42dfba4 100644
--- a/openssl/manifest
+++ b/openssl/manifest
@@ -3,7 +3,7 @@ name: openssl
# Note: remember to update summary and doc-url below!
#
-version: 1.1.1
+version: 1.1.1+1
summary: Command line tool providing various cryptography functions, version 1.1.1a
license: OpenSSL License, SSLeay License; Copyleft free dual software license.