diff options
| author | Ilya Arzhannikov <iarzhannikov@artec-group.com> | 2021-04-29 02:35:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 17:35:51 -0700 |
| commit | 47c63128dd463b206906598b1707556152d8b7da (patch) | |
| tree | 481a3ac4b4f0b097123a6fd7f6a8e7bdda6d8b08 | |
| parent | 655e1b4dabf4504948518fd0a67a0db76493d6e2 (diff) | |
| download | vcpkg-47c63128dd463b206906598b1707556152d8b7da.tar.gz vcpkg-47c63128dd463b206906598b1707556152d8b7da.zip | |
[Nettle] add cflags to build tools (#17421)
* add cflags for build tools
* ./vcpkg x-add-version nettle
Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
| -rw-r--r-- | ports/nettle/flags.patch | 13 | ||||
| -rw-r--r-- | ports/nettle/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/nettle/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/n-/nettle.json | 5 |
5 files changed, 23 insertions, 2 deletions
diff --git a/ports/nettle/flags.patch b/ports/nettle/flags.patch new file mode 100644 index 000000000..990bd6d3e --- /dev/null +++ b/ports/nettle/flags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index e5ccfc7..922aa0c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -309,7 +309,7 @@ $(LIBHOGWEED_FORLINK): $(hogweed_OBJS) $(LIBNETTLE_FORLINK) + + # For building the various *data.c programs. -lm needed for shadata. + %$(EXEEXT_FOR_BUILD): %.c +- $(CC_FOR_BUILD) $< -lm -o $@ ++ $(CC_FOR_BUILD) $< $(CFLAGS) -lm -o $@ + + # Explicit dependency. + eccdata$(EXEEXT_FOR_BUILD): mini-gmp.c mini-gmp.h diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index 2f7503eb5..731017de7 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -102,7 +102,9 @@ else() REF 9e2bea82b9fb606bffd2d3f648e05248e146e54f #v3.6
SHA512 008089eba2ef197a0ec6a266baac485e72051e646d19861f3fb605915a591bc2dd38edcb4ea7eaad958ea5d56f7744d42c25b691b49921a1285edd22f9c90b7f
HEAD_REF master
- PATCHES fix-InstallLibPath.patch
+ PATCHES
+ fix-InstallLibPath.patch
+ flags.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
diff --git a/ports/nettle/vcpkg.json b/ports/nettle/vcpkg.json index 72df593ce..1a653be5f 100644 --- a/ports/nettle/vcpkg.json +++ b/ports/nettle/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nettle", "version-string": "3.6", + "port-version": 1, "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.", "homepage": "https://git.lysator.liu.se/nettle/nettle", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index edcca312f..c2fdf2137 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4222,7 +4222,7 @@ }, "nettle": { "baseline": "3.6", - "port-version": 0 + "port-version": 1 }, "networkdirect-sdk": { "baseline": "2.0.1", diff --git a/versions/n-/nettle.json b/versions/n-/nettle.json index d69d95a03..00096cd8d 100644 --- a/versions/n-/nettle.json +++ b/versions/n-/nettle.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "87e3211d256198eb00d854b24b2043efb0fe892d", + "version-string": "3.6", + "port-version": 1 + }, + { "git-tree": "c5667fa4f9c8aae21162042f6193069cdb994337", "version-string": "3.6", "port-version": 0 |