From 62c3d5aab9b03baa3ac92a0422e2d86b74070970 Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Tue, 17 Dec 2019 18:42:24 +0900 Subject: [PATCH] j: update to 901.c. --- srcpkgs/j/patches/crossbuild-jconsole.patch | 28 +++++--- srcpkgs/j/patches/crossbuild-libj.patch | 74 ++++++--------------- srcpkgs/j/template | 12 ++-- srcpkgs/j/update | 8 ++- 4 files changed, 51 insertions(+), 71 deletions(-) diff --git a/srcpkgs/j/patches/crossbuild-jconsole.patch b/srcpkgs/j/patches/crossbuild-jconsole.patch index a21271e47e9..00bda4ccd40 100644 --- a/srcpkgs/j/patches/crossbuild-jconsole.patch +++ b/srcpkgs/j/patches/crossbuild-jconsole.patch @@ -1,11 +1,19 @@ ---- make/build_jconsole.sh 2019-09-27 16:31:47.494999152 +0900 -+++ make/build_jconsole.sh 2019-09-27 16:35:41.162381710 +0900 -@@ -8,7 +8,7 @@ +--- make/build_jconsole.sh 2019-12-17 18:25:11.713700768 +0900 ++++ make/build_jconsole.sh 2019-12-17 18:26:45.090341029 +0900 +@@ -5,6 +5,7 @@ + cd ~ - linux_j32) - COMPILE="$common -m32 -DREADLINE" --LINK=" -l:libedit.so.2 -m32 -ldl -o jconsole " -+LINK=" -ledit -m32 -ldl -o jconsole " - ;; - linux_j64) - COMPILE="$common -DREADLINE" + macmin="-mmacosx-version-min=10.6" ++ccver=$(${CC} --version) + USE_LINENOISE="${USE_LINENOISE:=1}" + + if [ "x$CC" = x'' ] ; then +@@ -20,7 +21,7 @@ + export CC + fi + +-if [ $CC = "gcc" ] ; then ++if [ -z "${ccver##*(GCC)*}" ]; then + # gcc + common=" -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-clobbered -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses" + OVER_GCC_VER6=$(echo `$CC -dumpversion | cut -f1 -d.` \>= 6 | bc) diff --git a/srcpkgs/j/patches/crossbuild-libj.patch b/srcpkgs/j/patches/crossbuild-libj.patch index 66da953609a..34a7786c82b 100644 --- a/srcpkgs/j/patches/crossbuild-libj.patch +++ b/srcpkgs/j/patches/crossbuild-libj.patch @@ -1,61 +1,25 @@ ---- make/build_libj.sh 2019-09-27 16:31:51.711078190 +0900 -+++ make/build_libj.sh 2019-09-27 16:35:36.406292466 +0900 -@@ -7,36 +7,32 @@ - # use -DC_NOMULTINTRINSIC to continue to use more standard c in version 4 +--- make/build_libj.sh 2020-01-19 11:41:50.017038941 +0900 ++++ make/build_libj.sh 2020-01-19 11:47:52.455846176 +0900 +@@ -10,19 +10,20 @@ # too early to move main linux release package to gcc 5 --compiler=${CC:0:3} -- + macmin="-mmacosx-version-min=10.6" ++ccver=$(${CC} --version) + USE_OPENMP="${USE_OPENMP:=0}" --if [ $USE_OPENMP -eq 1 ] ; then + if [ $USE_OPENMP -eq 1 ] ; then OPENMP=" -fopenmp " LDOPENMP=" -fopenmp " --if [ "x$compiler" = x'gcc' ] ; then --LDOPENMP32=" -l:libgomp.so.1 " # gcc --else --LDOPENMP32=" -l:libomp.so.5 " # clang --fi --fi - --if [ "x$compiler" = x'gcc' ] ; then --# gcc --common="$OPENMP -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-clobbered -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-shift-negative-value" --# alternatively, add comment /* fall through */ --OVER_GCC_VER7=$(echo `$CC -dumpversion | cut -f1 -d.` \>= 7 | bc) --if [ $OVER_GCC_VER7 -eq 1 ] ; then --common="$common -Wno-implicit-fallthrough" --fi --OVER_GCC_VER8=$(echo `$CC -dumpversion | cut -f1 -d.` \>= 8 | bc) --if [ $OVER_GCC_VER8 -eq 1 ] ; then --common="$common -Wno-cast-function-type" --fi --else --# clang 3.5 .. 5.0 --common="$OPENMP -Werror -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-consumed -Wno-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int" --fi --darwin="$OPENMP -fPIC -O1 -fwrapv -fno-strict-aliasing -Wno-string-plus-int -Wno-empty-body -Wno-unsequenced -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-return-type -Wno-constant-logical-operand -Wno-comment -Wno-unsequenced" -+common="${OPENMP} -Werror -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra" -+for wflag in no-maybe-uninitialized \ -+ no-unused-parameter \ -+ no-sign-compare \ -+ no-clobbered \ -+ no-empty-body \ -+ no-unused-value \ -+ no-pointer-sign \ -+ no-parentheses \ -+ no-shift-negative-value \ -+ no-implicit-fallthrough \ -+ no-cast-function-type \ -+ no-consumed \ -+ no-uninitialized \ -+ no-unsequenced \ -+ no-string-plus-int \ -+ no-return-type \ -+ no-constant-logical-operand \ -+ no-comment; do -+ ${CC} -### -x c -W"${wflag}" /dev/null >/dev/null 2>/dev/null && \ -+ common="${common} -W${wflag}" -+done - - case $jplatform\_$1 in +-if [ -z "${$CCcc##*gcc*}" ] || [ -z "${CC##*gcc*}" ]; then ++if [ -z "${ccver##*(GCC)*}" ]; then + LDOPENMP32=" -l:libgomp.so.1 " # gcc + else + LDOPENMP32=" -l:libomp.so.5 " # clang + fi + fi +-if [ $CC = "gcc" ] ; then ++if [ -z "${ccver##*(GCC)*}" ]; then + # gcc + common="$OPENMP -Werror -fPIC -O2 -fwrapv -fno-strict-aliasing -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-clobbered -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-type-limits" + GNUC_MAJOR=$(echo __GNUC__ | $CC -E -x c - | tail -n 1) diff --git a/srcpkgs/j/template b/srcpkgs/j/template index 83d66d65f82..d4dbec09909 100644 --- a/srcpkgs/j/template +++ b/srcpkgs/j/template @@ -1,16 +1,20 @@ # Template file for 'j' pkgname=j -version=807 +_vmaj=901 +_vmin=c +_vrel=${_vmaj}-release${_vmin:+-}${_vmin} +version=${_vmaj}.${_vmin} revision=1 archs="aarch64* x86_64*" -wrksrc="jsource-j${version}-release" +wrksrc="jsource-j${_vrel}" +hostmakedepends="bc" makedepends="libedit-devel libgomp-devel libomp-devel" short_desc="Modern, high-performance, ASCII-based successor to APL" maintainer="B. Wilson " license="GPL-3.0-or-later" homepage="https://jsoftware.com/" -distfiles="https://github.com/jsoftware/jsource/archive/j${version}-release.tar.gz" -checksum=324ff0b046c9f7f24f18a72fa8a4253ad54c99a48c397fd2c724392f5e097d7f +distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz" +checksum=3e7b7f9ea8e23bf055bee0761ea8928e7ff616131b7ab66918956404d8750252 _jsz="j${XBPS_TARGET_WORDSIZE}" _jtype="release" diff --git a/srcpkgs/j/update b/srcpkgs/j/update index 2947eb06d95..93b92393490 100644 --- a/srcpkgs/j/update +++ b/srcpkgs/j/update @@ -1,2 +1,6 @@ -site='https://jsoftware.com/indexno.html' -pattern='The latest release is \K[\d]+(=?\.)' +site='https://github.com/jsoftware/jsource/releases' +_vmaj=${version%.*} +_vmin=${version#${_vmaj}} +_vmin=${_vmin#.} +version="${_vmaj}-release${_vmin:+-}${_vmin}" +pattern='tag/j\K[\d]+-release(-.*)?(?=">)'