Skip to content
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

Package updates (r151046) #3356

Merged
merged 3 commits into from
Sep 17, 2023
Merged

Package updates (r151046) #3356

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
c1f4154
curl - update from 8.1.2 to 8.3.0
citrus-it Sep 13, 2023
1c3ed18
openjdk11 - update from 11.0.20+8 to 11.0.20.1+1
citrus-it Sep 13, 2023
4b12079
openjdk17 - updated from 17.0.8+7 to 17.0.8.1+1
citrus-it Sep 13, 2023
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
2 changes: 1 addition & 1 deletion build/curl/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=curl
VER=8.1.2
VER=8.3.0
PKG=web/curl
SUMMARY="Command line tool for transferring data with URL syntax"
DESC="Curl is a command line tool for transferring data with URL syntax, "
Expand Down
37 changes: 24 additions & 13 deletions build/openjdk11/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,34 @@
. ../../lib/build.sh

PROG=openjdk
VER=11
UPDATE=20
BUILD=8
VER=11.0.20.1+1
PKG=runtime/java/openjdk11
SUMMARY="openjdk $VER"
SUMMARY="openjdk ${VER%%.*}"
DESC="Open-source implementation of the eleventh edition of the "
DESC+="Java SE Platform"

# The full jdk version string is:
# feature.interim.update.patch.extra1.extra2.extra3-pre+build-opt
# We pass 'opt' explicitly to configure (see below) and currently don't parse
# the 'extra' values out of the version string.
if [[ $VER =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?\+([0-9]+)$ ]]
then
V_FEATURE=${BASH_REMATCH[1]}
V_INTERIM=${BASH_REMATCH[3]}
V_UPDATE=${BASH_REMATCH[5]}
V_PATCH=${BASH_REMATCH[7]}
V_BUILD=${BASH_REMATCH[8]}
else
logerr "Could not parse openjdk version $VER"
fi

# check ooce/fonts/liberation for current version
LIBERATIONFONTSVER=2.1.5
SKIP_LICENCES="SILv1.1"

set_arch 64

set_builddir "jdk${VER}u-jdk-$VER.0.$UPDATE-$BUILD"
set_builddir "jdk${V_FEATURE}u-jdk-${VER//+/-}"

BMI_EXPECTED=1
SKIP_RTIME_CHECK=1
Expand All @@ -47,16 +60,16 @@ BUILD_DEPENDS_IPS="

RUN_DEPENDS_IPS="runtime/java/jexec"

VERHUMAN=jdk${VER}u${UPDATE}-b$BUILD
IVER=${VER}.0
VERHUMAN="jdk${V_FEATURE}u${V_UPDATE}${V_PATCH:+.}$V_PATCH-b$V_BUILD"
IVER="$V_FEATURE.$V_INTERIM"

IROOT=usr/jdk/instances
IFULL=$IROOT/$PROG$IVER

OOCEPREFIX=/opt/ooce

XFORM_ARGS="
-DVER=$VER
-DVER=$V_FEATURE
-DIVER=$IVER
-DIROOT=$IROOT
-DIFULL=$IFULL
Expand All @@ -67,9 +80,7 @@ XFORM_ARGS="
NO_PARALLEL_MAKE=1

CONFIGURE_OPTS="
--with-version-update=$UPDATE
--with-version-build=$BUILD
--with-version-pre=
--with-version-string=$VER
--with-version-opt=omnios-$RELVER
--with-toolchain-type=gcc
--with-boot-jdk=/$IFULL
Expand Down Expand Up @@ -108,7 +119,7 @@ make_install() {
}

init
download_source $PROG "jdk-$VER.0.$UPDATE+$BUILD"
download_source $PROG "jdk-$VER"
patch_source

# Also download the liberation fonts archive. Fonts from here will be
Expand All @@ -119,7 +130,7 @@ BUILDDIR=$LFDIR download_source liberation-fonts $LFDIR
prep_build autoconf-like -oot
chmod +x $CONFIGURE_CMD
build -noctf
VER=$IVER.$UPDATE DASHREV=$BUILD make_package
VER=${VER%%+*} DASHREV=$V_BUILD make_package
clean_up

# Vim hints
Expand Down
2 changes: 1 addition & 1 deletion build/openjdk11/patches/omnios-headless.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/make/lib/Awt2dLibraries.gmk a/make/lib/Awt2dLibraries.gmk
--- a~/make/lib/Awt2dLibraries.gmk 1970-01-01 00:00:00
+++ a/make/lib/Awt2dLibraries.gmk 1970-01-01 00:00:00
@@ -734,11 +734,9 @@ else # not windows
@@ -735,11 +735,9 @@ else # not windows
JAWT_LIBS += -lawt_xawt
else
JAWT_LIBS += -lawt_headless
Expand Down
36 changes: 24 additions & 12 deletions build/openjdk17/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,34 @@
. ../../lib/build.sh

PROG=openjdk
VER=17
UPDATE=8
BUILD=7
VER=17.0.8.1+1
PKG=runtime/java/openjdk17
SUMMARY="openjdk $VER"
SUMMARY="openjdk ${VER%%.*}"
DESC="Open-source implementation of the seventeenth edition of the "
DESC+="Java SE Platform"

# The full jdk version string is:
# feature.interim.update.patch.extra1.extra2.extra3-pre+build-opt
# We pass 'opt' explicitly to configure (see below) and currently don't parse
# the 'extra' values out of the version string.
if [[ $VER =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?\+([0-9]+)$ ]]
then
V_FEATURE=${BASH_REMATCH[1]}
V_INTERIM=${BASH_REMATCH[3]}
V_UPDATE=${BASH_REMATCH[5]}
V_PATCH=${BASH_REMATCH[7]}
V_BUILD=${BASH_REMATCH[8]}
else
logerr "Could not parse openjdk version $VER"
fi

# check ooce/fonts/liberation for current version
LIBERATIONFONTSVER=2.1.5
SKIP_LICENCES="SILv1.1"

set_arch 64

set_builddir "jdk${VER}u-jdk-$VER.0.$UPDATE-$BUILD"
set_builddir "jdk${V_FEATURE}u-jdk-${VER//+/-}"

BMI_EXPECTED=1
SKIP_RTIME_CHECK=1
Expand All @@ -47,16 +60,16 @@ BUILD_DEPENDS_IPS="

RUN_DEPENDS_IPS="runtime/java/jexec"

VERHUMAN=jdk${VER}u${UPDATE}-b$BUILD
IVER=${VER}.0
VERHUMAN="jdk${V_FEATURE}u${V_UPDATE}${V_PATCH:+.}$V_PATCH-b$V_BUILD"
IVER="$V_FEATURE.$V_INTERIM"

IROOT=usr/jdk/instances
IFULL=$IROOT/$PROG$IVER

OOCEPREFIX=/opt/ooce

XFORM_ARGS="
-DVER=$VER
-DVER=$V_FEATURE
-DIVER=$IVER
-DIROOT=$IROOT
-DIFULL=$IFULL
Expand All @@ -67,8 +80,7 @@ XFORM_ARGS="
NO_PARALLEL_MAKE=1

CONFIGURE_OPTS="
--with-version-build=$BUILD
--with-version-pre=
--with-version-string=$VER
--with-version-opt=omnios-$RELVER
--with-toolchain-type=gcc
--with-boot-jdk=/$IFULL
Expand Down Expand Up @@ -111,7 +123,7 @@ make_install() {
}

init
download_source $PROG "jdk-$VER.0.$UPDATE+$BUILD"
download_source $PROG "jdk-$VER"
patch_source

# Also download the liberation fonts archive. Fonts from here will be
Expand All @@ -122,7 +134,7 @@ BUILDDIR=$LFDIR download_source liberation-fonts $LFDIR
prep_build autoconf-like -oot
chmod +x $CONFIGURE_CMD
build -noctf
VER=$IVER.$UPDATE DASHREV=$BUILD make_package
VER=${VER%%+*} DASHREV=$V_BUILD make_package
clean_up

# Vim hints
Expand Down