svn commit: r493396 - in head/lang/gcc6: . files
Gerald Pfeifer
gerald at FreeBSD.org
Tue Feb 19 22:09:25 UTC 2019
Author: gerald
Date: Tue Feb 19 22:09:23 2019
New Revision: 493396
URL: https://svnweb.freebsd.org/changeset/ports/493396
Log:
Fix an incorrect sed regular expression used in libjava by adding a local
patch files/patch-libjava-classpath-scripts-check_jni_methods.sh.in.
Escapes of ordinary characters will be disallowed by regex(3) in the
future. [1]
While here already, factor out a proper USES block in the Makefile. [2]
PR: 233443 [1]
Submitted by: kevans [1]
Reported by: portlint [2]
Added:
head/lang/gcc6/files/patch-libjava-classpath-scripts-check_jni_methods.sh.in (contents, props changed)
Modified:
head/lang/gcc6/Makefile
Modified: head/lang/gcc6/Makefile
==============================================================================
--- head/lang/gcc6/Makefile Tue Feb 19 20:49:24 2019 (r493395)
+++ head/lang/gcc6/Makefile Tue Feb 19 22:09:23 2019 (r493396)
@@ -23,18 +23,18 @@ LIB_DEPENDS= libgmp.so:math/gmp \
libmpc.so:math/mpc
BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
-
.if defined(MAINTAINER_MODE)
BUILD_DEPENDS+= runtest:misc/dejagnu
.endif
+USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
+USE_BINUTILS= yes
+USE_PERL5= build
+
CPE_VENDOR= gnu
GCC_VERSION= ${PORTVERSION}
SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
-USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
-USE_BINUTILS= yes
-USE_PERL5= build
SSP_UNSAFE= yes
CFLAGS:= ${CFLAGS:N-mretpoline}
CXXFLAGS:= ${CXXFLAGS:N-mretpoline}
Added: head/lang/gcc6/files/patch-libjava-classpath-scripts-check_jni_methods.sh.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/gcc6/files/patch-libjava-classpath-scripts-check_jni_methods.sh.in Tue Feb 19 22:09:23 2019 (r493396)
@@ -0,0 +1,12 @@
+--- UTC
+--- libjava/classpath/scripts/check_jni_methods.sh.in.orig 2018-11-23 15:02:00 UTC
++++ libjava/classpath/scripts/check_jni_methods.sh.in
+@@ -29,7 +29,7 @@ find @abs_top_srcdir@/native/jni -name \*.cpp | \
+ find @abs_top_srcdir@/native/jni -name \*.cpp | \
+ xargs egrep -h '^(JNIEXPORT .* JNICALL )?Java_' | \
+ cut -f4 -d\ | \
+- LC_ALL=C sed -e 's,^\JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2
++ LC_ALL=C sed -e 's,^JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2
+ mv $TMPFILE2 $TMPFILE3
+ LC_ALL=C sort -u $TMPFILE3 > $TMPFILE2
+ rm $TMPFILE3
More information about the svn-ports-all
mailing list