Date: Fri, 13 Dec 2013 15:26:11 GMT From: Martin Kammerhofer <mkamm@gmx.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/184751: devel/libreadline-java: build with clang Message-ID: <201312131526.rBDFQBxi067626@oldred.freebsd.org> Resent-Message-ID: <201312131530.rBDFU0BO024772@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184751
>Category: ports
>Synopsis: devel/libreadline-java: build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 13 15:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Martin Kammerhofer
>Release: 10.0-RC1
>Organization:
TUG
>Environment:
>Description:
fix hardcoded CC=gcc in a sub-Makefile
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/devel/libreadline-java/Makefile ./Makefile
--- /usr/ports/devel/libreadline-java/Makefile 2013-09-20 19:13:42.000000000 +0200
+++ ./Makefile 2013-12-13 16:16:11.000000000 +0100
@@ -4,7 +4,7 @@
PORTNAME= libreadline-java
PORTVERSION= 0.8.0
DISTVERSIONSUFFIX= -src
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel java
MASTER_SITES= SF/java-readline/java-readline/${PORTVERSION}
diff -ruN /usr/ports/devel/libreadline-java/files/jython.sh ./files/jython.sh
--- /usr/ports/devel/libreadline-java/files/jython.sh 2012-07-14 15:54:48.000000000 +0200
+++ ./files/jython.sh 2013-12-13 08:32:23.000000000 +0100
@@ -5,7 +5,7 @@
# The path names below are for Jython 2.2 on FreeBSD.
#
-CP="/usr/local/lib/jython22/jython.jar"
+CP="/usr/local/lib/jython/jython.jar"
defs=
wrapper=
diff -ruN /usr/ports/devel/libreadline-java/files/patch-src-native-Makefile ./files/patch-src-native-Makefile
--- /usr/ports/devel/libreadline-java/files/patch-src-native-Makefile 2012-07-14 15:54:48.000000000 +0200
+++ ./files/patch-src-native-Makefile 2013-12-13 08:34:38.000000000 +0100
@@ -1,6 +1,13 @@
---- src/native/Makefile.orig 2003-01-07 07:14:35.000000000 -0300
-+++ src/native/Makefile 2008-02-16 18:53:37.000000000 -0300
-@@ -44,10 +44,12 @@
+--- src/native/Makefile.orig 2003-01-07 11:14:35.000000000 +0100
++++ src/native/Makefile 2013-12-13 08:29:23.000000000 +0100
+@@ -38,25 +38,28 @@
+ INCLUDES = -I "c:/Programme/DevStudio/VC/include" \
+ -I $(JAVAINCLUDE) -I $(JAVANATINC)
+ LIB = "c:/Programme/DevStudio/VC/lib"
+-CC = cl
++#CC = gcc
+ OBJ_EXT := obj
+ LIB_PRE :=
LIB_EXT := dll
CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
else
@@ -16,7 +23,8 @@
ifeq (cygwin,$(WIN32))
JavaGetline_LIBS = -lcygwin
endif
-@@ -55,8 +57,9 @@
+-CC = gcc
++CC = cc
OBJ_EXT := o
LIB_PRE := lib
LIB_EXT := so
diff -ruN /usr/ports/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c ./files/patch-src-native-org_gnu_readline_Readline.c
--- /usr/ports/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c 2012-07-14 15:54:48.000000000 +0200
+++ ./files/patch-src-native-org_gnu_readline_Readline.c 2013-12-13 08:36:57.000000000 +0100
@@ -1,5 +1,14 @@
--- src/native/org_gnu_readline_Readline.c.orig 2003-01-07 11:14:35.000000000 +0100
-+++ src/native/org_gnu_readline_Readline.c 2007-09-27 09:21:14.000000000 +0200
++++ src/native/org_gnu_readline_Readline.c 2013-12-12 20:40:36.000000000 +0100
+@@ -430,7 +430,7 @@
+ jtext = (*jniEnv)->NewStringUTF(jniEnv,text);
+
+ if (jniMethodId == 0) {
+- return;
++ return 0;
+ }
+
+ completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject,
@@ -560,6 +560,21 @@
#endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312131526.rBDFQBxi067626>