summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-05-15 17:27:31 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2019-05-15 19:03:21 (GMT)
commit629d87ea160a8f0de1601f986549137341d7a27c (patch)
tree826a91a95d39ff0b568aac48d838c9d155ac2362
parent5857b179283711cdfc80afb5048e22fd105449f3 (diff)
Release version 1.1.1+2v1.1.1
Minor buildfiles cleanup
-rw-r--r--README-DEV4
-rw-r--r--libcrypto/libcrypto/buildfile1
-rw-r--r--libcrypto/manifest2
-rw-r--r--libssl/libssl/buildfile1
-rw-r--r--libssl/manifest2
-rw-r--r--openssl/manifest2
-rw-r--r--openssl/openssl/buildfile2
7 files changed, 6 insertions, 8 deletions
diff --git a/README-DEV b/README-DEV
index 186e461..27ce486 100644
--- a/README-DEV
+++ b/README-DEV
@@ -19,7 +19,9 @@ 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.
+directly. We also add the `ignore = untracked` configuration option into
+.gitmodules to make sure that git ignores the intermediate build files under
+upstream/ subdirectory.
Normally, when packaging a project, we need to replace some auto-generated
headers with our own implementations and deduce compilation/linking options.
diff --git a/libcrypto/libcrypto/buildfile b/libcrypto/libcrypto/buildfile
index eb9990b..62045a7 100644
--- a/libcrypto/libcrypto/buildfile
+++ b/libcrypto/libcrypto/buildfile
@@ -31,7 +31,6 @@ i686 = ($c.target.cpu == 'i686')
linux = ($tclass == 'linux')
bsd = ($tclass == 'bsd')
-macos = ($tclass == 'macos')
windows = ($tclass == 'windows')
gcc = ($c.class == 'gcc')
diff --git a/libcrypto/manifest b/libcrypto/manifest
index b00cac0..18ef7a4 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+1
+version: 1.1.1+2
project: openssl
summary: C library providing general cryptography and X.509 support, version 1.1.1a
diff --git a/libssl/libssl/buildfile b/libssl/libssl/buildfile
index d025ee3..1f5838a 100644
--- a/libssl/libssl/buildfile
+++ b/libssl/libssl/buildfile
@@ -12,7 +12,6 @@ i686 = ($c.target.cpu == 'i686')
linux = ($tclass == 'linux')
bsd = ($tclass == 'bsd')
-macos = ($tclass == 'macos')
windows = ($tclass == 'windows')
gcc = ($c.class == 'gcc')
diff --git a/libssl/manifest b/libssl/manifest
index 11dd181..0a7c9c7 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+1
+version: 1.1.1+2
project: openssl
summary: C library providing SSLv3 and TLS implementations, version 1.1.1a
diff --git a/openssl/manifest b/openssl/manifest
index 42dfba4..ffb7296 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+1
+version: 1.1.1+2
summary: Command line tool providing various cryptography functions, version 1.1.1a
license: OpenSSL License, SSLeay License; Copyleft free dual software license.
diff --git a/openssl/openssl/buildfile b/openssl/openssl/buildfile
index 4e7776a..b03de5f 100644
--- a/openssl/openssl/buildfile
+++ b/openssl/openssl/buildfile
@@ -13,12 +13,10 @@ i686 = ($c.target.cpu == 'i686')
linux = ($tclass == 'linux')
bsd = ($tclass == 'bsd')
-macos = ($tclass == 'macos')
windows = ($tclass == 'windows')
gcc = ($c.class == 'gcc')
msvc = ($c.class == 'msvc')
-mingw = ($c.target.system == 'mingw32')
exe{openssl}: apps/c{win32_init}: include = $windows