Skip to content

jsonnet: update to 0.21.0 #28626

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

jsonnet: update to 0.21.0 #28626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions devel/jsonnet/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
PortSystem 1.0
PortGroup github 1.0

github.setup google jsonnet 0.17.0 v
github.setup google jsonnet 0.21.0 v
# Change github.tarball_from to 'releases' or 'archive' next update
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please act upon this comment; it will require you to update the checksums as well

github.tarball_from tarball
revision 0
Expand All @@ -18,9 +18,9 @@ long_description A data templating language for app and tool developers

homepage https://jsonnet.org/

checksums rmd160 e43a5cee00aaea3782407c9ce0b87d28f34fc3b9 \
sha256 9f4450ff784952a0f5c593ce7dabd83cbda2eed62a4b01cc2ba507b32483c8dd \
size 21859800
checksums rmd160 92d06d25efdb302901186be9ae96e7261659d998 \
sha256 1f39c022fd943eb60eec58e027a0b025585c8ae808b065707d8cbfa770a7ba10 \
size 22134527

patchfiles-append patch-Makefile.diff

Expand All @@ -29,7 +29,7 @@ post-patch {
}

compiler.c_standard 1999
compiler.cxx_standard 2011
compiler.cxx_standard 2017

if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} ne ""} {
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
Expand All @@ -54,16 +54,15 @@ if {${name} eq ${subport}} {
# Name consistency with ${python.branch} and ${python.version} in
# ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/_resources/port1.0/group/python-1.0.tcl

set python_branches {3.7 3.8 3.9}
set python_branches {3.9 3.10 3.11 3.12 3.13}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume you verified that there are no dependents of the subports for Python 3.7 and 3.8?

foreach python_branch ${python_branches} {
set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
subport py${python_version}-${name} {
PortGroup python 1.0

python.default_version ${python_version}

categories-append \
devel
categories devel python

master_sites \
${github.master_sites}
Expand Down
16 changes: 8 additions & 8 deletions devel/jsonnet/files/patch-Makefile.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- Makefile.orig 2021-02-16 20:31:03.000000000 -0500
+++ Makefile 2021-02-16 20:33:25.000000000 -0500
--- Makefile.orig 2024-04-17 00:00:00.000000000 +0000
+++ Makefile 2024-04-17 00:00:01.000000000 +0000
@@ -27,15 +27,11 @@
CP ?= cp
OD ?= od
Expand All @@ -8,14 +8,14 @@
-
PREFIX ?= /usr/local

-CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC
-CXXFLAGS += -Iinclude -Ithird_party/md5 -Ithird_party/json
-CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++17 -fPIC
-CXXFLAGS += -Iinclude -Ithird_party/md5 -Ithird_party/json -Ithird_party/rapidyaml/
-CFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC
-CFLAGS += -Iinclude
-MAKEDEPENDFLAGS += -Iinclude -Ithird_party/md5 -Ithird_party/json
+CXXFLAGS += -g -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5 -I@@PREFIX@@/include/nlohmann
+CXXFLAGS += -g -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++17 -fPIC -Iinclude -Ithird_party/md5 -I@@PREFIX@@/include/nlohmann -Ithird_party/rapidyaml/
+CFLAGS ?= -g -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude -I@@PREFIX@@/include/nlohmann
+MAKEDEPENDFLAGS += -Iinclude -Ithird_party/md5 -I@@PREFIX@@/include/nhlomann
EMCXXFLAGS = $(CXXFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s INLINING_LIMIT=50 -s RESERVED_FUNCTION_POINTERS=20 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1
EMCFLAGS = $(CFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1
+MAKEDEPENDFLAGS += -Iinclude -Ithird_party/md5 -I@@PREFIX@@/include/nlohmann
LDFLAGS ?=